Compare commits
6
Commits
3bb25669ea
...
96903a4d22
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96903a4d22
|
||
|
|
ce1cd479df
|
||
|
|
c103510786
|
||
|
|
3053b35f26
|
||
|
|
a260a42352
|
||
|
|
566ac562bd
|
No files matched your search
@@ -20,7 +20,7 @@ format.notifytime=%T
|
|||||||
format.appointmenttime=%H:%M
|
format.appointmenttime=%H:%M
|
||||||
format.outputdate=%F
|
format.outputdate=%F
|
||||||
format.dayheading=%B %e, %Y
|
format.dayheading=%B %e, %Y
|
||||||
general.autogc=no
|
general.autogc=yes
|
||||||
general.autosave=yes
|
general.autosave=yes
|
||||||
general.confirmdelete=yes
|
general.confirmdelete=yes
|
||||||
general.confirmquit=yes
|
general.confirmquit=yes
|
||||||
@@ -28,6 +28,6 @@ general.firstdayofweek=monday
|
|||||||
general.multipledays=yes
|
general.multipledays=yes
|
||||||
general.periodicsave=0
|
general.periodicsave=0
|
||||||
general.systemevents=yes
|
general.systemevents=yes
|
||||||
notification.command=calcurse --next | xargs -0 notify-send "Appointment"
|
notification.command=calcurse --next | xargs -0 notify-send -a calcurse -i x-office-calendar "Appointment"
|
||||||
notification.notifyall=all
|
notification.notifyall=all
|
||||||
notification.warning=3600
|
notification.warning=3600
|
||||||
@@ -300,7 +300,7 @@
|
|||||||
# * context_all: Open context menu for all notifications.
|
# * context_all: Open context menu for all notifications.
|
||||||
# These values can be strung together for each mouse event, and
|
# These values can be strung together for each mouse event, and
|
||||||
# will be executed in sequence.
|
# will be executed in sequence.
|
||||||
mouse_left_click = close_current
|
mouse_left_click = do_action, close_current
|
||||||
mouse_middle_click = do_action, close_current
|
mouse_middle_click = do_action, close_current
|
||||||
mouse_right_click = close_all
|
mouse_right_click = close_all
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
mainwindow_position = mouse
|
|
||||||
close_on_unfocus = 1
|
|
||||||
mark_today = 1
|
|
||||||
show_week_numbers = 1
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Ask to renew the calcurse Google Calendar login
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
# simple: the prompt waits for a click without a start timeout
|
||||||
|
Type=simple
|
||||||
|
ExecStart=%h/.local/bin/calcurse-relogin --prompt
|
||||||
Executable
+42
@@ -0,0 +1,42 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Next calcurse item for xmobar: pink " 10:15 | " for an appointment later today, a cyan icon for a whole-day
|
||||||
|
# event today, a pink icon alone when the next appointment is tomorrow; empty otherwise.
|
||||||
|
# With "list": show today's and tomorrow's items in a notification (for a click on the bar)
|
||||||
|
set -uo pipefail
|
||||||
|
|
||||||
|
icon=$'\xf3\xb0\x83\xad' # nf-md-calendar, as UTF-8 bytes so the locale doesn't matter
|
||||||
|
today=$(date +%F)
|
||||||
|
|
||||||
|
query() {
|
||||||
|
calcurse -Q --filter-type cal --days 2 --output-datefmt %F "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ ${1:-} == list ]]; then
|
||||||
|
tomorrow=$(date -d tomorrow +%F)
|
||||||
|
body=$(query --format-apt '%S–%E %m\n' --format-recur-apt '%S–%E %m\n' \
|
||||||
|
--format-event 'all day %m\n' --format-recur-event 'all day %m\n' |
|
||||||
|
sed -e 's/&/\&/g; s/</\</g; s/>/\>/g' -e "s/^$today:$/Today:/; s/^$tomorrow:$/Tomorrow:/")
|
||||||
|
notify-send -a calcurse -i x-office-calendar "Calendar" "${body:-Nothing today or tomorrow}"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
now=$(date +%s)
|
||||||
|
day="" next="" event=false
|
||||||
|
while read -r kind start; do
|
||||||
|
case $kind in
|
||||||
|
*:) day=${kind%:} ;;
|
||||||
|
A) [[ -z $next ]] && ((start > now)) && next=$start ;;
|
||||||
|
E) [[ $day == "$today" ]] && event=true ;;
|
||||||
|
esac
|
||||||
|
done < <(query --format-apt 'A %s\n' --format-recur-apt 'A %s\n' --format-event 'E\n' --format-recur-event 'E\n')
|
||||||
|
|
||||||
|
if [[ -n $next && $(date -d "@$next" +%F) == "$today" ]]; then
|
||||||
|
text="<fc=#ff79c6>$icon $(date -d "@$next" +%H:%M)</fc>"
|
||||||
|
elif $event; then
|
||||||
|
text="<fc=#8be9fd>$icon</fc>"
|
||||||
|
elif [[ -n $next ]]; then
|
||||||
|
text="<fc=#ff79c6>$icon</fc>"
|
||||||
|
else
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "$text | "
|
||||||
Executable
+69
@@ -0,0 +1,69 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Current weather for xmobar, e.g. "<icon> 7°C": NOAA's decoded METAR (the source of xmobar's Weather plugin)
|
||||||
|
# Icon from the weather, else the sky conditions; clear/partly/mostly cloudy get moon icons when the sun is down.
|
||||||
|
# Temperature colors match the plugin's -L 0 -H 30: low up to 0, high above 30.
|
||||||
|
|
||||||
|
STATION=LZIB LAT=48.2 LON=17.2
|
||||||
|
|
||||||
|
declare -A ICON=(
|
||||||
|
[thermometer]=$'\xef\x8b\x89' [day_sunny]=$'\xee\x8c\x8d' [night_clear]=$'\xee\x8c\xab'
|
||||||
|
[day_cloudy]=$'\xee\x8c\x82' [night_partly_cloudy]=$'\xee\x8d\xb9' [day_sunny_overcast]=$'\xee\x8c\x8c'
|
||||||
|
[night_cloudy]=$'\xee\x8d\xbe' [cloudy]=$'\xee\x8c\x92' [cloud]=$'\xee\x8c\xbd'
|
||||||
|
[thunderstorm]=$'\xee\x8c\x9d' [rain_mix]=$'\xee\x8c\x96' [snow]=$'\xee\x8c\x9a' [showers]=$'\xee\x8c\x99'
|
||||||
|
[rain]=$'\xee\x8c\x98' [sprinkle]=$'\xee\x8c\x9b' [fog]=$'\xee\x8c\x93' [smoke]=$'\xee\x8d\x9c'
|
||||||
|
[dust]=$'\xee\x8d\x9d'
|
||||||
|
)
|
||||||
|
|
||||||
|
report=$(curl -sf --max-time 20 https://tgftp.nws.noaa.gov/data/observations/metar/decoded/"$STATION".TXT)
|
||||||
|
temp=$(sed -n 's/^Temperature: .*(\([-0-9.]*\) C).*/\1/p' <<< "$report")
|
||||||
|
if [[ -z $temp ]]; then
|
||||||
|
echo "${ICON[thermometer]} N/A"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Phenomena "in the vicinity" aren't at the station; the rest are e.g. "light drizzle; mist"
|
||||||
|
wx=$(sed -n 's/^Weather: //p' <<< "$report" | tr ';' '\n' | grep -v vicinity | tr '\n' ' ')
|
||||||
|
wx=${wx,,}
|
||||||
|
sky=$(sed -n 's/^Sky conditions: //p' <<< "$report")
|
||||||
|
sky=${sky,,}
|
||||||
|
|
||||||
|
# Sun above the horizon (elevation > -0.833°, as for sunrise/sunset) right now, from the low-precision solar position
|
||||||
|
sun_up() {
|
||||||
|
awk -v t="$(date +%s)" -v lat="$LAT" -v lon="$LON" 'BEGIN {
|
||||||
|
r = atan2(0, -1) / 180; d = t / 86400 - 10957.5
|
||||||
|
g = (357.529 + 0.98560028 * d) * r
|
||||||
|
l = (280.459 + 0.98564736 * d + 1.915 * sin(g) + 0.020 * sin(2 * g)) * r
|
||||||
|
e = (23.439 - 0.00000036 * d) * r
|
||||||
|
ra = atan2(cos(e) * sin(l), cos(l)); s = sin(e) * sin(l); dec = atan2(s, sqrt(1 - s * s))
|
||||||
|
h = (280.46061837 + 360.98564736629 * d + lon) * r - ra
|
||||||
|
exit !(sin(lat * r) * sin(dec) + cos(lat * r) * cos(dec) * cos(h) > sin(-0.833 * r))
|
||||||
|
}'
|
||||||
|
}
|
||||||
|
|
||||||
|
case $wx in
|
||||||
|
*thunder*) icon=thunderstorm ;;
|
||||||
|
*freezing*|*sleet*|*ice\ pellets*|*hail*) icon=rain_mix ;;
|
||||||
|
*snow*rain*|*rain*snow*|*snow*drizzle*|*drizzle*snow*) icon=rain_mix ;;
|
||||||
|
*snow*) icon=snow ;;
|
||||||
|
*showers*) icon=showers ;;
|
||||||
|
*rain*) icon=rain ;;
|
||||||
|
*drizzle*) icon=sprinkle ;;
|
||||||
|
*fog*|*mist*) icon=fog ;;
|
||||||
|
*haze*|*smoke*) icon=smoke ;;
|
||||||
|
*dust*|*sand*) icon=dust ;;
|
||||||
|
*)
|
||||||
|
case $sky in
|
||||||
|
clear*) if sun_up; then icon=day_sunny; else icon=night_clear; fi ;;
|
||||||
|
"mostly clear"*|"partly cloudy"*) if sun_up; then icon=day_cloudy; else icon=night_partly_cloudy; fi ;;
|
||||||
|
"mostly cloudy"*) if sun_up; then icon=day_sunny_overcast; else icon=night_cloudy; fi ;;
|
||||||
|
overcast*|obscured*) icon=cloudy ;;
|
||||||
|
*) icon=cloud ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if awk -v t="$temp" 'BEGIN { exit !(t > 30) }'; then color="#ffb86c"
|
||||||
|
elif awk -v t="$temp" 'BEGIN { exit !(t > 0) }'; then color="#50fa7b"
|
||||||
|
else color="#8be9fd"
|
||||||
|
fi
|
||||||
|
echo "${ICON[$icon]} <fc=$color>$temp</fc>°C"
|
||||||
@@ -8,14 +8,7 @@ Config { overrideRedirect = True
|
|||||||
, borderColor = "#24283b"
|
, borderColor = "#24283b"
|
||||||
, allDesktops = True
|
, allDesktops = True
|
||||||
, pickBroadest = True
|
, pickBroadest = True
|
||||||
, commands = [ Run Weather "LZIB"
|
, commands = [ Run Com "/home/fuxino/.config/xmobar/weather.sh" [] "weather" 9000
|
||||||
[ "--template", "\xf2c9 <tempC>°C"
|
|
||||||
, "-L", "0"
|
|
||||||
, "-H", "30"
|
|
||||||
, "--low" , "#8be9fd"
|
|
||||||
, "--normal" , "#50fa7b"
|
|
||||||
, "--high" , "#ffb86c"
|
|
||||||
] 9000
|
|
||||||
, Run MultiCpu
|
, Run MultiCpu
|
||||||
[ "--template" , "\xf4bc <total>%"
|
[ "--template" , "\xf4bc <total>%"
|
||||||
, "--Low" , "25"
|
, "--Low" , "25"
|
||||||
@@ -45,17 +38,15 @@ Config { overrideRedirect = True
|
|||||||
, ("us" , "<fc=#ffb86c>US</fc>")
|
, ("us" , "<fc=#ffb86c>US</fc>")
|
||||||
, ("sk(qwerty)" , "<fc=#ff5555>SK</fc>")
|
, ("sk(qwerty)" , "<fc=#ff5555>SK</fc>")
|
||||||
]
|
]
|
||||||
, Run Date "\xf133 %a %Y-%m-%d <fc=#ff79c6>%H:%M</fc>" "date" 10
|
, Run Date "\xf133 %a %d/%m <fc=#ff79c6>%H:%M</fc>" "date" 10
|
||||||
, Run Uptime
|
|
||||||
[ "--template" , "\xf017 <days>d <hours>h"
|
|
||||||
] 600
|
|
||||||
, Run Com "/home/fuxino/.config/xmobar/pactl_volume.sh" [] "pactl_volume" 10
|
, Run Com "/home/fuxino/.config/xmobar/pactl_volume.sh" [] "pactl_volume" 10
|
||||||
, Run Com "/home/fuxino/.config/xmobar/ens_brief.sh" [] "ens_brief" 18000
|
, Run Com "/home/fuxino/.config/xmobar/ens_brief.sh" [] "ens_brief" 18000
|
||||||
, Run Com "/home/fuxino/.config/xmobar/updates.sh" [] "updates" 600
|
, Run Com "/home/fuxino/.config/xmobar/updates.sh" [] "updates" 600
|
||||||
, Run Com "/home/fuxino/.config/xmobar/backup.sh" [] "backup" 3600
|
, Run Com "/home/fuxino/.config/xmobar/backup.sh" [] "backup" 3600
|
||||||
|
, Run Com "/home/fuxino/.config/xmobar/calcurse.sh" [] "calcurse" 600
|
||||||
, Run UnsafeXMonadLog
|
, Run UnsafeXMonadLog
|
||||||
]
|
]
|
||||||
, sepChar = "%"
|
, sepChar = "%"
|
||||||
, alignSep = "}{"
|
, alignSep = "}{"
|
||||||
, template = " | %UnsafeXMonadLog% } %uptime% | %multicpu% %coretemp% | %memory% | <action=`/home/fuxino/.config/xmobar/kbd_cycle.sh` button=1><action=`/home/fuxino/.config/xmobar/kbd_cycle.sh prev` button=3> %kbd%</action></action> { <action=`/home/fuxino/.config/xmobar/backup.sh list`>%backup%</action><action=`/home/fuxino/.config/xmobar/updates.sh list`>%updates%</action><action=`/home/fuxino/.config/xmobar/ens_brief.sh week`>%LZIB% <fc=#565f89>·</fc> %ens_brief%</action> | %pactl_volume% | <action=`env GDK_DPI_SCALE=1.25 gsimplecal`>%date%</action> "
|
, template = " | %UnsafeXMonadLog% } %multicpu% %coretemp% | %memory% | <action=`/home/fuxino/.config/xmobar/kbd_cycle.sh` button=1><action=`/home/fuxino/.config/xmobar/kbd_cycle.sh prev` button=3> %kbd%</action></action> { <action=`/home/fuxino/.config/xmobar/calcurse.sh list` button=1><action=`xdotool key super+shift+a` button=3>%calcurse%</action></action><action=`/home/fuxino/.config/xmobar/backup.sh list`>%backup%</action><action=`/home/fuxino/.config/xmobar/updates.sh list`>%updates%</action><action=`/home/fuxino/.config/xmobar/ens_brief.sh week`>%weather% <fc=#565f89>·</fc> %ens_brief%</action> | %pactl_volume% | %date% "
|
||||||
}
|
}
|
||||||
@@ -8,14 +8,7 @@ Config { overrideRedirect = True
|
|||||||
, borderColor = "#24283b"
|
, borderColor = "#24283b"
|
||||||
, allDesktops = True
|
, allDesktops = True
|
||||||
, pickBroadest = True
|
, pickBroadest = True
|
||||||
, commands = [ Run Weather "LZIB"
|
, commands = [ Run Com "/home/fuxino/.config/xmobar/weather.sh" [] "weather" 9000
|
||||||
[ "--template", "\xf2c9 <tempC>°C"
|
|
||||||
, "-L", "0"
|
|
||||||
, "-H", "30"
|
|
||||||
, "--low" , "#8be9fd"
|
|
||||||
, "--normal" , "#50fa7b"
|
|
||||||
, "--high" , "#ffb86c"
|
|
||||||
] 9000
|
|
||||||
, Run MultiCpu
|
, Run MultiCpu
|
||||||
[ "--template" , "\xf4bc <total>%"
|
[ "--template" , "\xf4bc <total>%"
|
||||||
, "--Low" , "25"
|
, "--Low" , "25"
|
||||||
@@ -45,18 +38,16 @@ Config { overrideRedirect = True
|
|||||||
, ("us" , "<fc=#ffb86c>US</fc>")
|
, ("us" , "<fc=#ffb86c>US</fc>")
|
||||||
, ("sk(qwerty)" , "<fc=#ff5555>SK</fc>")
|
, ("sk(qwerty)" , "<fc=#ff5555>SK</fc>")
|
||||||
]
|
]
|
||||||
, Run Date "\xf133 %a %Y-%m-%d <fc=#ff79c6>%H:%M</fc>" "date" 10
|
, Run Date "\xf133 %a %d/%m <fc=#ff79c6>%H:%M</fc>" "date" 10
|
||||||
, Run Uptime
|
|
||||||
[ "--template" , "\xf017 <days>d <hours>h"
|
|
||||||
] 600
|
|
||||||
, Run XPropertyLog "_XMONAD_TRAYPAD"
|
, Run XPropertyLog "_XMONAD_TRAYPAD"
|
||||||
, Run Com "/home/fuxino/.config/xmobar/pactl_volume.sh" [] "pactl_volume" 10
|
, Run Com "/home/fuxino/.config/xmobar/pactl_volume.sh" [] "pactl_volume" 10
|
||||||
, Run Com "/home/fuxino/.config/xmobar/ens_brief.sh" [] "ens_brief" 18000
|
, Run Com "/home/fuxino/.config/xmobar/ens_brief.sh" [] "ens_brief" 18000
|
||||||
, Run Com "/home/fuxino/.config/xmobar/updates.sh" [] "updates" 600
|
, Run Com "/home/fuxino/.config/xmobar/updates.sh" [] "updates" 600
|
||||||
, Run Com "/home/fuxino/.config/xmobar/backup.sh" [] "backup" 3600
|
, Run Com "/home/fuxino/.config/xmobar/backup.sh" [] "backup" 3600
|
||||||
|
, Run Com "/home/fuxino/.config/xmobar/calcurse.sh" [] "calcurse" 600
|
||||||
, Run UnsafeXMonadLog
|
, Run UnsafeXMonadLog
|
||||||
]
|
]
|
||||||
, sepChar = "%"
|
, sepChar = "%"
|
||||||
, alignSep = "}{"
|
, alignSep = "}{"
|
||||||
, template = " | %UnsafeXMonadLog% } %uptime% | %multicpu% %coretemp% | %memory% | <action=`/home/fuxino/.config/xmobar/kbd_cycle.sh` button=1><action=`/home/fuxino/.config/xmobar/kbd_cycle.sh prev` button=3> %kbd%</action></action> { <action=`/home/fuxino/.config/xmobar/backup.sh list`>%backup%</action><action=`/home/fuxino/.config/xmobar/updates.sh list`>%updates%</action><action=`/home/fuxino/.config/xmobar/ens_brief.sh week`>%LZIB% <fc=#565f89>·</fc> %ens_brief%</action> | %pactl_volume% | <action=`env GDK_DPI_SCALE=1.25 gsimplecal`>%date%</action> %_XMONAD_TRAYPAD% "
|
, template = " | %UnsafeXMonadLog% } %multicpu% %coretemp% | %memory% | <action=`/home/fuxino/.config/xmobar/kbd_cycle.sh` button=1><action=`/home/fuxino/.config/xmobar/kbd_cycle.sh prev` button=3> %kbd%</action></action> { <action=`/home/fuxino/.config/xmobar/calcurse.sh list` button=1><action=`xdotool key super+shift+a` button=3>%calcurse%</action></action><action=`/home/fuxino/.config/xmobar/backup.sh list`>%backup%</action><action=`/home/fuxino/.config/xmobar/updates.sh list`>%updates%</action><action=`/home/fuxino/.config/xmobar/ens_brief.sh week`>%weather% <fc=#565f89>·</fc> %ens_brief%</action> | %pactl_volume% | %date% %_XMONAD_TRAYPAD% "
|
||||||
}
|
}
|
||||||
@@ -379,7 +379,7 @@ myManageHook =
|
|||||||
className =? "Qalculate-gtk" --> doFloat,
|
className =? "Qalculate-gtk" --> doFloat,
|
||||||
title =? "Genshin Impact" --> doShift wsGames,
|
title =? "Genshin Impact" --> doShift wsGames,
|
||||||
classIn ["gimp", "audacity"] --> doShift wsMedia,
|
classIn ["gimp", "audacity"] --> doShift wsMedia,
|
||||||
classIn ["pavucontrol", "org.pulseaudio.pavucontrol", "zenity", "org.gnome.zenity", "lxappearance", "qt5ct", "qt6ct", "gsimplecal"] --> doFloat,
|
classIn ["pavucontrol", "org.pulseaudio.pavucontrol", "zenity", "org.gnome.zenity", "lxappearance", "qt5ct", "qt6ct"] --> doFloat,
|
||||||
className =? "Signal" --> doShift wsChat,
|
className =? "Signal" --> doShift wsChat,
|
||||||
className =? "Spotify" --> doShift wsMedia,
|
className =? "Spotify" --> doShift wsMedia,
|
||||||
className =? "Transmission-gtk" --> doShift wsWeb,
|
className =? "Transmission-gtk" --> doShift wsWeb,
|
||||||
|
|||||||
Executable
+101
@@ -0,0 +1,101 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Renew calcurse-caldav's Google login: catch the OAuth redirect on 127.0.0.1 and hand the code to calcurse-sync.
|
||||||
|
|
||||||
|
--prompt shows a notification first and logs in when it is clicked.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import configparser
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
import urllib.parse
|
||||||
|
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
CONFIG = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config")) / "calcurse" / "caldav" / "config"
|
||||||
|
WAIT_SECONDS = 300
|
||||||
|
|
||||||
|
|
||||||
|
def notify(summary: str, body: str = "", *extra: str) -> str:
|
||||||
|
"""Send a calcurse notification; with actions in extra, wait and return the chosen action's name."""
|
||||||
|
cmd = ["notify-send", "-a", "calcurse", "-i", "x-office-calendar", *extra, summary, body]
|
||||||
|
return subprocess.run(cmd, capture_output=True, text=True).stdout.strip()
|
||||||
|
|
||||||
|
|
||||||
|
def redirect_port() -> int:
|
||||||
|
parser = configparser.RawConfigParser()
|
||||||
|
parser.read(CONFIG)
|
||||||
|
uri = urllib.parse.urlparse(parser.get("OAuth2", "RedirectURI", fallback=""))
|
||||||
|
if uri.hostname != "127.0.0.1" or uri.port is None:
|
||||||
|
sys.exit(f"RedirectURI in {CONFIG} must be http://127.0.0.1:<port>")
|
||||||
|
return uri.port
|
||||||
|
|
||||||
|
|
||||||
|
def ui_running() -> bool:
|
||||||
|
ttys = subprocess.run(["ps", "-C", "calcurse", "-o", "tty="], capture_output=True, text=True).stdout.split()
|
||||||
|
return any(tty != "?" for tty in ttys)
|
||||||
|
|
||||||
|
|
||||||
|
class RedirectHandler(BaseHTTPRequestHandler):
|
||||||
|
result: dict[str, str] = {}
|
||||||
|
|
||||||
|
def do_GET(self) -> None:
|
||||||
|
query = urllib.parse.parse_qs(urllib.parse.urlparse(self.path).query)
|
||||||
|
for key in ("code", "error"):
|
||||||
|
if key in query:
|
||||||
|
RedirectHandler.result[key] = query[key][0]
|
||||||
|
done = bool(RedirectHandler.result)
|
||||||
|
self.send_response(200 if done else 404)
|
||||||
|
self.send_header("Content-Type", "text/plain; charset=utf-8")
|
||||||
|
self.end_headers()
|
||||||
|
if done:
|
||||||
|
self.wfile.write(b"calcurse: login received, you can close this tab.\n")
|
||||||
|
|
||||||
|
def log_message(self, format: str, *args: object) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def login() -> int:
|
||||||
|
if ui_running():
|
||||||
|
notify("Google Calendar login", "Close calcurse first, then log in again.", "-u", "critical")
|
||||||
|
return 1
|
||||||
|
server = HTTPServer(("127.0.0.1", redirect_port()), RedirectHandler)
|
||||||
|
# With an expired login calcurse-caldav opens the consent page and exits; with a valid one it just syncs.
|
||||||
|
if subprocess.run(["calcurse-caldav"], capture_output=True).returncode == 0:
|
||||||
|
notify("Google Calendar login", "Already logged in.")
|
||||||
|
return 0
|
||||||
|
deadline = time.monotonic() + WAIT_SECONDS
|
||||||
|
while not RedirectHandler.result and (left := deadline - time.monotonic()) > 0:
|
||||||
|
server.timeout = left
|
||||||
|
server.handle_request()
|
||||||
|
server.server_close()
|
||||||
|
code = RedirectHandler.result.get("code")
|
||||||
|
if not code:
|
||||||
|
reason = RedirectHandler.result.get("error", "no answer from the browser")
|
||||||
|
notify("Google Calendar login failed", reason, "-u", "critical")
|
||||||
|
return 1
|
||||||
|
# The user manager's PATH lacks ~/.local/bin: call calcurse-sync from this script's folder.
|
||||||
|
calcurse_sync = Path(__file__).resolve().with_name("calcurse-sync")
|
||||||
|
sync = subprocess.run([calcurse_sync, "--authcode", code], capture_output=True, text=True)
|
||||||
|
if sync.returncode != 0:
|
||||||
|
last_line = (sync.stdout.strip().splitlines() or [""])[-1]
|
||||||
|
notify("Google Calendar login failed", last_line, "-u", "critical")
|
||||||
|
return 1
|
||||||
|
notify("Google Calendar login renewed", "Synced again.")
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> int:
|
||||||
|
parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
|
||||||
|
parser.add_argument("--prompt", action="store_true", help="ask with a notification before logging in")
|
||||||
|
if parser.parse_args().prompt:
|
||||||
|
body = "Click to log in again, then click Allow in the browser."
|
||||||
|
if notify("Google Calendar login expired", body, "-u", "critical", "-A", "default=Log in") != "default":
|
||||||
|
return 0
|
||||||
|
return login()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
sys.exit(main())
|
||||||
@@ -1,13 +1,18 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Sync calcurse with Google Calendar via calcurse-caldav; notify once when the weekly OAuth login expires.
|
# Sync calcurse with Google Calendar via calcurse-caldav; start the login prompt when the weekly OAuth login expires.
|
||||||
# --now: called from the UI's pre-load hook (skip the UI check, shorter timeout, no daemon restart).
|
# --now: called from the UI's pre-load hook (skip the UI check, shorter timeout, no daemon restart).
|
||||||
|
# --authcode CODE: finish a login (from calcurse-relogin, which checks for the UI itself).
|
||||||
set -uo pipefail
|
set -uo pipefail
|
||||||
|
|
||||||
data=${XDG_DATA_HOME:-$HOME/.local/share}/calcurse
|
data=${XDG_DATA_HOME:-$HOME/.local/share}/calcurse
|
||||||
state=${XDG_STATE_HOME:-$HOME/.local/state}/calcurse-sync
|
state=${XDG_STATE_HOME:-$HOME/.local/state}/calcurse-sync
|
||||||
expired_flag=$state/login-expired
|
expired_flag=$state/login-expired
|
||||||
now=false
|
now=false
|
||||||
[[ ${1:-} == --now ]] && now=true
|
authcode=()
|
||||||
|
case ${1:-} in
|
||||||
|
--now) now=true ;;
|
||||||
|
--authcode) authcode=(--authcode "$2") ;;
|
||||||
|
esac
|
||||||
|
|
||||||
# The UI keeps the data in memory, so syncing under it would lose changes; its post-save hook syncs after it exits.
|
# The UI keeps the data in memory, so syncing under it would lose changes; its post-save hook syncs after it exits.
|
||||||
ui_running() {
|
ui_running() {
|
||||||
@@ -15,22 +20,22 @@ ui_running() {
|
|||||||
ps -C calcurse -o tty= | grep -qv '?'
|
ps -C calcurse -o tty= | grep -qv '?'
|
||||||
}
|
}
|
||||||
|
|
||||||
if ! $now && ui_running; then
|
if ! $now && ((${#authcode[@]} == 0)) && ui_running; then
|
||||||
echo "calcurse UI is running, skipping"
|
echo "calcurse UI is running, skipping"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$state"
|
mkdir -p "$state"
|
||||||
# BROWSER=true: an expired login must not open browser tabs on its own.
|
# BROWSER=true: an expired login must not open browser tabs on its own.
|
||||||
out=$(BROWSER=true timeout "$($now && echo 15 || echo 60)" calcurse-caldav 2>&1)
|
out=$(BROWSER=true timeout "$($now && echo 15 || echo 60)" calcurse-caldav "${authcode[@]}" 2>&1)
|
||||||
rc=$?
|
rc=$?
|
||||||
printf '%s\n' "$out"
|
printf '%s\n' "$out"
|
||||||
|
|
||||||
if ((rc != 0)); then
|
if ((rc != 0)); then
|
||||||
if grep -q 'Access token is missing or refresh token is expired' <<<"$out"; then
|
if grep -q 'Access token is missing or refresh token is expired' <<<"$out"; then
|
||||||
if [[ ! -e $expired_flag ]]; then
|
# Prompt via calcurse-relogin, again daily if the prompt was dismissed.
|
||||||
notify-send -a calcurse -u critical -i x-office-calendar "Google Calendar login expired" \
|
if [[ ! -e $expired_flag || -n $(find "$expired_flag" -mmin +1440) ]]; then
|
||||||
"Run calcurse-caldav in a terminal, allow access in the browser, then calcurse-caldav --authcode '<code>'."
|
systemctl --user start --no-block calcurse-relogin.service
|
||||||
touch "$expired_flag"
|
touch "$expired_flag"
|
||||||
fi
|
fi
|
||||||
elif grep -q 'Another synchronization instance' <<<"$out"; then
|
elif grep -q 'Another synchronization instance' <<<"$out"; then
|
||||||
|
|||||||
Reference in new issue
Block a user