v2024.11.10
This commit is contained in:
parent
54b42fd63c
commit
462f6e708a
2 changed files with 53 additions and 21 deletions
5
hosts/1fichier.sh
Executable file → Normal file
5
hosts/1fichier.sh
Executable file → Normal file
|
|
@ -77,6 +77,11 @@ fich_DownloadFile() {
|
|||
echo -e "\n${RED}The file in URL (${remote_url}) was reported and removed by 1fichier${NC}"
|
||||
removedDownload "${remote_url}"
|
||||
return 1
|
||||
elif
|
||||
grep -Eqi "deleted after its free hosting period expired" <<< "${PAGE}"; then
|
||||
echo -e "\n${RED}The file in URL (${remote_url}) has expired and is removed${NC}"
|
||||
removedDownload "${remote_url}"
|
||||
return 1
|
||||
elif
|
||||
grep -Eqi "Le fichier demandé a été supprimé suite à une notification|The requested file has been deleted following a notification" <<< "${PAGE}"; then
|
||||
echo -e "\n${RED}The file in URL (${remote_url}) was reported and removed by 1fichier${NC}"
|
||||
|
|
|
|||
69
mad.sh
69
mad.sh
|
|
@ -34,6 +34,8 @@
|
|||
ScriptVersion=2024.11.10
|
||||
#=================================================
|
||||
# Recent Additions
|
||||
# 2024.11.10 - [mad] Fix uploads.txt multi-terminal processing (use /uploads/temp_upload_handler.txt)
|
||||
# 2024.11.10 - [1fichier] Add new "has been automatically deleted after its free hosting period expired"
|
||||
# 2024.11.10 - [up_torup] Add TorUp as an upload host
|
||||
# 2024.11.09 - [torup] Add TorUp as a download host (no resume)
|
||||
# (https://ktgzpea2b76u7fgemiibp4a76onyybo4fw5gbsagtm6jrjzmgivppyyd.onion.tor.my)
|
||||
|
|
@ -968,11 +970,10 @@ successUpload() {
|
|||
else
|
||||
sed -i -e "s>^$pLine.*>#& $downloadLink>g" "${InputFile}" #processed line
|
||||
fi
|
||||
else
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [OK] file: ${filename}, host: ${HostCode}, dl: ${downloadLink}, ticket: ${cTicket}, size: ${filesize}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
fi
|
||||
fi
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [OK] file: ${filename}, host: ${HostCode}, dl: ${downloadLink}, ticket: ${cTicket}, size: ${filesize}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
|
||||
if [ -f "${UploadTicket}" ]; then
|
||||
rm -f "${UploadTicket}"
|
||||
|
|
@ -1023,11 +1024,10 @@ failedUpload() {
|
|||
else
|
||||
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
|
||||
fi
|
||||
else
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [FAIL] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
fi
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [FAIL] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
|
||||
if [ -f "${UploadTicket}" ]; then
|
||||
rm -f "${UploadTicket}"
|
||||
|
|
@ -1052,11 +1052,10 @@ failedRetryUpload() {
|
|||
else
|
||||
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
|
||||
fi
|
||||
else
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [RETRY] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
fi
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [RETRY] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
|
||||
if [ -f "${UploadTicket}" ]; then
|
||||
rm -f "${UploadTicket}"
|
||||
|
|
@ -1082,11 +1081,10 @@ skipFailedUpload() {
|
|||
else
|
||||
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
|
||||
fi
|
||||
else
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [FAIL] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
fi
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [FAIL] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
|
||||
if [ -f "${UploadTicket}" ]; then
|
||||
rm -f "${UploadTicket}"
|
||||
|
|
@ -1107,11 +1105,10 @@ uploadBadInputLine() {
|
|||
else
|
||||
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
|
||||
fi
|
||||
else
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [FAIL] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
fi
|
||||
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
|
||||
mkdir -p "${WorkDir}/uploads"
|
||||
echo -e "$dateStamp [FAIL] file: ${filename}, host: ${HostCode}, msg: ${message}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
|
||||
}
|
||||
yes_or_no() {
|
||||
while true; do
|
||||
|
|
@ -2826,6 +2823,36 @@ MadUploadFromFileTxt() {
|
|||
else
|
||||
currentHashFilelistTxt=$( sha1sum ${InputFile} | awk '{print $1}' )
|
||||
fi
|
||||
linematch=""
|
||||
if [ -f "${WorkDir}/uploads/temp_upload_handler.txt" ]; then
|
||||
linematch=$(grep -Eni -m 1 "[OK].*file:.*${tfilename}.*host:.*${userentry_hostcode}.*\$" "${WorkDir}/uploads/temp_upload_handler.txt")
|
||||
if [ ! -z "$linematch" ] ; then
|
||||
echo -e ""
|
||||
echo -e "${GREEN}$tfilename${NC} already uploaded to ${userentry_hostcode} in ${GREEN}temp_upload_handler.txt${NC}"
|
||||
echo -e "${BLUE}line${NC}: ${linematch//, /\\n}"
|
||||
echo -e ""
|
||||
successUploadExists "$tfilename" "$userentry_hostcode" "File/Host (OK) found in ./uploads/temp_upload_handler.txt (line#: ${linematch%%:*})"
|
||||
continue
|
||||
fi
|
||||
linematch=$(grep -Eni -m 1 "[FAIL].*file:.*${tfilename}.*host:.*${userentry_hostcode}.*\$" "${WorkDir}/uploads/temp_upload_handler.txt")
|
||||
if [ ! -z "$linematch" ] ; then
|
||||
echo -e ""
|
||||
echo -e "${GREEN}$tfilename${NC} already failed upload to ${userentry_hostcode} in ${GREEN}temp_upload_handler.txt${NC}"
|
||||
echo -e "${BLUE}line${NC}: ${linematch//, /\\n}"
|
||||
echo -e ""
|
||||
skipfailedUpload "$pline" "$tfilename" "$userentry_hostcode" "File/Host (FAIL) found in ./uploads/temp_upload_handler.txt (line#: ${linematch%%:*})"
|
||||
continue
|
||||
fi
|
||||
linematch=$(grep -Eni -m 1 "[RETRY].*file:.*${tfilename}.*host:.*${userentry_hostcode}.*\$" "${WorkDir}/uploads/temp_upload_handler.txt")
|
||||
if [ ! -z "$linematch" ] ; then
|
||||
echo -e ""
|
||||
echo -e "${GREEN}$tfilename${NC} already failed upload to ${userentry_hostcode} in ${GREEN}temp_upload_handler.txt${NC}"
|
||||
echo -e "${BLUE}line${NC}: ${linematch//, /\\n}"
|
||||
echo -e ""
|
||||
skipfailedUpload "$pline" "$tfilename" "$userentry_hostcode" "File/Host (FAIL or RETRY) found in ./uploads/temp_upload_handler.txt (line#: ${linematch%%:*})"
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
UploadTicket="${WorkDir}/.flocks/upload_${upfile_hostcode}_${upfile_filepath//[^a-zA-Z0-9]/}"
|
||||
if [ -f "$UploadTicket" ]; then
|
||||
echo -e "${YELLOW}Lock Exists (Skipping)${NC}: ./.flocks/upload_${upfile_hostcode}_${upfile_filepath//[^a-zA-Z0-9]/}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue