# 2025.02.18 - [uploadhive] Add handling of the new /cgi-bin/dl.cgi/ url tickets (WIP)
# (unfortunately, this is tied to the requesting ip, so downloads get "Wrong IP") # 2025.02.18 - [up_oshi] Add Manage url as comment on uploads # 2025.02.18 - [up_oshi / oshi] use /nossl/ url and http # 2025.02.17 - [gofile] Add a random sleep if 429 response detected (too many requests) # 2025.02.17 - [*ALL] Audit and update all single bracket operations # 2025.02.17 - [filehaus] Fix downloading from fh # 2025.02.15 - [uploadbay] Update urls regex for acceptable alternate # 2025.02.15 - [up_sendnow] Add send.now as upload host # 2025.02.15 - [sendnow] Fix handling of filenames with special characters in url
This commit is contained in:
parent
d48116dbe3
commit
d62376f7a8
GPG key ID:
E3F1556620F70C3C
103 changed files with 3541 additions and 3517 deletions
|
|
@ -46,24 +46,24 @@ hex_DownloadFile() {
|
|||
tor_identity="${RANDOM}"
|
||||
finalAttempt="false"
|
||||
for ((z=0; z<=$MaxUrlRetries; z++)); do
|
||||
if [ $z -eq $MaxUrlRetries ] ; then
|
||||
if [[ $z -eq $MaxUrlRetries ]] ; then
|
||||
finalAttempt="true"
|
||||
fi
|
||||
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
|
||||
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
if hex_FetchFileInfo $finalAttempt && check_file_extension && hex_GetFile "${filecnt}" $((z+1)) $finalAttempt ; then
|
||||
return 0
|
||||
elif [ $z -lt $MaxUrlRetries ]; then
|
||||
if [ "${fileAlreadyDone}" == "true" ] ; then
|
||||
elif [[ $z -lt $MaxUrlRetries ]]; then
|
||||
if [[ "${fileAlreadyDone}" == "true" ]] ; then
|
||||
break
|
||||
fi
|
||||
if [[ "${warnAndRetryUnknownError}" == "true" ]] ; then
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "error" "Retry due to an unknown issue: attempt #$((z+1)) of ${MaxUrlRetries}"
|
||||
fi
|
||||
fi
|
||||
if [[ "${exitDownloadError}" == "true" || "${exitDownloadNotAvailable}" == "true" ]] ; then
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "error" "Exit due to unrecoverable issue"
|
||||
fi
|
||||
rm -f "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}"
|
||||
|
|
@ -85,42 +85,42 @@ hex_FetchFileInfo() {
|
|||
echo -e "${GREEN}# Fetching download url… ${NC}[.] timeout, [-] blocked ip, [*] wait time${NC}"
|
||||
local bDonePrint=true
|
||||
for ((j=1; j<=$hexmaxfetchfileretries; j++)); do
|
||||
if [ "${bDonePrint}" == "false" ]; then
|
||||
if [[ "${bDonePrint}" == "false" ]]; then
|
||||
printf " ."
|
||||
fi
|
||||
bDonePrint=false
|
||||
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
|
||||
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
if [ "$bNoNewTorIdent" == "true" ]; then
|
||||
if [[ "$bNoNewTorIdent" == "true" ]]; then
|
||||
bNoNewTorIdent=false
|
||||
else
|
||||
tor_identity="${RANDOM}"
|
||||
fi
|
||||
if grep -Eq "pjscloud.sh" <<< "$LoadPlugins" && [ "$PJSCloud_hexload" == "true" ]; then
|
||||
if [ "$hexUseDownload" == "download2" ]; then
|
||||
if grep -Eq "pjscloud.sh" <<< "$LoadPlugins" && [[ "$PJSCloud_hexload" == "true" ]]; then
|
||||
if [[ "$hexUseDownload" == "download2" ]]; then
|
||||
form_data="op=download1&id=${file_id}&rand=&usr_login=&fname=&ajax=1&method_free=1&dataType=json"
|
||||
response=$(pjscloud_tor_request "https://hexload.com/download" "$form_data")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "hex_dwnpage$j" "form_data: ${form_data}"$'\n'"${response}"
|
||||
fi
|
||||
else
|
||||
form_data="op=download1&id=${file_id}&rand=&usr_login=&fname=&ajax=1&method_free=1&dataType=json"
|
||||
response=$(tor_curl_request --insecure -s --data "$form_data" "https://hexload.com/download")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "hex_dwnpage$j" "form_data: ${form_data}"$'\n'"${response}"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ "$hexUseDownload" == "download2" ]; then
|
||||
if [[ "$hexUseDownload" == "download2" ]]; then
|
||||
form_data="op=download1&id=${file_id}&rand=&usr_login=&fname=&ajax=1&method_free=1&dataType=json"
|
||||
response=$(tor_curl_request --insecure -s --data "$form_data" "https://hexload.com/download")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "hex_dwnpage$j" "form_data: ${form_data}"$'\n'"${response}"
|
||||
fi
|
||||
else
|
||||
form_data="op=download2&id=${file_id}&rand=&usr_login=&fname=&ajax=1&method_free=1&dataType=json"
|
||||
response=$(tor_curl_request --insecure -s --data "$form_data" "https://hexload.com/download")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "hex_dwnpage$j" "form_data: ${form_data}"$'\n'"${response}"
|
||||
fi
|
||||
fi
|
||||
|
|
@ -129,11 +129,11 @@ hex_FetchFileInfo() {
|
|||
download_url=$(echo "$response" | grep -oPi '(?<="link":")[^"]+(?=")' | base64 --decode)
|
||||
download_url=$(urlencode_spaces "$download_url")
|
||||
if grep -Eqi "Sorry, you have been blocked" <<< "$response"; then
|
||||
if [ $j == $hexmaxfetchfileretries ] ; then
|
||||
if ((j == hexmaxfetchfileretries)) ; then
|
||||
printf "\\n"
|
||||
echo -e "${YELLOW}| Too many failed attempts${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -153,7 +153,7 @@ hex_FetchFileInfo() {
|
|||
return 1
|
||||
fi
|
||||
wait_time=$(grep -oP '(?<=<span id="countdown">Wait <span class="seconds">).*?(?=</span> seconds.*$)' <<< "$response")
|
||||
if [ "$hexUseDownload" == "download1" ] && grep -Eqi 'name="op" value="download2">' <<< "$response"; then
|
||||
if [[ "$hexUseDownload" == "download1" ]] && grep -Eqi 'name="op" value="download2">' <<< "$response"; then
|
||||
printf "\\n"
|
||||
echo -e "${YELLOW}| File uses download2.. switching.${NC}"
|
||||
hexUseDownload="download2"
|
||||
|
|
@ -163,17 +163,17 @@ hex_FetchFileInfo() {
|
|||
continue
|
||||
fi
|
||||
if grep -Eqi '>You have to wait' <<< "$response"; then
|
||||
if [ $j == $hexmaxfetchfileretries ] ; then
|
||||
if ((j == hexmaxfetchfileretries)) ; then
|
||||
req_msg=$(grep -oP '(?<=>You have to wait ).*?(?= till next download.*$)' <<< "$response")
|
||||
req_msg=$(sanitize_html_tags "${req_msg}")
|
||||
printf "\\n"
|
||||
echo -e "${YELLOW}| Failed: ${req_msg}.${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "${req_msg}" ""
|
||||
fi
|
||||
return 1
|
||||
elif [ "$hexUseDownload" == "download1" ] && grep -Eqi 'name="op" value="download2">' <<< "$response"; then
|
||||
elif [[ "$hexUseDownload" == "download1" ]] && grep -Eqi 'name="op" value="download2">' <<< "$response"; then
|
||||
printf "\\n"
|
||||
echo -e "${YELLOW}| File uses download2.. switching.${NC}"
|
||||
hexUseDownload="download2"
|
||||
|
|
@ -202,7 +202,7 @@ hex_FetchFileInfo() {
|
|||
failedRetryDownload "${remote_url}" "$req_msg" ""
|
||||
return 1
|
||||
fi
|
||||
if [ "$hexUseDownload" == "download1" ] && grep -Eqi 'name="op" value="download2">' <<< "$response"; then
|
||||
if [[ "$hexUseDownload" == "download1" ]] && grep -Eqi 'name="op" value="download2">' <<< "$response"; then
|
||||
printf "\\n"
|
||||
echo -e "${YELLOW}| File uses download2.. switching.${NC}"
|
||||
hexUseDownload="download2"
|
||||
|
|
@ -211,11 +211,11 @@ hex_FetchFileInfo() {
|
|||
continue
|
||||
fi
|
||||
if [[ -z "$download_url" ]]; then
|
||||
if [ $j == $hexmaxfetchfileretries ] ; then
|
||||
if ((j == hexmaxfetchfileretries)) ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract CDN URL${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "Failed to extract CDN URL" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -223,12 +223,12 @@ hex_FetchFileInfo() {
|
|||
continue
|
||||
fi
|
||||
fi
|
||||
if [ "$filename_override" == "" ] && [ -z "$filename" ] ; then
|
||||
if [ $j == $hexmaxfetchfileretries ] ; then
|
||||
if [[ "$filename_override" == "" ]] && [[ -z "$filename" ]] ; then
|
||||
if ((j == hexmaxfetchfileretries)) ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract file name${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "ailed to extract file name" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -238,8 +238,8 @@ hex_FetchFileInfo() {
|
|||
fi
|
||||
break #Good to go here
|
||||
done
|
||||
touch ${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}
|
||||
if [ ! "$filename_override" == "" ] ; then
|
||||
touch "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}"
|
||||
if [[ ! "$filename_override" == "" ]] ; then
|
||||
filename="$filename_override"
|
||||
fi
|
||||
filename=$(sanitize_file_or_folder_name "${filename}")
|
||||
|
|
@ -252,7 +252,7 @@ hex_FetchFileInfo() {
|
|||
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
tor_identity="${RANDOM}"
|
||||
file_header=$(tor_curl_request --insecure --head -L -s --referer "$file_url" "$download_url")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "hex_head$j" "download_url: ${download_url}"$'\n'"${file_header}"
|
||||
fi
|
||||
if ! grep -Eqi 'HTTP/2 200|HTTP/1.1 200|200 OK' <<< $file_header ; then
|
||||
|
|
@ -268,12 +268,12 @@ hex_FetchFileInfo() {
|
|||
fi
|
||||
file_size_bytes=$(grep -oPi '(?<=content-length: ).*' <<< "$file_header")
|
||||
file_size_bytes=${file_size_bytes//[$'\t\r\n']}
|
||||
if [ -z $file_size_bytes ] ; then
|
||||
if [[ -z $file_size_bytes ]] ; then
|
||||
if ((j < hexmaxfetchfileretries)); then
|
||||
printf "\\n"
|
||||
echo -e "${YELLOW}| Filesize not found… retry${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "Filesize not found" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -310,20 +310,20 @@ hex_GetFile() {
|
|||
flockDownload="${WorkDir}/.flocks/${filename//[^a-zA-Z0-9\.\_\-]/}.flock"
|
||||
for ((j=1; j<=$MaxDownloadRetries; j++)); do
|
||||
pd_presize=0
|
||||
if [ -f "$file_path" ] ; then
|
||||
if [[ -f "$file_path" ]] ; then
|
||||
pd_presize=$(stat --format="%s" "$file_path" | tr -d '[:space:]')
|
||||
fi
|
||||
GetRandomUA
|
||||
tor_identity="${RANDOM}"
|
||||
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
|
||||
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; rm -f $flockDownload; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
if [ "${RateMonitorEnabled}" == "true" ]; then
|
||||
if [[ "${RateMonitorEnabled}" == "true" ]]; then
|
||||
tor_curl_request --insecure --speed-limit $DownloadSpeedMin --speed-time $DownloadTimeoutInterval --referer "$file_url" "$download_url" --continue-at - --output "$file_path"
|
||||
else
|
||||
tor_curl_request --insecure --referer "$file_url" "$download_url" --continue-at - --output "$file_path"
|
||||
fi
|
||||
received_file_size=0
|
||||
if [ -f "$file_path" ] ; then
|
||||
if [[ -f "$file_path" ]] ; then
|
||||
received_file_size=$(stat --format="%s" "$file_path" | tr -d '[:space:]')
|
||||
fi
|
||||
if CheckNoHtml "$remote_url" "$filename" "$file_path" ; then
|
||||
|
|
@ -332,9 +332,9 @@ hex_GetFile() {
|
|||
containsHtml=true
|
||||
fi
|
||||
downDelta=$(( received_file_size - pd_presize ))
|
||||
if [[ "${received_file_size}" -ne "${file_size_bytes}" ]] || [ "$containsHtml" == "true" ]; then
|
||||
if [ "${AutoRepairBadPartials}" == "true" ] && (( downDelta > 0 && downDelta < 1024 )) ; then
|
||||
if [ -f "${file_path}" ] ; then
|
||||
if [[ "${received_file_size}" -ne "${file_size_bytes}" ]] || [[ "$containsHtml" == "true" ]]; then
|
||||
if [[ "${AutoRepairBadPartials}" == "true" ]] && (( downDelta > 0 && downDelta < 1024 )) ; then
|
||||
if [[ -f "${file_path}" ]] ; then
|
||||
if ((pd_presize > 0)); then
|
||||
echo -e "${YELLOW}Bad node / HTML found:${NC} reverting to previous file..."
|
||||
truncateDownload "$remote_url" "$filename" "$pd_presize" "$received_file_size"
|
||||
|
|
@ -346,15 +346,15 @@ hex_GetFile() {
|
|||
fi
|
||||
if ((j >= $MaxDownloadRetries)) ; then
|
||||
rm -f "$flockDownload";
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
|
||||
fi
|
||||
return 1
|
||||
else
|
||||
continue
|
||||
fi
|
||||
elif [ "${AutoRepairBadPartials}" == "true" ] && [ "$containsHtml" == "true" ] ; then
|
||||
if [ -f "${file_path}" ] ; then
|
||||
elif [[ "${AutoRepairBadPartials}" == "true" ]] && [[ "$containsHtml" == "true" ]] ; then
|
||||
if [[ -f "${file_path}" ]] ; then
|
||||
if ((pd_presize > 0)); then
|
||||
echo -e "${YELLOW}Bad node / HTML found:${NC} reverting to previous file..."
|
||||
truncateDownload "$remote_url" "$filename" "$pd_presize" "$received_file_size"
|
||||
|
|
@ -366,21 +366,21 @@ hex_GetFile() {
|
|||
fi
|
||||
if ((j >= $MaxDownloadRetries)) ; then
|
||||
rm -f "$flockDownload";
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
|
||||
fi
|
||||
return 1
|
||||
else
|
||||
continue
|
||||
fi
|
||||
elif (( downDelta > 0 && downDelta < 1024 )) || [ "$containsHtml" == "true" ] ; then
|
||||
if [ -f "$file_path" ] ; then
|
||||
elif (( downDelta > 0 && downDelta < 1024 )) || [[ "$containsHtml" == "true" ]] ; then
|
||||
if [[ -f "$file_path" ]] ; then
|
||||
rm -rf "$file_path"
|
||||
fi
|
||||
echo -e "\n${YELLOW}Bad node / HTML found:${NC} tainted partial removed..."
|
||||
if ((j >= $MaxDownloadRetries)) ; then
|
||||
rm -f "$flockDownload";
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -392,7 +392,7 @@ hex_GetFile() {
|
|||
echo -e "\n${RED}Download failed, file is incomplete.${NC}"
|
||||
if ((j >= $MaxDownloadRetries)) ; then
|
||||
rm -f "$flockDownload";
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
droppedSizeBadDownload "${remote_url}" "${filename}" "${received_file_size}"
|
||||
fi
|
||||
return 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue