Use the correct filename for deleting

[picsort] / slurp-pics

diff --git a/slurp-pics b/slurp-pics
index 7c90ed830df090eb34ed44bf8f02a151770f23c3..9602c3f4b7b20d54d6f81c174edc386d752d74b1 100755 (executable)
--- a/slurp-pics
+++ b/slurp-pics
@@ -1,17 +1,25 @@
 #!/bin/bash
 
 while read host path;do
 #!/bin/bash
 
 while read host path;do

+  outdir="slurp-$host"
+  seendir="slurp-seen"

   {
   {

+    mkdir -p "$outdir" "$seendir/$outdir"

     echo "cd $path"
     sftp -v -P 19362 -i .slurp-key "slurp@$host" <<< "cd $path"$'\n'"ls -1" |
       sed 1,2d |
       while read filename;do
     echo "cd $path"
     sftp -v -P 19362 -i .slurp-key "slurp@$host" <<< "cd $path"$'\n'"ls -1" |
       sed 1,2d |
       while read filename;do

-        if [[ -e "$filename" ]];then
+        output_filename="$outdir/${filename/jpg/jpeg}"
+        if [[ -e "$output_filename" || -e "$seendir/$output_filename" ]];then

           echo "skipping $filename" >&2
         else
           echo "getting $filename" >&2
           echo "skipping $filename" >&2
         else
           echo "getting $filename" >&2

-          echo "get -p $filename ${filename/jpg/jpeg}"
+          echo "get -p $filename $output_filename"

         fi
       done
    } | sftp -v -P 19362 -i .slurp-key "slurp@$host"
         fi
       done
    } | sftp -v -P 19362 -i .slurp-key "slurp@$host"

+   for f in "$outdir"/*;do
+     touch "$seendir/$f"
+   done
+   rename-to-date "$outdir"/*

 done < .slurp-hosts
 done < .slurp-hosts