FbIN/hblock
1
0
Fork 0
mirror of https://github.com/hectorm/hblock.git synced 2026-04-22 23:16:36 +05:30
Code Issues Projects Releases Packages Wiki Activity

feat: hblock can now retry multiple times with the -n or --retry option (#167)

Browse source 
Co-authored-by: Héctor Molinero Fernández <hector@molinero.dev>
This commit is contained in:
Federico Torrielli 2024-09-28 15:14:27 +02:00 • committed by GitHub
commit 170aa5ff51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

40
hblock
View file

@ -120,6 +120,7 @@ optParse() {
'-l' |'--lenient'|'--no-lenient') optArgBool "${@-}"; lenient="${optArg:?}" ;;
'-r' |'--regex'|'--no-regex') optArgBool "${@-}"; regex="${optArg:?}" ;;
'-f' |'--filter-subdomains'|'--no-filter-subdomains') optArgBool "${@-}"; filterSubdomains="${optArg:?}" ;;
'-n'*|'--retry') optArgStr "${@-}"; retry="${optArg?}"; shift "${optShift:?}" ;;
'-c' |'--continue'|'--no-continue') optArgBool "${@-}"; continue="${optArg:?}" ;;
'-p'*|'--parallel') optArgStr "${@-}"; parallel="${optArg?}"; shift "${optShift:?}" ;;
'-q' |'--quiet'|'--no-quiet') optArgBool "${@-}"; quiet="${optArg:?}" ;;
@ -245,6 +246,9 @@ showHelp() {
Useful for reducing the blocklist size in cases such as when DNS blocking
makes these subdomains redundant.%NL
(default: ${filterSubdomains?})%NL
-n, --retry <NUMBER>, \${HBLOCK_RETRY}%NL
Number of times to retry a failed download.%NL
(default: ${retry?})%NL
-c, --[no-]continue, \${HBLOCK_CONTINUE}%NL
Do not abort if a download error occurs.%NL
(default: ${continue?})%NL
@ -469,6 +473,9 @@ main() {
# Do not include subdomains when the parent domain is also blocked.
filterSubdomains="${HBLOCK_FILTER_SUBDOMAINS-"false"}"
# Number of times to retry a failed download.
retry="${HBLOCK_RETRY-"0"}"
# Abort if a download error occurs.
continue="${HBLOCK_CONTINUE-"false"}"
@ -588,19 +595,30 @@ main() {
sourceDlFile="${sourcesDlDir:?}"/"$(rand)"
touch -- "${sourceDlFile:?}.part"
{
if { fetchUrl "${url:?}" && printf '\n'; } > "${sourceDlFile:?}.part"; then
if [ -e "${sourceDlFile:?}.part" ]; then
mv -- "${sourceDlFile:?}.part" "${sourceDlFile:?}" 2>/dev/null
fi
else
rm -f -- "${sourceDlFile:?}.part"
if [ "${continue:?}" = 'true' ]; then
printWarn "Cannot obtain source: ${url:?}"
attempt=0
maxAttempts=$((retry + 1))
while true; do
if { fetchUrl "${url:?}" && printf '\n'; } > "${sourceDlFile:?}.part"; then
if [ -e "${sourceDlFile:?}.part" ]; then
mv -- "${sourceDlFile:?}.part" "${sourceDlFile:?}" 2>/dev/null
fi
break
else
printError "Cannot obtain source: ${url:?}"
{ kill -s USR2 "${$}"; exit 1; } 2>/dev/null
attempt=$((attempt + 1))
if [ "${attempt}" -ge "${maxAttempts}" ]; then
rm -f -- "${sourceDlFile:?}.part"
if [ "${continue:?}" = 'true' ]; then
printWarn "Cannot obtain source: ${url:?}"
break
else
printError "Cannot obtain source: ${url:?}"
{ kill -s USR2 "${$}"; exit 1; } 2>/dev/null
fi
else
sleep 1
fi
fi
fi
done
} &
done < "${sourcesUrlFile:?}"
wait