arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-31 19:20:54 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4445 from pi-hole/fix/counting

Browse Source 
Fix number of invalid domains
This commit is contained in:
DL6ER 2021-12-03 08:56:54 +01:00 committed by GitHub
commit 4c267f7732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gravity.sh
View File

@ -248,7 +248,7 @@ database_adlist_number() {
return; return;
fi fi
output=$( { printf ".timeout 30000\\nUPDATE adlist SET number = %i, invalid_domains = %i WHERE id = %i;\\n" "${num_lines}" "${num_invalid}" "${1}" | sqlite3 "${gravityDBfile}"; } 2>&1 ) output=$( { printf ".timeout 30000\\nUPDATE adlist SET number = %i, invalid_domains = %i WHERE id = %i;\\n" "${num_source_lines}" "${num_invalid}" "${1}" | sqlite3 "${gravityDBfile}"; } 2>&1 )
status="$?" status="$?"
if [[ "${status}" -ne 0 ]]; then if [[ "${status}" -ne 0 ]]; then
@ -503,8 +503,9 @@ gravity_DownloadBlocklists() {
gravity_Blackbody=true gravity_Blackbody=true
} }
total_num=0 # num_target_lines does increase for every correctly added domain in pareseList()
num_lines=0 num_target_lines=0
num_source_lines=0
num_invalid=0 num_invalid=0
parseList() { parseList() {
local adlistID="${1}" src="${2}" target="${3}" incorrect_lines local adlistID="${1}" src="${2}" target="${3}" incorrect_lines
@ -516,18 +517,20 @@ parseList() {
# Find (up to) five domains containing invalid characters (see above) # Find (up to) five domains containing invalid characters (see above)
incorrect_lines="$(sed -e "/[^a-zA-Z0-9.\_-]/!d" "${src}" | head -n 5)" incorrect_lines="$(sed -e "/[^a-zA-Z0-9.\_-]/!d" "${src}" | head -n 5)"
local num_target_lines num_correct_lines num_invalid local num_target_lines_new num_correct_lines
# Get number of lines in source file # Get number of lines in source file
num_lines="$(grep -c "^" "${src}")" num_source_lines="$(grep -c "^" "${src}")"
# Get number of lines in destination file # Get the new number of lines in destination file
num_target_lines="$(grep -c "^" "${target}")" num_target_lines_new="$(grep -c "^" "${target}")"
num_correct_lines="$(( num_target_lines-total_num ))" # Number of new correctly added lines
total_num="$num_target_lines" num_correct_lines="$(( num_target_lines_new-num_target_lines ))"
num_invalid="$(( num_lines-num_correct_lines ))" # Upate number of lines in target file
num_target_lines="$num_target_lines_new"
num_invalid="$(( num_source_lines-num_correct_lines ))"
if [[ "${num_invalid}" -eq 0 ]]; then if [[ "${num_invalid}" -eq 0 ]]; then
echo " ${INFO} Analyzed ${num_lines} domains" echo " ${INFO} Analyzed ${num_source_lines} domains"
else else
echo " ${INFO} Analyzed ${num_lines} domains, ${num_invalid} domains invalid!" echo " ${INFO} Analyzed ${num_source_lines} domains, ${num_invalid} domains invalid!"
fi fi
# Display sample of invalid lines if we found some # Display sample of invalid lines if we found some
@ -686,7 +689,7 @@ gravity_DownloadBlocklistFromUrl() {
else else
echo -e " ${CROSS} List download failed: ${COL_LIGHT_RED}no cached list available${COL_NC}" echo -e " ${CROSS} List download failed: ${COL_LIGHT_RED}no cached list available${COL_NC}"
# Manually reset these two numbers because we do not call parseList here # Manually reset these two numbers because we do not call parseList here
num_lines=0 num_source_lines=0
num_invalid=0 num_invalid=0
database_adlist_number "${adlistID}" database_adlist_number "${adlistID}"
database_adlist_status "${adlistID}" "4" database_adlist_status "${adlistID}" "4"