Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement performant list checking routine.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2020-02-22 13:00:38 +01:00
parent 050e2963c7
commit 81d4531e10
No known key found for this signature in database
GPG key ID: FB60471F0575164A
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gravity.sh
View file

@ -412,11 +412,36 @@ gravity_DownloadBlocklists() {
gravity_Blackbody=true gravity_Blackbody=true
} }
total_num=0
parseList() { parseList() {
local adlistID="${1}" src="${2}" target="${3}" local adlistID="${1}" src="${2}" target="${3}" incorrect_lines
#Append ,${arg} to every line and then remove blank lines before import #Append ,${arg} to every line and then remove blank lines before import
# /.$/a\\ ensures there is a newline on the last line # /.$/a\\ ensures there is a newline on the last line
sed -e "s/$/,${adlistID}/;/^$/d;/.$/a\\" "${src}" >> "${target}" sed -e "/[^a-zA-Z0-9.\_-]/d;s/$/,${adlistID}/;/^$/d;/.$/a\\" "${src}" >> "${target}"
incorrect_lines="$(sed -e "/[^a-zA-Z0-9.\_-]/!d" "${src}" | head -n 5)"
local num_lines num_target_lines num_correct_lines percentage percentage_fraction
num_lines="$(grep -c "^" "${src}")"
#num_correct_lines="$(grep -c "^[a-zA-Z0-9.-]*$" "${src}")"
num_target_lines="$(grep -c "^" "${target}")"
num_correct_lines="$(( num_target_lines-total_num ))"
total_num="$num_target_lines"
percentage=100
percentage_fraction=0
if [[ "${num_lines}" -gt 0 ]]; then
percentage="$(( 1000*num_correct_lines/num_lines ))"
percentage_fraction="$(( percentage%10 ))"
percentage="$(( percentage/10 ))"
fi
echo " ${INFO} List quality: ${num_correct_lines} of ${num_lines} lines importable (${percentage}.${percentage_fraction}%)"
if [[ -n "${incorrect_lines}" ]]; then
echo " Example for invalid domains (showing only the first five):"
while IFS= read -r line; do
echo " - ${line}"
done <<< "${incorrect_lines}"
fi
} }
# Download specified URL and perform checks on HTTP status and file content # Download specified URL and perform checks on HTTP status and file content