From 4d4fea0f998f8cfcd3b9b22a64965b903f6c82de Mon Sep 17 00:00:00 2001 From: frederik Date: Sun, 24 Apr 2022 11:28:40 +0200 Subject: [PATCH 1/2] add permanent fix for midnight bug --- scripts/extract_new_birdsounds.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/extract_new_birdsounds.sh b/scripts/extract_new_birdsounds.sh index cee339a..754e218 100755 --- a/scripts/extract_new_birdsounds.sh +++ b/scripts/extract_new_birdsounds.sh @@ -27,12 +27,12 @@ for h in "${SCAN_DIRS[@]}";do # Field 5: Confidence # Removes old directories - #if echo "${h}" | grep $(date --date="yesterday" "+%A") &> /dev/null;then - # echo "Removing old directories" - # rm -drf "${h}" - # rm -drf "$(echo ${h} | cut -d'-' -f1-3)" - # continue - #fi + if echo "${h}" | grep $(date --date="-2 day" "+%A") &> /dev/null;then + echo "Removing old directories" + rm -drf "${h}" + rm -drf "$(echo ${h} | cut -d'-' -f1-3)" + continue + fi # Iterates over each "Analyzed" directory for i in $(find ${h} -name '*csv' 2>/dev/null | sort );do From 2ca8fb203bffcd7cad37ce0c6587f43c179c0eae Mon Sep 17 00:00:00 2001 From: frederik Date: Sun, 24 Apr 2022 18:21:10 +0200 Subject: [PATCH 2/2] move deleting of old directories to end of processing to minimize the chance we delete unprocessed files --- scripts/extract_new_birdsounds.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/extract_new_birdsounds.sh b/scripts/extract_new_birdsounds.sh index 754e218..947802b 100755 --- a/scripts/extract_new_birdsounds.sh +++ b/scripts/extract_new_birdsounds.sh @@ -26,14 +26,6 @@ for h in "${SCAN_DIRS[@]}";do # Field 4: Common name # Field 5: Confidence - # Removes old directories - if echo "${h}" | grep $(date --date="-2 day" "+%A") &> /dev/null;then - echo "Removing old directories" - rm -drf "${h}" - rm -drf "$(echo ${h} | cut -d'-' -f1-3)" - continue - fi - # Iterates over each "Analyzed" directory for i in $(find ${h} -name '*csv' 2>/dev/null | sort );do # Iterates over each '.csv' file found in each "Analyzed" directory @@ -142,7 +134,14 @@ for h in "${SCAN_DIRS[@]}";do # next extraction. [[ -d "${PROCESSED}" ]] || mkdir "${PROCESSED}" #echo "Moving processed files to ${PROCESSED}" - mv ${h}/* ${PROCESSED} &> /dev/null || continue + mv ${h}/* ${PROCESSED} &> /dev/null || true + + # Removes old directories + if echo "${h}" | grep $(date --date="-2 day" "+%A") &> /dev/null;then + echo "Removing old directories" + rm -drf "${h}" + rm -drf "$(echo ${h} | cut -d'-' -f1-3)" + fi done #echo "Linking Processed files to "${EXTRACTED}/Processed" web directory"