# 2024.12.26 - [up_kouploader / up_axfc / up_torup] Fixed failedRetryUpload (was using download logging)
# * Thanks Belky # 2024.12.26 - [anonfile / up_anonfile] Add anonfile.de as upload / download host # 2024.12.25 - [dashfile / up_dashfile] Add dashfile.net as upload / download host # 2024.12.25 - [isupload] Change to use tor_curl_request_extended (server response is often slow) # - Accept 200 OK response to continue (do not require filename / filesize) # 2024.12.25 - [fileblade] Add response handling for free file download dissallowed > 100MB. # "The file owner does not allow FREE users to download files which are over 100 MB" # 2024.12.25 - [mad] Add "UploadHiveRandomizeExt" option to config with default=true # 2024.12.25 - [uploadhive / up_uploadhive] Update renaming random ext files to their original names # - Handle multipart 7z & rar (abc.7z.###, abc.part#.rar) # 2024.12.25 - [syspro / up_syspro] Add share.syspro.com.br as upload / download host # 2024.12.24 - [mad] Add EnabledUploadHosts / EnabledDownloadHosts setting to fine-tune which hosts to use # ** Options: recommended, online, all (Default=recommended) # - recommended: loads all hosts verified working with MAD # - online: loads all hosts available online / working (includes captcha / js restricted) # - all: loads all hosts in hosts folder # 2024.12.24 - [up_ateasystems / ateasystems] Add share.ateasystems.com as upload / download host # 2024.12.23 - [up_uploadbay / uploadbay] Add uploadbay.net as upload / download host # 2024.12.23 - [up_herbolistique / herbolistique] Add transfert.herbolistique.com as upload / download host # 2024.12.23 - [uploadhive] Auto-rename random extension downloads # 2024.12.23 - [up_uploadhive] Change upload file extension to random 3 letters (uhive blocks .7z, .zip, .rar now) # 2024.12.23 - [up_offshorecat] Fixed upload. Updated apikey. # 2024.12.23 - [up_fileditch] Fixed upload. Added response handling for Tor Blocked node (retries) # 2024.12.23 - [up_freesocial / freesocial] Add files.freesocial.co as upload / download host # 2024.12.23 - [up_cyssoux / cyssoux] Add partage.cyssoux.fr as upload / download host # 2024.12.22 - [mad] Add jira_Upload function -- used for all jirafeau hosts # 2024.12.22 - [up_*AllJiraHosts*] Consolidated / moved all hosts upload functions to mad.sh # - Minimized jira host code (~6000 lines of duplicates removed) # - Jira hosts: acid, anarchaserver, depotkaz, dictvm, eddowding, familleflender, filesquid, # free4e, harrault, linxx, moocloud, nantes, netlib, skrepr, soyjak # 2024.12.20 - [fileblade / up_fileblade] Add fileblade.com as upload / download host # 2024.12.20 - [isupload / up_isupload] Add isupload.com as upload / download host # 2024.12.15 - [mediafire] Add mediafire download link processing # 2024.12.12 - [dictvm / up_dictvm] Add dictvm.org as upload / download host # 2024.12.12 - [eddowding / up_eddowding] Add eddowding.com as upload / download host # 2024.12.12 - [up_pixeldrain] Modify upload to use PUT # 2024.12.12 - [mad] Update pixeldrain api key # 2024.12.09 - [ranoz] Fix filenames with spaces # 2024.11.29 - [innocent] Update to use tor_curl_request_extended for head/get # 2024.11.29 - [quax] Update 404 Not found response handling
This commit is contained in:
parent
ec7d121c0e
commit
e6804e01e1
GPG key ID:
E3F1556620F70C3C
58 changed files with 6609 additions and 2223 deletions
|
|
@ -24,7 +24,7 @@ HostFuncPrefix='skpr'
|
|||
ListUploadHosts=${ListUploadHosts}'/'${HostCode}'/'${HostNick}'/'${HostFuncPrefix}'@'
|
||||
#!
|
||||
#!
|
||||
#! Configurables
|
||||
#! Jirafeau Host
|
||||
#! -------------
|
||||
#!
|
||||
#! ------------ (1) Host Main Upload Function --------------- #
|
||||
|
|
@ -33,95 +33,10 @@ ListUploadHosts=${ListUploadHosts}'/'${HostCode}'/'${HostNick}'/'${HostFuncPrefi
|
|||
#! Must be named specifically as such:
|
||||
#! <HostFuncPrefix>_UploadFile()
|
||||
skpr_UploadFile() {
|
||||
local _hostCode=${1}
|
||||
local filepath=${2}
|
||||
local filecnt=${3}
|
||||
local pline=${4}
|
||||
local filename="${filepath##*/}"
|
||||
warnAndRetryUnknownError=false
|
||||
exitUploadError=false
|
||||
exitUploadNotAvailable=false
|
||||
fileAlreadyDone=false
|
||||
tor_identity="${RANDOM}"
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${_hostCode}_${filepath//[^a-zA-Z0-9]/}"
|
||||
finalAttempt="false"
|
||||
for ((z=0; z<=$MaxUploadRetries; z++)); do
|
||||
if [ $z -eq $MaxUploadRetries ] ; then
|
||||
finalAttempt="true"
|
||||
fi
|
||||
trap "rm -f "${UploadTicket}"; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
if skpr_PostFile "${filepath}" "${_hostCode}" "${filename}" "${filecnt}" $((z+1)) $finalAttempt $pline ; then
|
||||
return 0
|
||||
elif [ $z -lt $MaxUploadRetries ]; then
|
||||
if [ "${fileAlreadyDone}" == "true" ] ; then
|
||||
break
|
||||
fi
|
||||
if [[ "${warnAndRetryUnknownError}" == "true" ]] ; then
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
debugHtml "${filepath##*/}" "error" "Retry due to an unknown issue: attempt #$((z+1)) of ${MaxUploadRetries}"
|
||||
fi
|
||||
fi
|
||||
if [[ "${exitUploadError}" == "true" || "${exitUploadNotAvailable}" == "true" ]] ; then
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
debugHtml "${filepath##*/}" "error" "Exit due to unrecoverable issue"
|
||||
fi
|
||||
rm -f "${UploadTicket}"
|
||||
break
|
||||
fi
|
||||
echo -e "\n${YELLOW}A recoverable error occurred, retry attempt $((z+1))/${MaxUploadRetries}${NC}"
|
||||
sleep 3
|
||||
fi
|
||||
done
|
||||
rm -f "${UploadTicket}"
|
||||
jira_MaxUploadSizeInBytes=104857600
|
||||
jira_PostUrlHost='https://transfer.skrepr.com/script.php'
|
||||
jira_filetype=1
|
||||
jira_timeval="week"
|
||||
jira_downloadLinkPrefix='https://transfer.skrepr.com/f.php?h='
|
||||
jira_UploadFile ${1} ${2} ${3} ${4}
|
||||
}
|
||||
#!
|
||||
#! ----------- (2) Post File / Upload File Function --------------- #
|
||||
#!
|
||||
skpr_PostFile() {
|
||||
local filepath=$1
|
||||
local _hostCode=$2
|
||||
local filename=$3
|
||||
local fileCnt=$4
|
||||
local retryCnt=$5
|
||||
local finalAttempt=$6
|
||||
local pline=${7}
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${_hostCode}_${filepath//[^a-zA-Z0-9]/}"
|
||||
echo -e "[${YELLOW}${_hostCode}${NC}] Uploading ${GREEN}${filename}${NC}"
|
||||
tor_identity="${RANDOM}"
|
||||
PostUrlHost='https://transfer.skrepr.com/script.php'
|
||||
arrFiles=("$filepath")
|
||||
trap "rm -f ${UploadTicket}; echo ""; tput cnorm; exit" 0 1 2 3 6 15
|
||||
response=$(tor_curl_upload --insecure -i \
|
||||
-H "Content-Type: multipart/form-data" \
|
||||
-F "time=week" \
|
||||
-F "file=@${filepath}" \
|
||||
"${PostUrlHost}")
|
||||
if [ "${DebugAllEnabled}" == "true" ] ; then
|
||||
debugHtml "${filepath##*/}" "${_hostCode}_upload" "post_url: ${PostUrlHost}"$'\n'"${response}"
|
||||
fi
|
||||
if grep -Eqi ' 200 ' <<< "${response}" ; then
|
||||
hash=$(echo "$response" | tail -2 | head -1)
|
||||
hash=${hash//[$'\t\r\n']}
|
||||
filesize=$(GetFileSize "$filepath" "false")
|
||||
downloadLink="https://transfer.skrepr.com/f.php?h=${hash}&p=1"
|
||||
echo -e "${GREEN}| Upload Success${NC}"
|
||||
echo -e "| Size: ${BLUE}${filesize}${NC} bytes${NC}"
|
||||
echo -e "| Link: ${YELLOW}${downloadLink}${NC}"
|
||||
successUpload "$pline" "${filepath}" "${_hostCode}" "${filesize}" "${downloadLink}" "{$response}"
|
||||
return 0
|
||||
else
|
||||
err=$(grep -oPi '(?<=HTTP/).*?(?=$)' <<< "$response")
|
||||
if [ "${finalAttempt}" == "true" ] ; then
|
||||
printf "\\n"
|
||||
echo -e "${RED}| Upload failed. Status: ${err}${NC}"
|
||||
failedRetryUpload "$pline" "${filepath}" "${_hostCode}" "Failed to upload file" "Status: $err"
|
||||
exitUploadError=true
|
||||
return 1
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
#!
|
||||
#! --------------- Host Extra Functions ------------------- #
|
||||
#!
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue