kittykat/mad
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

v2024.11.10

Browse source
This commit is contained in:
kittykat 2024-11-10 01:40:55 +00:00
parent 54b42fd63c
commit 462f6e708a
2 changed files with 53 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hosts/1fichier.sh Executable file → Normal file
View file

@ -77,6 +77,11 @@ fich_DownloadFile() {
echo -e "\n${RED}The file in URL (${remote_url}) was reported and removed by 1fichier${NC}" echo -e "\n${RED}The file in URL (${remote_url}) was reported and removed by 1fichier${NC}"
removedDownload "${remote_url}" removedDownload "${remote_url}"
return 1 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 elif
grep -Eqi "Le fichier demandé a été supprimé suite à une notification|The requested file has been deleted following a notification" <<< "${PAGE}"; then 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}" echo -e "\n${RED}The file in URL (${remote_url}) was reported and removed by 1fichier${NC}"

69
mad.sh
View file

@ -34,6 +34,8 @@
ScriptVersion=2024.11.10 ScriptVersion=2024.11.10
#================================================= #=================================================
# Recent Additions # 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.10 - [up_torup] Add TorUp as an upload host
# 2024.11.09 - [torup] Add TorUp as a download host (no resume) # 2024.11.09 - [torup] Add TorUp as a download host (no resume)
# (https://ktgzpea2b76u7fgemiibp4a76onyybo4fw5gbsagtm6jrjzmgivppyyd.onion.tor.my) # (https://ktgzpea2b76u7fgemiibp4a76onyybo4fw5gbsagtm6jrjzmgivppyyd.onion.tor.my)
@ -968,11 +970,10 @@ successUpload() {
else else
sed -i -e "s>^$pLine.*>#& $downloadLink>g" "${InputFile}" #processed line sed -i -e "s>^$pLine.*>#& $downloadLink>g" "${InputFile}" #processed line
fi fi
else fi
dateStamp=$(date '+%Y/%m/%d %H:%M:%S') dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
mkdir -p "${WorkDir}/uploads" 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" echo -e "$dateStamp [OK] file: ${filename}, host: ${HostCode}, dl: ${downloadLink}, ticket: ${cTicket}, size: ${filesize}, path: ${filepath}" >> "${WorkDir}/uploads/temp_upload_handler.txt"
fi
UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}" UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
if [ -f "${UploadTicket}" ]; then if [ -f "${UploadTicket}" ]; then
rm -f "${UploadTicket}" rm -f "${UploadTicket}"
@ -1023,11 +1024,10 @@ failedUpload() {
else else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi 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 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]/}" UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
if [ -f "${UploadTicket}" ]; then if [ -f "${UploadTicket}" ]; then
rm -f "${UploadTicket}" rm -f "${UploadTicket}"
@ -1052,11 +1052,10 @@ failedRetryUpload() {
else else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi 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 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]/}" UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
if [ -f "${UploadTicket}" ]; then if [ -f "${UploadTicket}" ]; then
rm -f "${UploadTicket}" rm -f "${UploadTicket}"
@ -1082,11 +1081,10 @@ skipFailedUpload() {
else else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi 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 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]/}" UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
if [ -f "${UploadTicket}" ]; then if [ -f "${UploadTicket}" ]; then
rm -f "${UploadTicket}" rm -f "${UploadTicket}"
@ -1107,11 +1105,10 @@ uploadBadInputLine() {
else else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi 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 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() { yes_or_no() {
while true; do while true; do
@ -2826,6 +2823,36 @@ MadUploadFromFileTxt() {
else else
currentHashFilelistTxt=$( sha1sum ${InputFile} | awk '{print $1}' ) currentHashFilelistTxt=$( sha1sum ${InputFile} | awk '{print $1}' )
fi 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]/}" UploadTicket="${WorkDir}/.flocks/upload_${upfile_hostcode}_${upfile_filepath//[^a-zA-Z0-9]/}"
if [ -f "$UploadTicket" ]; then if [ -f "$UploadTicket" ]; then
echo -e "${YELLOW}Lock Exists (Skipping)${NC}: ./.flocks/upload_${upfile_hostcode}_${upfile_filepath//[^a-zA-Z0-9]/}" echo -e "${YELLOW}Lock Exists (Skipping)${NC}: ./.flocks/upload_${upfile_hostcode}_${upfile_filepath//[^a-zA-Z0-9]/}"