From bc9b62363895b8b6483e0f518ba46607b75f9909 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 1 May 2019 16:56:16 +0200
Subject: [PATCH] Modify query.sh to use the gravity database

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/query.sh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 advanced/Scripts/query.sh

diff --git a/advanced/Scripts/query.sh b/advanced/Scripts/query.sh
old mode 100644
new mode 100755
index 69a3c7a4..8eb7c404
--- a/advanced/Scripts/query.sh
+++ b/advanced/Scripts/query.sh
@@ -11,7 +11,7 @@
 
 # Globals
 piholeDir="/etc/pihole"
-adListsList="$piholeDir/adlists.list"
+gravityDBfile="${piholeDir}/gravity.db"
 wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
 options="$*"
 adlist=""
@@ -73,11 +73,6 @@ Options:
   exit 0
 fi
 
-if [[ ! -e "$adListsList" ]]; then
-    echo -e "${COL_LIGHT_RED}The file $adListsList was not found${COL_NC}"
-    exit 1
-fi
-
 # Handle valid options
 if [[ "${options}" == *"-bp"* ]]; then
     exact="exact"; blockpage=true
@@ -185,12 +180,9 @@ if [[ -z "${exact}" ]]; then
 fi
 
 # Get adlist file content as array
-if [[ -n "${adlist}" ]] || [[ -n "${blockpage}" ]]; then
-    for adlistUrl in $(< "${adListsList}"); do
-        if [[ "${adlistUrl:0:4}" =~ (http|www.) ]]; then
-            adlists+=("${adlistUrl}")
-        fi
-    done
+if [[ -n "${blockpage}" ]]; then
+    # Retrieve source URLs from gravity database
+    mapfile -t adlists <<< "$(sqlite3 "${gravityDBfile}" "SELECT address FROM vw_adlists;" 2> /dev/null)"
 fi
 
 # Print "Exact matches for" title