Merge remote-tracking branch 'origin/master'

config/scripts/cached_pass

@@ -19,7 +19,7 @@ chmod 700 "$BASEDIR"
 name_base64="$(echo "$name" | base64)"
 file="${BASEDIR}/${name_base64}"
 
-if [ ! -f "${file}" ]
+if [ ! -s "${file}" ]
 then
     notify-send -u low "cached_pass" "Asking to cache: ${name}"
     pass ${name} > "${file}"

config/scripts/camera_name_date

@@ -67,8 +67,8 @@ def main(args: argparse.Namespace) -> None:
             new_filename = (
                 f"{m['Y']}-{m['M']}-{m['D']}_"
                 f"{m['h']}-{m['m']}-{m['s']}"
-                f"{m.get('dup', '')}"
-                f"{m.get('spec', '')}"
+                f"{m.get('dup') or ''}"
+                f"{m.get('spec') or ''}"
                 f"{args.suffix}"
                 f".{m['ext']}"
             )

config/scripts/crepuscule

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
-# TODO De-hardcode
-
-echo 3000 | sudo tee /sys/class/backlight/edp-backlight/brightness
-xrandr --output DP-1 --brightness 1
+if [ "$(cat /etc/hostname)" = "curacao.geoffrey.frogeye.fr" ]
+then
+    echo 10000 | sudo tee /sys/class/backlight/intel_backlight/brightness
+elif [ "$(cat /etc/hostname)" = "pindakaas.geoffrey.frogeye.fr" ]
+then
+    echo 3000 | sudo tee /sys/class/backlight/edp-backlight/brightness
+fi
 automatrop -e base16_scheme=solarized-dark --tags color

config/scripts/jour

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
-# TODO De-hardcode
-
-echo 3500 | sudo tee /sys/class/backlight/edp-backlight/brightness
-xrandr --output DP-1 --brightness 1
+if [ "$(cat /etc/hostname)" = "curacao.geoffrey.frogeye.fr" ]
+then
+    echo 40000 | sudo tee /sys/class/backlight/intel_backlight/brightness
+elif [ "$(cat /etc/hostname)" = "pindakaas.geoffrey.frogeye.fr" ]
+then
+    echo 3500 | sudo tee /sys/class/backlight/edp-backlight/brightness
+fi
 automatrop -e base16_scheme=solarized-light --tags color

config/scripts/nuit

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
-# TODO De-hardcode
-
-echo 700 | sudo tee /sys/class/backlight/edp-backlight/brightness
-xrandr --output DP-1 --brightness 0.5
+if [ "$(cat /etc/hostname)" = "curacao.geoffrey.frogeye.fr" ]
+then
+    echo 1 | sudo tee /sys/class/backlight/intel_backlight/brightness
+elif [ "$(cat /etc/hostname)" = "pindakaas.geoffrey.frogeye.fr" ]
+then
+    echo 700 | sudo tee /sys/class/backlight/edp-backlight/brightness
+fi
 automatrop -e base16_scheme=solarized-dark --tags color

config/scripts/picture_name_date

@@ -9,7 +9,6 @@ import typing
 
 import coloredlogs
 import exifread
-import progressbar
 
 log = logging.getLogger(__name__)
 coloredlogs.install(level="DEBUG", fmt="%(levelname)s %(message)s", logger=log)
@@ -38,12 +37,7 @@ def main(args: argparse.Namespace) -> None:
     log.warning("Counting files...")
     kwargs = {"directory": args.dir, "skip_renamed": args.skip_renamed}
     log.warning("Processing files...")
-    if args.hide_bar:
-        iterator = get_pictures(**kwargs)
-    else:
-        nb_imgs = len(list(get_pictures(**kwargs)))
-        iterator = progressbar.progressbar(get_pictures(**kwargs), max_value=nb_imgs)
-    for full_path in iterator:
+    for full_path in get_pictures(**kwargs):
         # Find date
         with open(full_path, 'rb') as fd:
             exif_data = exifread.process_file(fd)
@@ -62,7 +56,7 @@ def main(args: argparse.Namespace) -> None:
         ext = os.path.splitext(full_path)[1].lower()
         if ext == '.jpeg':
             ext = '.jpg'
-        new_name = date.isoformat().replace(":", "-").replace("T", "_")
+        new_name = date.isoformat().replace(":", "-").replace("T", "_") + args.suffix
         # First substitution is to allow images being sent to a NTFS filesystem
         # Second substitution is for esthetics
         new_path = os.path.join(args.dir, f"{new_name}{ext}")
@@ -71,7 +65,7 @@ def main(args: argparse.Namespace) -> None:
         while os.path.exists(new_path):
             if full_path == new_path:
                 break
-            log.debug(f"{full_path} already exists, incrementing")
+            log.debug(f"{new_path} already exists, incrementing")
             i += 1
             new_path = os.path.join(args.dir, f"{new_name}_{i}{ext}")
 
@@ -103,16 +97,16 @@ if __name__ == "__main__":
         help="Do not actually rename, just show old and new path",
     )
     parser.add_argument(
-        "-s",
+        "-r",
         "--skip-renamed",
         action="store_true",
         help="Skip images whose filename doesn't match usual camera output filenames.",
     )
     parser.add_argument(
-        "-b",
-        "--hide-bar",
-        action="store_true",
-        help="Do not show a progress bar. Also skip counting images",
+        "-s",
+        "--suffix",
+        default="",
+        help="Text to add before the extension",
     )
     args = parser.parse_args()
     main(args)

config/scripts/rssVideos

@@ -148,7 +148,12 @@ class RVElement:
 
     @property
     def date(self) -> datetime.datetime:
-        return datetime.datetime.fromtimestamp(self.item["published"])
+        timestamp = (
+            int(self.item.get("timestampUsec", "0")) / 1000000
+            or int(self.item.get("crawlTimeMsec", "0")) / 1000
+            or self.item["published"]
+        )
+        return datetime.datetime.fromtimestamp(timestamp)
 
     @property
     def is_researched(self) -> bool:
@@ -475,7 +480,7 @@ class RVDatabase:
     def ytdl_opts(self) -> dict:
         # Get user/system options
         prev_argv = sys.argv
-        sys.argv = ['yt-dlp']
+        sys.argv = ["yt-dlp"]
         _, _, _, ydl_opts = yt_dlp.parse_options()
         sys.argv = prev_argv
         return ydl_opts