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

# 2024.11.12 - [mad] Fix uploads.txt status marking (urls / messages) containg '&' chars

Browse source 
# 2024.11.12 - [up_torup] Max upload filesize changed to 150MB
This commit is contained in:
kittykat 2024-11-12 16:59:58 +00:00
parent 03bc4c2c87
commit 3049b3e305
Signed by: kittykat
GPG key ID: E3F1556620F70C3C
4 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

42
mad.sh
View file

@ -34,6 +34,8 @@
ScriptVersion=2024.11.12
#=================================================
# Recent Additions
# 2024.11.12 - [mad] Fix uploads.txt status marking (urls / messages) containg '&' chars
# 2024.11.12 - [up_torup] Max upload filesize changed to 150MB
# 2024.11.12 - [up_uploadee] Add upload.ee as an upload host
# 2024.11.11 - [up_offcat] Add Offshore.cat as upload host
# 2024.11.11 - [mad] Add OffShore.cat Upload ApiKeys section to allow using Offshore.cat as upload host
@ -969,11 +971,7 @@ successUpload() {
mkdir -p "${WorkDir}/data"
echo -e "$dateStamp [OK] file: ${filename}, host: ${HostCode}, dl: ${downloadLink}, ticket: ${cTicket}, size: ${filesize}, path: ${filepath}" >> "${WorkDir}/data/uploads_completed.txt"
if [ ! -z "$InputFile" ]; then
if [ "${AutoCommentOnCompletion}" == "true" ] ; then
sed -i -e "s>^${pLine}.*>#& #OK# $downloadLink>g" "${InputFile}" #processed line
else
sed -i -e "s>^$pLine.*>#& $downloadLink>g" "${InputFile}" #processed line
fi
sed -i -e "s>^${pLine}.*>#& #OK# ${downloadLink//&/\\&}>g" "${InputFile}" #processed line
fi
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
mkdir -p "${WorkDir}/uploads"
@ -998,11 +996,7 @@ successUploadExists() {
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
echo -e "[EXISTS] ${filename}, ${HostCode}, ${downloadLink}" >> "${WorkDir}/uploads/results.txt"
if [ ! -z "$InputFile" ]; then
if [ "${AutoCommentOnCompletion}" == "true" ] ; then
sed -i -e "s>^${pLine}.*>#& #OK# (Upload exists) ${message}>g" "${InputFile}" #processed line
else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi
sed -i -e "s>^${pLine}.*>#& #OK# (Upload exists) ${message//&/\\&}>g" "${InputFile}" #processed line
fi
UploadTicket="${WorkDir}/.flocks/upload_${HostCode}_${filepath//[^a-zA-Z0-9]/}"
if [ -f "${UploadTicket}" ]; then
@ -1023,11 +1017,7 @@ failedUpload() {
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
echo -e "[FAIL] ${HostCode}, ${filename}, ${message}" >> "${WorkDir}/uploads/results.txt"
if [ ! -z "$InputFile" ]; then
if [ "${AutoCommentOnCompletion}" == "true" ] ; then
sed -i -e "s>^${pLine}.*>#& #FAIL# ${message}>g" "${InputFile}" #processed line
else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi
sed -i -e "s>^${pLine}.*>#& #FAIL# ${message//&/\\&}>g" "${InputFile}" #processed line
fi
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
mkdir -p "${WorkDir}/uploads"
@ -1051,11 +1041,7 @@ failedRetryUpload() {
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
echo -e "[RETRY] ${HostCode}, ${filename}, ${message}" >> "${WorkDir}/uploads/results.txt"
if [ ! -z "$InputFile" ]; then
if [ "${AutoCommentOnCompletion}" == "true" ] ; then
sed -i -e "s>^${pLine}.*>#& #RETRY# ${message}>g" "${InputFile}" #processed line
else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi
sed -i -e "s>^${pLine}.*>#& #RETRY# ${message//&/\\&}>g" "${InputFile}" #processed line
fi
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
mkdir -p "${WorkDir}/uploads"
@ -1080,11 +1066,7 @@ skipFailedUpload() {
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
echo -e "[SKIP/FAIL] ${HostCode}, ${filename}, ${message}" >> "${WorkDir}/uploads/results.txt"
if [ ! -z "$InputFile" ]; then
if [ "${AutoCommentOnCompletion}" == "true" ] ; then
sed -i -e "s>^${pLine}.*>#& #FAIL# (Skip) ${message}>g" "${InputFile}" #processed line
else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi
sed -i -e "s>^${pLine}.*>#& #FAIL# (Skip) ${message//&/\\&}>g" "${InputFile}" #processed line
fi
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
mkdir -p "${WorkDir}/uploads"
@ -1104,11 +1086,7 @@ uploadBadInputLine() {
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
echo -e "[BADLINE] ${pLine}${message}" >> "${WorkDir}/uploads/results.txt"
if [ ! -z "$InputFile" ]; then
if [ "${AutoCommentOnCompletion}" == "true" ] ; then
sed -i -e "s>^${pLine}.*>#& #RETRY# (Bad Line)${message}>g" "${InputFile}" #processed line
else
sed -i -e "s>^$pLine.*>#&>g" "${InputFile}" #processed line
fi
sed -i -e "s>^${pLine}.*>#& #RETRY# (Bad Line)${message//&/\\&}>g" "${InputFile}" #processed line
fi
dateStamp=$(date '+%Y/%m/%d %H:%M:%S')
mkdir -p "${WorkDir}/uploads"
@ -2731,9 +2709,9 @@ MadUploadFromFileTxt() {
mkdir -p "${WorkDir}/uploads"
clear
echo -e "${BLD}"
echo -e "${PINK}:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:"
echo -e "${PINK}:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:"
echo -e ":${NC} ${GREEN}MAD${PINK} Uploader${NC} :: Transfer files in uploads.txt${PINK}${BLD} :"
echo -e ":-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:${NC}\\n"
echo -e ":-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:-:${NC}\\n"
OnLoad $0 $@
if ((torPort >= 9050 && torPort <= 9150)); then
printf "TorIp: ${GREEN}$TorIp${NC}, Tor listening on port ${GREEN}$torPort${NC}, "