diff --git a/atom b/atom index 868a925..6a33755 100755 --- a/atom +++ b/atom @@ -1603,6 +1603,37 @@ updateMimes removeObsoleteFiles +echo ' + SELECT id, + filename + FROM destination_files + WHERE source_file_id is NULL; + + SELECT "AtOM:NoMoreFiles"; +' >&3 + +deleted=0 +removed=0 +read -u4 line +until [[ $line == AtOM:NoMoreFiles ]] +do + id=${line%|*} + filename=${line#*|} + if [ -n "$filename" ] + then + if rm -f "$filename" + then + Delete destination_files <<<"id = $id" + (( ++deleted )) + fi + else + Delete destination_files <<<"id = $id" + (( ++removed )) + fi + read -u4 line +done +echo "Suppressed $deleted files, $removed removed from database" + # get files for reader in "${tagreaders[@]}" do @@ -2066,37 +2097,6 @@ endtime=$(date +%s) echo -e "\rRan $taskcount tasks, $failed of which failed, in $days" \ "days, $hours hours, $minutes minutes and $seconds seconds." -echo ' - SELECT id, - filename - FROM destination_files - WHERE source_file_id is NULL; - - SELECT "AtOM:NoMoreFiles"; -' >&3 - -deleted=0 -removed=0 -read -u4 line -until [[ $line == AtOM:NoMoreFiles ]] -do - id=${line%|*} - filename=${line#*|} - if [ -n "$filename" ] - then - if rm -f "$filename" - then - Delete destination_files <<<"id = $id" - (( ++deleted )) - fi - else - Delete destination_files <<<"id = $id" - (( ++removed )) - fi - read -u4 line -done -echo "Suppressed $deleted files, $removed removed from database" - echo "Purging empty directories." for path in "${destinationpath[@]}" do