From 9da1e9ab88f3a694adce3eda9fff2a3ee74bb91f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 1 Feb 2025 19:42:19 +0100 Subject: [PATCH] Fix counting of domains at the end of pihole -g. The existing schme used the SQL VIEWs for simplicitly, however, they have the unintended side-effect of - when being queried without a GROUP BY clause - returning entries multiple times if they are assigned to several groups Signed-off-by: DL6ER --- gravity.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gravity.sh b/gravity.sh index 304c2d79..39f2fd8c 100755 --- a/gravity.sh +++ b/gravity.sh @@ -864,11 +864,11 @@ gravity_Table_Count() { gravity_ShowCount() { # Here we use the table "gravity" instead of the view "vw_gravity" for speed. # It's safe to replace it here, because right after a gravity run both will show the exactly same number of domains. - gravity_Table_Count "gravity" "gravity domains" "" - gravity_Table_Count "vw_blacklist" "exact denied domains" - gravity_Table_Count "vw_regex_blacklist" "regex denied filters" - gravity_Table_Count "vw_whitelist" "exact allowed domains" - gravity_Table_Count "vw_regex_whitelist" "regex allowed filters" + gravity_Table_Count "gravity" "gravity domains" + gravity_Table_Count "domainlist WHERE type = 1" "exact denied domains" + gravity_Table_Count "domainlist WHERE type = 3" "regex denied filters" + gravity_Table_Count "domainlist WHERE type = 0" "exact allowed domains" + gravity_Table_Count "domainlist WHERE type = 2" "regex allowed filters" } # Trap Ctrl-C