From d8009184fc0f8123ae1e32af202a7b8b3cf65a6a Mon Sep 17 00:00:00 2001
From: AustrianToast <austriantoast@hopeless-cloud.xyz>
Date: Wed, 11 Dec 2024 20:05:47 +0100
Subject: [PATCH] f around with if statements

---
 add_and_download_url.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/add_and_download_url.sh b/add_and_download_url.sh
index cb90adb..95ea947 100755
--- a/add_and_download_url.sh
+++ b/add_and_download_url.sh
@@ -1,42 +1,42 @@
 #!/usr/bin/bash
 
+IGREEN="\033[0;92m"     # Intense Green
+IYELLOW="\033[0;93m"    # Intense Yellow
+IRED='\033[0;91m'       # Intense Red
+NO_COLOR="\033[0m"      # Text Reset
+
 [[ -z $1 ]] && exit 1
 
 if [[ -z $2 ]]; then
-    echo 'output=$([[ $(hostname) = \s\a\t\a\n ]] && cargo run -- add_url "$1" || ./Hentai add_url "$1")'
+    output=$([[ $(hostname) = \s\a\t\a\n ]] && cargo run -- add_url "$1" || ./Hentai add_url "$1")
 else
-    echo 'output=$([[ $(hostname) = \s\a\t\a\n ]] && cargo run -- add_custom_name "$1" "$2" || ./Hentai add_custom_name "$1" "$2")'
+    output=$([[ $(hostname) = \s\a\t\a\n ]] && cargo run -- add_custom_name "$1" "$2" || ./Hentai add_custom_name "$1" "$2")
 fi
 
-output="https://rule34.xxx/index.php?page=post&s=list&tags=donnard # Artists/donnard/Rule34"
+# output="https://rule34.xxx/index.php?page=post&s=list&tags=donnard # Artists/donnard/Rule34"
 
-[[ $output =~ "#" ]] || (echo "$output" && exit)
+echo "$output"
+[[ $output =~ "#" ]] || exit 1
 
 url=$(echo "$output" | awk '{print $1}')
 path=$(echo "$output" | awk '{print $3}')
 
-echo "$url"
-echo "$path"
-
 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"
+
 for ((n=0;n<5;n++)); do
     gallery-dl --config ./gallery-dl/config.json --directory "$path" "$url"
 
-    if [[ $(echo $?) -eq 0 ]]; then
-        break
-    fi
+    [[ $(echo $?) -eq 0 ]] && (echo -e "${IGREEN}Success${NO_COLOR}"; break)
+    
     echo -e "${IYELLOW}download failed${NO_COLOR}"
 
-    if [[ $(ping -qc 3 v4.ip.hopeless-cloud.xyz > /dev/null 2>&1) -ne 0 ]]; then
-        echo -e "${IYELLOW}no internet${NO_COLOR}"
-        exit 1
-    elif [[ $(ping -qc 3 v6.ip.hopeless-cloud.xyz > /dev/null 2>&1) -ne 0 ]]; then
-        echo -e "${IYELLOW}no internet${NO_COLOR}"
-        exit 1
-    fi
+    [[ $(ping -c 3 v4.ip.hopeless-cloud.xyz > /dev/null 2>&1) -ne 0 ]] && (echo -e "${IRED}no internet${NO_COLOR}"; exit 1)
+    [[ $(ping -c 3 v6.ip.hopeless-cloud.xyz > /dev/null 2>&1) -ne 0 ]] && (echo -e "${IRED}no internet${NO_COLOR}"; exit 1)
+
     echo -e "${IGREEN}has internet${NO_COLOR}"
 done