From 465a39427b1a0f34b83ede17a9dbfb000a19a3bb Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 25 Apr 2019 10:46:18 +0200
Subject: [PATCH] Source adlists from gravity database

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 gravity.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 870027a1..0333a25d 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -151,9 +151,8 @@ database_table_from_file() {
       echo -e "  ${CROSS} Unable to remove ${source}"
 }
 
+# Migrate pre-v5.0 list files to database-based Pi-hole versions
 migrate_to_database() {
-ls -lh
-  # Migrate pre-v5.0 list files to database-based Pi-hole versions
   if [[ -e "${whitelistFile}" ]]; then
     # Store whitelisted domains in database
     database_table_from_file "whitelist" "${whitelistFile}"
@@ -232,15 +231,9 @@ gravity_CheckDNSResolutionAvailable() {
 gravity_GetBlocklistUrls() {
   echo -e "  ${INFO} ${COL_BOLD}Neutrino emissions detected${COL_NC}..."
 
-  if [[ -f "${adListDefault}" ]] && [[ -f "${adListFile}" ]]; then
-    # Remove superseded $adListDefault file
-    rm "${adListDefault}" 2> /dev/null || \
-      echo -e "  ${CROSS} Unable to remove ${adListDefault}"
-  fi
-
-  # Retrieve source URLs from $adListFile
-  # Logic: Remove comments and empty lines
-  mapfile -t sources <<< "$(grep -v -E "^(#|$)" "${adListFile}" 2> /dev/null)"
+  # Retrieve source URLs from gravity database
+  # We source only enabled adlists, sqlite3 stores boolean values as 0 (false) or 1 (true)
+  mapfile -t sources <<< "$(sqlite3 "${gravityDBfile}" "SELECT address FROM adlists WHERE enabled = 1;" 2> /dev/null)"
 
   # Parse source domains from $sources
   mapfile -t sourceDomains <<< "$(