From 849177f02d875c4ea37ca9fe6e123d3ba1ada329 Mon Sep 17 00:00:00 2001
From: Yan Lin <github@yanlincs.com>
Date: Tue, 10 Feb 2026 15:10:09 +0100
Subject: [PATCH] simplify photo-move function

---
 modules/media-process.nix | 91 ++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 59 deletions(-)

diff --git a/modules/media-process.nix b/modules/media-process.nix
index 9901d73..93c93c0 100644
--- a/modules/media-process.nix
+++ b/modules/media-process.nix
@@ -2,7 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    rsync
     pdftk
     ffmpeg
     shntool
@@ -109,7 +108,7 @@
       done
     }
 
-    function camera-copy() {
+    function photo-move() {
       local delete_source=0
       if [[ "$1" == "-d" || "$1" == "--delete" ]]; then
         delete_source=1
@@ -117,81 +116,55 @@
       fi
 
       if [[ $# -ne 2 ]]; then
-        echo "Usage: camera-copy [-d|--delete] <source_dir> <destination>"
-        echo ""
-        echo "Copy photo and video files organized by date (YYYY-MM-DD/filename)"
-        echo ""
-        echo "Options:"
-        echo "  -d, --delete    Delete source files after successful copy"
-        echo ""
-        echo "Examples:"
-        echo "  camera-copy /media/sdcard/DCIM ~/Videos/imports"
-        echo "  camera-copy -d /Volumes/CAMERA/DCIM user@nas:/backup/camera"
+        echo "Usage: photo-move [-d|--delete] <source_dir> <destination>"
+        echo "  -d, --delete    Move files instead of copying"
+        echo "  photo-move /Volumes/CAMERA/DCIM ~/DCIM"
         return 1
       fi
 
-      local SOURCE="$1"
-      local DEST="$2"
+      local src="$1" dest="$2"
 
-      if [[ ! -d "$SOURCE" ]]; then
-        echo "Error: Source directory does not exist: $SOURCE"
+      if [[ ! -d "$src" ]]; then
+        echo "Source not found: $src" >&2
         return 1
       fi
 
-      _get_media_date() {
-        local file="$1"
+      local count=0 skipped=0
+
+      while IFS= read -r -d "" file; do
+        local name=$(basename "$file")
+        [[ "$name" == .* ]] && continue
+
         local raw_date
-
         raw_date=$(${pkgs.exiftool}/bin/exiftool -s3 -d '%Y-%m-%d' \
           -DateTimeOriginal -CreateDate -MediaCreateDate "$file" 2>/dev/null | head -1)
 
-        if [[ -n "$raw_date" && "$raw_date" != "0000-00-00" ]]; then
-          echo "$raw_date"
+        if [[ ! "$raw_date" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ || "$raw_date" == "0000-00-00" ]]; then
+          raw_date=$(${pkgs.coreutils}/bin/date -d "@$(${pkgs.coreutils}/bin/stat -c '%Y' "$file")" +%Y-%m-%d)
+        fi
+
+        local target="$dest/''${raw_date:0:4}/$raw_date"
+        mkdir -p "$target"
+
+        if [[ -e "$target/$name" ]]; then
+          ((skipped++)) || true
+          continue
+        fi
+
+        echo "[$raw_date] $name"
+        if (( delete_source )); then
+          mv "$file" "$target/$name"
         else
-          local mtime
-          mtime=$(${pkgs.coreutils}/bin/stat -c '%Y' "$file" 2>/dev/null)
-          ${pkgs.coreutils}/bin/date -d "@$mtime" +%Y-%m-%d
+          cp -a "$file" "$target/$name"
         fi
-      }
-
-      local copied=0
-      local failed=0
-
-      while IFS= read -r -d "" file; do
-        local filename=$(basename "$file")
-
-        [[ "$filename" == .* ]] && continue
-
-        local date_dir=$(_get_media_date "$file")
-        local year=''${date_dir:0:4}
-
-        echo "[$date_dir] $filename"
-
-        local target_dir="$DEST/$year/$date_dir"
-        if [[ "$DEST" != *:* ]]; then
-          mkdir -p "$target_dir"
-        fi
-
-        local rsync_opts=(-a --mkpath --progress --partial --ignore-existing)
-        [[ $delete_source -eq 1 ]] && rsync_opts+=(--remove-source-files)
-
-        if ${pkgs.rsync}/bin/rsync "''${rsync_opts[@]}" "$file" "$target_dir/$filename"; then
-          ((copied++)) || true
-        else
-          echo "  Failed to copy: $file"
-          ((failed++)) || true
-        fi
-      done < <(find "$SOURCE" -type f \( \
+        ((count++)) || true
+      done < <(find "$src" -type f \( \
         -iname "*.mp4" -o -iname "*.mov" -o -iname "*.mts" -o -iname "*.m2ts" -o -iname "*.avi" \
         -o -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.heic" -o -iname "*.heif" \
         -o -iname "*.cr2" -o -iname "*.cr3" -o -iname "*.nef" -o -iname "*.arw" -o -iname "*.dng" -o -iname "*.raf" -o -iname "*.orf" -o -iname "*.rw2" \
         \) -print0)
 
-      echo ""
-      echo "=== Summary ==="
-      echo "Copied: $copied"
-      echo "Failed: $failed"
-      [[ $delete_source -eq 1 ]] && echo "(source files removed)"
+      echo "Done: $count files, $skipped skipped"
     }
 
     function extract() {