Move startup stuff to start()

[picsort] / slurp-pics

diff --git a/slurp-pics b/slurp-pics
index 7c90ed830df090eb34ed44bf8f02a151770f23c3..8bbd7ca9e072c38f8f313220fefdb779b361d802 100755 (executable)
--- a/slurp-pics
+++ b/slurp-pics
@@ -1,17 +1,28 @@
-#!/bin/bash
+#!/usr/bin/env bash

 
 

+LEGACY='-oHostKeyAlgorithms=+ssh-dss'
+sftp=( sftp -v -P 19362 -i .slurp-key -oConnectTimeout=4 $LEGACY )
+
+seendir="slurp-seen"

 while read host path;do
 while read host path;do

+  outdir="slurp-$host-${path//\//,}"

   {
   {

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

     echo "cd $path"
     echo "cd $path"

-    sftp -v -P 19362 -i .slurp-key "slurp@$host" <<< "cd $path"$'\n'"ls -1" |
+    "${sftp[@]}" "slurp@$host" <<< "cd $path"$'\n'"ls -1" |

       sed 1,2d |
       while read filename;do
       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
         fi
       done

-   } | sftp -v -P 19362 -i .slurp-key "slurp@$host"
+   } | "${sftp[@]}" "slurp@$host"
+   for f in "$outdir"/*;do
+     touch "$seendir/$f"
+   done
+   rename-to-date "$outdir"/*

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