From 0b27c9d7d7757f9530f2efab14d246d268849925 Mon Sep 17 00:00:00 2001 From: Milot Mirdita Date: Tue, 11 Jun 2024 16:37:03 +0900 Subject: [PATCH] Allow resuming of interrupted downloads if databases and createtaxdb --- data/workflow/createtaxdb.sh | 15 ++++++++++++--- data/workflow/databases.sh | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/data/workflow/createtaxdb.sh b/data/workflow/createtaxdb.sh index 66fb7f96c..7d812377b 100755 --- a/data/workflow/createtaxdb.sh +++ b/data/workflow/createtaxdb.sh @@ -40,13 +40,22 @@ downloadFile() { ARIA) FILENAME=$(basename "${OUTPUT}") DIR=$(dirname "${OUTPUT}") - aria2c --max-connection-per-server="$ARIA_NUM_CONN" --allow-overwrite=true -o "$FILENAME" -d "$DIR" "$URL" && return 0 + if aria2c -c --max-connection-per-server="$ARIA_NUM_CONN" --allow-overwrite=true -o "${FILENAME}.aria2" -d "$DIR" "$URL"; then + mv -f -- "${OUTPUT}.aria2" "${OUTPUT}" + return 0 + fi ;; CURL) - curl -o "$OUTPUT" "$URL" && return 0 + if curl -L -C - -o "${OUTPUT}.curl" "$URL"; then + mv -f -- "${OUTPUT}.curl" "${OUTPUT}" + return 0 + fi ;; WGET) - wget -O "$OUTPUT" "$URL" && return 0 + if wget -O "${OUTPUT}.wget" -c "$URL"; then + mv -f -- "${OUTPUT}.wget" "${OUTPUT}" + return 0 + fi ;; esac done diff --git a/data/workflow/databases.sh b/data/workflow/databases.sh index 61704ecc6..0e4df563f 100644 --- a/data/workflow/databases.sh +++ b/data/workflow/databases.sh @@ -40,13 +40,22 @@ downloadFile() { ARIA) FILENAME=$(basename "${OUTPUT}") DIR=$(dirname "${OUTPUT}") - aria2c --max-connection-per-server="$ARIA_NUM_CONN" --allow-overwrite=true -o "$FILENAME" -d "$DIR" "$URL" && return 0 + if aria2c -c --max-connection-per-server="$ARIA_NUM_CONN" --allow-overwrite=true -o "${FILENAME}.aria2" -d "$DIR" "$URL"; then + mv -f -- "${OUTPUT}.aria2" "${OUTPUT}" + return 0 + fi ;; CURL) - curl -L -o "$OUTPUT" "$URL" && return 0 + if curl -L -C - -o "${OUTPUT}.curl" "$URL"; then + mv -f -- "${OUTPUT}.curl" "${OUTPUT}" + return 0 + fi ;; WGET) - wget -O "$OUTPUT" "$URL" && return 0 + if wget -O "${OUTPUT}.wget" -c "$URL"; then + mv -f -- "${OUTPUT}.wget" "${OUTPUT}" + return 0 + fi ;; esac done