diff --git a/gallery-dl/gallery-dl.sh b/gallery-dl/gallery-dl.sh index 9803f49..7a95f24 100755 --- a/gallery-dl/gallery-dl.sh +++ b/gallery-dl/gallery-dl.sh @@ -17,8 +17,14 @@ setup_test() { } download() { - [[ -f downloaded_$1.txt ]] || echo -e "${IYELLOW}download_$1.txt doesn't exist${NO_COLOR}" || exit 1 - cp downloaded_$1.txt to_download_$1.txt + input_file="$1.links" + + if [[ ! -f $input_file ]]; then + echo -e "${IYELLOW}$input_file doesn't exist${NO_COLOR}" + exit 1 + fi + + cp $input_file to_download_$1.txt for ((n=0;n<5;n++)); do gallery-dl --config ./gallery-dl/config.json --input-file-delete to_download_$1.txt @@ -37,7 +43,7 @@ download() { echo -e "${IGREEN}has internet${NO_COLOR}" done - [[ $(hostname) != \s\a\t\a\n ]] && cp ./gallery-dl/archive-$1.sqlite3 /data/backup + [[ $(hostname) != \s\a\t\a\n ]] && cp ./gallery-dl/archive-${$1,,}.sqlite3 /data/backup if [ -s to_download_$1.txt ]; then exit 1 @@ -47,4 +53,4 @@ download() { } [[ $(hostname) == \s\a\t\a\n ]] && setup_test -download $1 \ No newline at end of file +download $1 diff --git a/gallery-dl/gallery-dl/config.json b/gallery-dl/gallery-dl/config.json index 62f22ce..0226207 100644 --- a/gallery-dl/gallery-dl/config.json +++ b/gallery-dl/gallery-dl/config.json @@ -11,6 +11,7 @@ "filename": "{md5}.{extension}", "directory": ["{search_tags}", "Rule34"] }, + "kemonoparty": { "archive": "./gallery-dl/archive-kemono.sqlite3", @@ -18,6 +19,7 @@ "filename": "{hash}.{extension}", "directory": ["{user}", "Kemono"] }, + "coomerparty": { "archive": "./gallery-dl/archive-coomer.sqlite3", @@ -25,12 +27,20 @@ "filename": "{hash}.{extension}", "directory": ["{user}", "Coomer"] }, + "gofile": { "archive": "./gallery-dl/archive-gofile.sqlite3", "filename": "{id}.{extension}", "directory": ["{id}", "Gofile"] + }, + + "atfbooru": { + "archive": "./gallery-dl/archive-atfbooru.sqlite3", + + "filename": "{md5}.{extension}", + "directory": ["{search_tags}", "ATFBooru"] } }, @@ -45,6 +55,7 @@ "output": { "ansi": true, + "log": { "level": "info", "format": { @@ -54,6 +65,7 @@ "error" : "\u001b[1;31m{name}: {message}\u001b[0m" } }, + "logfile": { "path": "./gallery-dl/log.txt", "mode": "w",