work on recv-media

1 files changed, 13 insertions, 10 deletions

diff --git a/hel/recv-media.nix b/hel/recv-media.nix
index 582a1ee3..91801593 100644
--- a/hel/recv-media.nix
+++ b/hel/recv-media.nix
@@ -27,11 +27,11 @@ writeScriptBin "recv-media" ''
 
   dir=/var/media
   group=$(stat -c '%G' $dir)
-  tmpFile="''${dir}"/.tmp/$(basename "$1")
-  target="''${dir}"/$(basename "$1")
+  tmpFile="''${dir}/.tmp/''${1:t}"
+  target="''${dir}/''${1:t}"
 
   if [[ -n "''${3}" ]]; then
-    target="''${dir}"/$(echo ''${3} | base64 -d)
+    target="''${dir}"/$(base64 -d <<<''${3})
   fi
 
   logger --id=$pid -t recv-media -p user.debug <<EOF
@@ -46,19 +46,22 @@ writeScriptBin "recv-media" ''
     exec -- sg $group "$0 $*"
   fi
 
+  typeset -a failures
+  failures=()
+
   (
     if ! cp -lnv --preserve=all "$1" "''${target}"; then
-      mkdir -pv $(dirname "''${tmpFile}") || exit 1
+      mkdir -pv "''${tmpFile:h}" || failures+="mkdir"
 
-      ionice -c 3 -t cp -vn --preserve=all "$1" "''${tmpFile}" && mv -v "''${tmpFile}" "''${target}" || exit 1
-    fi
-    touch -c -m -t "$2" "''${target}" || exit 1
-  ) || (
-    if $notify; then
-      printf "%s\n%s\n" $(basename "$1") "Failed to download" | notify-''${notifyUser} -a recv-media -u Critical
+      ionice -c 3 -t cp -vn --preserve=all "$1" "''${tmpFile}" && mv -v "''${tmpFile}" "''${target}" || failures+="cp"
     fi
+    touch -c -m -t "$2" "''${target}" || failures+="touch"
   )
 
+  if $notify && [[ $#failures -gt 0 ]]; then
+    printf "%s\n%s\n%s" $(basename "$1") "Failed to download" ''${(j:, :)failures} | notify-''${notifyUser} -a recv-media -u Critical
+  fi
+
   if $notify; then
     (
       summary=${if showTitle then ''$(ffmpeg -i "''${target}" -f ffmetadata pipe:1 2>/dev/null | sed -r '/^\[CHAPTER\]$/q; /^title=/!d; s/^title=//')'' else ''""''}