# 2025.02.20 - [up_ranoz] Fixed parsing of ranoz upload link (cloudflare)

# 2025.02.20 - [sendnow] Better handling of sendnow new Tor ip blocking
# 2025.02.20 - [up_ranoz / up_uploadhive] Add obfuscation of .7z in multipart filename that was missing

hosts/sendnow.sh

@@ -1,6 +1,6 @@
 #!    Name: sendnow.sh
 #!  Author: kittykat
-#! Version: 2025.02.15
+#! Version: 2025.02.20
 #!    Desc: Add support for downloading and processing of urls for a new host
 #!   Usage: Copy this file into the ./${ScriptDir}/hosts/ folder
 #!
@@ -77,13 +77,12 @@ snow_DownloadFile() {
 #!
 snow_FetchFileInfo() {
     finalAttempt=$1
-    maxfetchretries=5
+    maxfetchretries=20
     snow_cookie_jar=""
     echo -e "${GREEN}# Fetching post info…${NC}"
     for ((i=1; i<=$maxfetchretries; i++)); do
         mkdir -p "${WorkDir}/.temp"
 		snow_cookie_jar=$(mktemp "${WorkDir}/.temp/snow_cookies""${instance_no}"".XXXXXX")
-        printf " ."
         tor_identity="${RANDOM}"
         CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
         trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; rm -f "${snow_cookie_jar}"; echo ""; tput cnorm; exit" 0 1 2 3 6 15
@@ -92,6 +91,7 @@ snow_FetchFileInfo() {
             debugHtml "${remote_url##*/}" "snow_dwnpage$i" "${response}"
         fi
 		if [[ -z $response ]] ; then
+		    printf " ."
 		    rm -f "${snow_cookie_jar}";
 		    if [[ $i == $maxfetchretries ]] ; then
                 printf "\\n"
@@ -105,14 +105,15 @@ snow_FetchFileInfo() {
                 continue
             fi
 		fi
-		if grep -Eqi "Your IP has been banned|you are banned" <<< "$response"; then
+		if grep -Eqi "blocked downloads from the Tor network|banned your IP|IP has been banned|you are banned" <<< "$response"; then
+            printf " -"
             rm -f "${snow_cookie_jar}";
 		    if [[ $i == $maxfetchretries ]] ; then
                 printf "\\n"
-                echo -e "${RED}| Failed to extract download link.${NC}"
+                echo -e "${RED}| Blocked Tor ip${NC}"
                 warnAndRetryUnknownError=true
                 if [[ "${finalAttempt}" == "true" ]] ; then
-            		failedRetryDownload "${remote_url}" "" ""
+            		failedRetryDownload "${remote_url}" "Blocked Tor ip" ""
             	fi
                 return 1
             else
@@ -120,6 +121,7 @@ snow_FetchFileInfo() {
             fi
         fi
         if grep -Eqi "404|not found|no such file|File was deleted|File not found|File was removed" <<< "$response"; then
+            printf " x"
             rm -f "${snow_cookie_jar}";
             printf "\\n"
             echo -e "${RED}| The file was not found. It could be deleted or expired.${NC}"
@@ -128,7 +130,7 @@ snow_FetchFileInfo() {
             return 1
         fi
         if grep -Eqi 'input type="hidden" name="id" value="' <<< "$response"; then
-            printf "\\n"
+            printf " +\\n"
             echo -e "${GREEN}| Post link found${NC}"
             post_op=$(grep -oPi '(?<=input type="hidden" name="op" value=").*(?=">)' <<< "$response")
             post_id=$(grep -oPi '(?<=input type="hidden" name="id" value=").*(?=">)' <<< "$response")

hosts/up_ranoz.sh

@@ -1,6 +1,6 @@
 #!    Name: up_ranoz.sh
 #!  Author: kittykat
-#! Version: 2025.02.14
+#! Version: 2025.02.20
 #!    Desc: Add support for uploading files to bedrive.ru
 #!    Info: Files are accessible at https://ranoz.gg/file/<file_code>
 #! MaxSize: 20GB
@@ -115,7 +115,8 @@ rz_PostFile() {
         elif [[ "$origext" == "tar" ]]; then
             tmpfilepath="${filepath%.*}--t_.${randomext}"
         elif [[ "${filepath##*/}" == *".7z."* ]]; then
-            tmpfilepath="${filepath%.*}_-7--${origext}_.${randomext}"
+            tmpfilepath="${filepath%\.7z*}${filepath##*\.7z}"
+            tmpfilepath="${tmpfilepath%.*}_-7--${origext}_.${randomext}"
         else
             tmpfilepath="${filepath%.*}--${origext}_.${randomext}"
         fi
@@ -136,7 +137,7 @@ rz_PostFile() {
     fi
     if grep -Eqi '"upload_url":"https://' <<< "$response" ; then
         PostUrlHost=$(grep -oPi '(?<="upload_url":").*?(?=".*$)' <<< "$response")
-        downloadLink=$(grep -oPi '(?<="url":").*?(?=".*$)' <<< "$response")
+        downloadLink=$(grep -oPi '(?<=,"url":").*?(?=".*$)' <<< "$response")
         echo -e "${GREEN}| Upload url obtained...${NC}"
     else
         err=$(grep -oPi '(?<="errors":\[\{"message":").*?(?=".*$)' <<< "$response")

hosts/up_uploadhive.sh

@@ -1,6 +1,6 @@
 #!    Name: up_uploadhive.sh
 #!  Author: kittykat
-#! Version: 2025.02.14
+#! Version: 2025.02.20
 #!    Desc: Add support for uploading files to uploadhive.com
 #!    Info: Files are accessible at https://uploadhive.com/<file_code>
 #! MaxSize: 5GB
@@ -116,7 +116,8 @@ uhive_PostFile() {
         elif [[ "$origext" == "tar" ]]; then
             tmpfilepath="${filepath%.*}--t_.${randomext}"
         elif [[ "${filepath##*/}" == *".7z."* ]]; then
-            tmpfilepath="${filepath%.*}_-7--${origext}_.${randomext}"
+            tmpfilepath="${filepath%\.7z*}${filepath##*\.7z}"
+            tmpfilepath="${tmpfilepath%.*}_-7--${origext}_.${randomext}"
         else
             tmpfilepath="${filepath%.*}--${origext}_.${randomext}"
         fi