add iwara support

add_and_download_url.sh

@@ -19,28 +19,33 @@ echo "$output"
 url=$(echo "$output" | awk '{print $1}')
 path=$(echo "$output" | awk '{print $3}')
 
-if [[ $(hostname) = \s\a\t\a\n ]]; then
-    [[ -d ./Artists ]] || mkdir ./Artists
-    rm -rf ./gallery-dl/*.sqlite3 ./gallery-dl/log.txt ./Artists/* || exit 1
-fi
-
-echo "command: gallery-dl --config ./gallery-dl/config.json --directory $path $url"
+[[ $(hostname) = \s\a\t\a\n ]] && rm -rf ./Artists/*
 
 for ((n=0;n<5;n++)); do
-    if ! gallery-dl --config ./gallery-dl/config.json --directory "$2" "$1"; then
-        echo -e "${IGREEN}Success${NO_COLOR}"
-        exit 0
+    if [[ $url =~ "iwara.tv" ]]; then
+        echo "command: yt-dlp --config-locations ./yt-dlp/iwara.conf -o ${path}/%(id)s.%(ext)s $url"
+
+        if yt-dlp --config-locations ./yt-dlp/iwara.conf -o "${path}/%(id)s.%(ext)s" "$url"; then
+            echo -e "${IGREEN}Success${NO_COLOR}"
+            exit 0
+        fi
+    else
+        echo "command: gallery-dl --config ./gallery-dl/config.json --directory $path $url"
+
+        if gallery-dl --config ./gallery-dl/config.json --directory "$path" "$url"; then
+            echo -e "${IGREEN}Success${NO_COLOR}"
+            exit 0
+        fi
     fi
     echo -e "${IYELLOW}download failed${NO_COLOR}"
 
-    if ! ping -c 3 v4.ip.hopeless-cloud.xyz > /dev/null 2>&1; then
-        echo -e "${IRED}no internet${NO_COLOR}"
+    if ! ping -qc 3 v4.ip.hopeless-cloud.xyz > /dev/null 2>&1; then
+        echo -e "${IYELLOW}no internet${NO_COLOR}"
         exit 1
-    fi
-    if ! ping -c 3 v6.ip.hopeless-cloud.xyz > /dev/null 2>&1; then
-        echo -e "${IRED}no internet${NO_COLOR}"
+    elif ! ping -qc 3 v6.ip.hopeless-cloud.xyz > /dev/null 2>&1; then
+        echo -e "${IYELLOW}no internet${NO_COLOR}"
         exit 1
+    else
+        echo -e "${IGREEN}has internet${NO_COLOR}"
     fi
-
-    echo -e "${IGREEN}has internet${NO_COLOR}"
 done

download_website.sh

@@ -12,10 +12,18 @@ download() {
     SUCCESS="false"
 
     for ((n=0;n<5;n++)); do
-        if gallery-dl --config ./gallery-dl/config.json --directory "$2" "$1"; then
-            echo "$1" >> "$SUCCESS_FILE"
-            SUCCESS="true"
-            break
+        if [[ $1 =~ "iwara.tv" ]]; then
+            if yt-dlp --config-locations ./yt-dlp/iwara.conf -o "${2}/%(id)s.%(ext)s" "$1"; then
+                echo "$1" >> "$SUCCESS_FILE"
+                SUCCESS="true"
+                break
+            fi
+        else
+            if gallery-dl --config ./gallery-dl/config.json --directory "$2" "$1"; then
+                echo "$1" >> "$SUCCESS_FILE"
+                SUCCESS="true"
+                break
+            fi
         fi
         echo -e "${IYELLOW}download failed${NO_COLOR}"
 
@@ -33,10 +41,7 @@ download() {
     [[ $SUCCESS != \t\r\u\e ]] && echo "$1" >> "$FAIL_FILE"
 }
 
-if [[ $(hostname) = \s\a\t\a\n ]]; then
-    [[ -d ./Artists ]] || mkdir ./Artists
-    rm -rf ./gallery-dl/*.sqlite3 ./gallery-dl/log.txt ./Artists/* || exit 1
-fi
+[[ $(hostname) = \s\a\t\a\n ]] && rm -rf ./Artists/*
 
 if [[ -f $FAIL_FILE ]]; then
     [[ -f "${FAIL_FILE}.old" ]] && rm -f "${FAIL_FILE}.old"
@@ -66,4 +71,4 @@ while IFS= read -r line; do
     download $url $path
 done < "$IN_FILE"
 
-[[ $(hostname) != \s\a\t\a\n ]] && cp ./gallery-dl/archive-${1,,}.sqlite3 /data/backup
+[[ -s $FAIL_FILE ]] && echo -e "${IGREEN}Sucess!${NO_COLOR}" || echo -e "${IRED}Some links failed!${NO_COLOR}"

yt-dlp/downloaded.txt

@@ -0,0 +1,2 @@
+iwara uujEyv4Z53qada
+iwara xFJmQbF75V2Rhg

yt-dlp/iwara.conf

@@ -0,0 +1,7 @@
+# Video settings
+-f "Source / 540 / 360"
+
+# Download settings
+--limit-rate 10M
+--retries 10
+--abort-on-unavailable-fragments

yt-dlp/yt-dlp_iwara.conf

@@ -1,12 +0,0 @@
-# Video settings
--f "Source / 540 / 360"
-
-# Download settings
---limit-rate 10M
---retries 10
---abort-on-unavailable-fragments
-
-# Filesystem settings
---restrict-filenames
--P "/home/rene/projects/Hentai/yt-dlp/Artists"
-# -o "%(uploader_id)s/%(id)s.%(ext)s"