From 807ce0af4ed7d59830c1ae26eaffb6757c320699 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Mon, 20 May 2019 21:15:22 -0700
Subject: [PATCH] Show whitelist, blacklist, and regexlist details

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 advanced/Scripts/piholeDebug.sh | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 82660d61..c491b1c6 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -1051,21 +1051,40 @@ head_tail_log() {
     IFS="$OLD_IFS"
 }
 
-show_adlists() {
-    echo_current_diagnostic "Adlists"
+show_db_entries() {
+    local title="${1}"
+    local query="${2}"
+
+    echo_current_diagnostic "${title}"
 
     OLD_IFS="$IFS"
     IFS=$'\r\n'
-    local adlists=()
-    mapfile -t adlists < <(sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" "SELECT address FROM vw_adlists")
+    local entries=()
+    mapfile -t entries < <(sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" -cmd ".headers on" "${query}")
 
-    for line in "${adlists[@]}"; do
+    for line in "${entries[@]}"; do
         log_write "   ${line}"
     done
 
     IFS="$OLD_IFS"
 }
 
+show_adlists() {
+    show_db_entries "Adlists" "SELECT * FROM adlists"
+}
+
+show_whitelist() {
+    show_db_entries "Whitelist" "SELECT * FROM whitelist"
+}
+
+show_blacklist() {
+    show_db_entries "Blacklist" "SELECT * FROM blacklist"
+}
+
+show_regexlist() {
+    show_db_entries "Regexlist" "SELECT * FROM regex"
+}
+
 analyze_gravity_list() {
     echo_current_diagnostic "Gravity List and Database"
 
@@ -1240,6 +1259,9 @@ parse_setup_vars
 check_x_headers
 analyze_gravity_list
 show_adlists
+show_whitelist
+show_blacklist
+show_regexlist
 show_content_of_pihole_files
 parse_locale
 analyze_pihole_log