# 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
|
|
@ -43,24 +43,24 @@ isup_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 isup_FetchFileInfo $finalAttempt && isup_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]/}"
|
||||
|
|
@ -88,16 +88,16 @@ isup_FetchFileInfo() {
|
|||
CLEANSTRING=${remote_url//[^a-zA-Z0-9]/}
|
||||
trap "rm -f ${WorkDir}/.flocks/${CLEANSTRING}; rm -f "${isup_cookie_jar}"; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
response=$(tor_curl_request_extended --insecure -L -s -b "${isup_cookie_jar}" -c "${isup_cookie_jar}" "$remote_url")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "isup_dwnpage$i" "${response}"
|
||||
fi
|
||||
if [[ -z $response ]] ; then
|
||||
rm -f "${isup_cookie_jar}";
|
||||
if [ $i == $maxfetchretries ] ; then
|
||||
if [[ $i == $maxfetchretries ]] ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract download link.${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -107,11 +107,11 @@ isup_FetchFileInfo() {
|
|||
fi
|
||||
if grep -Eqi "Sorry, you are banned" <<< "$response"; then
|
||||
rm -f "${isup_cookie_jar}";
|
||||
if [ $i == $maxfetchretries ] ; then
|
||||
if [[ $i == $maxfetchretries ]] ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract download link.${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -139,11 +139,11 @@ isup_FetchFileInfo() {
|
|||
fi
|
||||
if [[ -z "$post_action" ]] || [[ -z "$post_op" ]] || [[ -z "$post_id" ]] ; then
|
||||
rm -f "${isup_cookie_jar}";
|
||||
if [ $i == $maxfetchretries ] ; then
|
||||
if [[ $i == $maxfetchretries ]] ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract download link [2].${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "Failed to extract download link [2]" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -164,16 +164,16 @@ isup_FetchFileInfo() {
|
|||
response=$(tor_curl_request_extended --insecure -L -s -X POST \
|
||||
-b "${isup_cookie_jar}" -c "${isup_cookie_jar}" \
|
||||
--data "$form_data" "$post_action")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "isup_post" "post_action: ${post_action}"$'\n'"form_data: ${form_data}"$'\n'"${response}"
|
||||
fi
|
||||
if [[ -z $response ]] ; then
|
||||
if [ $i == $maxfetchretries ] ; then
|
||||
if [[ $i == $maxfetchretries ]] ; then
|
||||
rm -f "${isup_cookie_jar}";
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract download link [3].${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -191,12 +191,12 @@ isup_FetchFileInfo() {
|
|||
return 1
|
||||
fi
|
||||
if grep -Eqi 'Just a moment...' <<< "$response"; then
|
||||
if [ $i == $maxfetchretries ] ; then
|
||||
if [[ $i == $maxfetchretries ]] ; then
|
||||
rm -f "${isup_cookie_jar}";
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract download link [3].${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
failedRetryDownload "${remote_url}" "" ""
|
||||
fi
|
||||
return 1
|
||||
|
|
@ -212,7 +212,7 @@ isup_FetchFileInfo() {
|
|||
printf "\\n"
|
||||
echo -e "${RED}| Failed to extract download link [4]${NC}"
|
||||
warnAndRetryUnknownError=true
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
if [[ "${finalAttempt}" == "true" ]] ; then
|
||||
rm -f "${isup_cookie_jar}";
|
||||
failedRetryDownload "${remote_url}" "Failed to extract download link [4]" ""
|
||||
fi
|
||||
|
|
@ -254,7 +254,7 @@ isup_FetchFileInfo() {
|
|||
[ -s "${WorkDir}/.temp/directhead" ]
|
||||
kill $! 2>/dev/null
|
||||
)
|
||||
if [ ! -f "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}" ]; then
|
||||
if [[ ! -f "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}" ]]; then
|
||||
touch "${WorkDir}/.flocks/${remote_url//[^a-zA-Z0-9]/}"
|
||||
fi
|
||||
rm -f "${WorkDir}/.temp/directhead"
|
||||
|
|
@ -262,10 +262,10 @@ isup_FetchFileInfo() {
|
|||
printf "| Retrieving Head: attempt #$j"
|
||||
file_header=$(tor_curl_request_extended --insecure --head -L -s "$download_url")
|
||||
fi
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
if [[ "${DebugAllEnabled}" == "true" ]] ; then
|
||||
debugHtml "${remote_url##*/}" "isup_head$j" "download_url: ${download_url}"$'\n'"${file_header}"
|
||||
fi
|
||||
if [ ! -z "$file_header" ] ; then
|
||||
if [[ ! -z "$file_header" ]] ; then
|
||||
if grep -Eqi '404 Not Found|' <<< "${file_header}" ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Not Found (404). The file has been removed.${NC}"
|
||||
|
|
@ -287,7 +287,7 @@ isup_FetchFileInfo() {
|
|||
else
|
||||
break
|
||||
fi
|
||||
if [ "$filename_override" == "" ] ; then
|
||||
if [[ "$filename_override" == "" ]] ; then
|
||||
filename=${download_url##*/}
|
||||
fi
|
||||
if grep -Eqi 'Content-Length:' <<< "${file_header}" ; then
|
||||
|
|
@ -308,17 +308,17 @@ isup_FetchFileInfo() {
|
|||
fi
|
||||
done
|
||||
printf "\\n"
|
||||
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}")
|
||||
if [ -z "$filename" ]; then
|
||||
if [[ -z "$filename" ]]; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Unexpected or no header response.${NC}"
|
||||
return 1
|
||||
fi
|
||||
if [ -z $file_size_bytes ] ; then
|
||||
if [[ -z $file_size_bytes ]] ; then
|
||||
file_size_readable="${RED}Unknown filesize…${NC}"
|
||||
else
|
||||
file_size_readable="$(numfmt --to=iec --from=auto --format "%.2f" <<< "$file_size_bytes")"
|
||||
|
|
@ -344,19 +344,19 @@ isup_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
|
||||
if [ -z $file_size_bytes ] ; then
|
||||
if [[ -z $file_size_bytes ]] ; then
|
||||
echo -e "${BLUE}| No Resume Fetch${NC} (unknown filesize)"
|
||||
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
|
||||
tor_curl_request_extended --insecure -L "$download_url" --output "$file_path"
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ] ; then
|
||||
if ((rc != 0 )) ; then
|
||||
printf "${RED}Download Failed (bad exit status).${NC}"
|
||||
if [ -f ${file_path} ]; then
|
||||
if [[ -f ${file_path} ]]; then
|
||||
printf "${YELLOW} Partial removed...${NC}"
|
||||
printf "\n\n"
|
||||
rm -f "${file_path}"
|
||||
|
|
@ -365,7 +365,7 @@ isup_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
|
||||
|
|
@ -378,12 +378,12 @@ isup_GetFile() {
|
|||
else
|
||||
containsHtml=true
|
||||
fi
|
||||
if [ "$containsHtml" == "true" ]; then
|
||||
if [[ "$containsHtml" == "true" ]]; then
|
||||
echo -e "${YELLOW}Download Failed (contains html)${NC} partial removed..."
|
||||
rm -f "${file_path}"
|
||||
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
|
||||
|
|
@ -395,13 +395,13 @@ isup_GetFile() {
|
|||
else
|
||||
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_extended --insecure -L --speed-limit $DownloadSpeedMin --speed-time $DownloadTimeoutInterval "$download_url" --continue-at - --output "$file_path"
|
||||
else
|
||||
tor_curl_request_extended --insecure -L "$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
|
||||
|
|
@ -410,9 +410,9 @@ isup_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"
|
||||
|
|
@ -424,15 +424,15 @@ isup_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"
|
||||
|
|
@ -444,21 +444,21 @@ isup_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
|
||||
|
|
@ -470,7 +470,7 @@ isup_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