Move black/white list check to pulsar

gravity.sh

@@ -4,6 +4,7 @@
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Compiles a list of ad-serving domains by downloading them from multiple sources
+
 piholeIPfile=/tmp/piholeIP
 if [[ -f $piholeIPfile ]];then
     # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
@@ -15,7 +16,8 @@ else
 fi
 
 # Ad-list sources--one per line in single quotes
-# The mahakala source is commented out due to many users having issues with it blocking legitimate domains.  Uncomment at your own risk
+# The mahakala source is commented out due to many users having issues with it blocking legitimate domains.
+# Uncomment at your own risk
 sources=('https://adaway.org/hosts.txt'
 'http://adblock.gjtech.net/?format=unix-hosts'
 #'http://adblock.mahakala.is/'
@@ -45,6 +47,7 @@ if [[ -r $piholeDir/pihole.conf ]];then
     echo "** Local calibration requested..."
         . $piholeDir/pihole.conf
 fi
+
 ###########################
 # collapse - begin formation of pihole
 function gravity_collapse() {
@@ -85,6 +88,7 @@ function gravity_transport() {
 	url=$1
 	cmd_ext=$2
 	agent=$3
+	
 	# tmp file, so we don't have to store the (long!) lists in RAM
 	patternBuffer=$(mktemp)
 	heisenbergCompensator=""
@@ -92,15 +96,16 @@ function gravity_transport() {
 		# if domain has been saved, add file for date check to only download newer
 		heisenbergCompensator="-z $saveLocation"
 	fi
+
 	# Silently curl url
 	curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
-
+	# Check for list updates
 	gravity_patternCheck $patternBuffer
 
 	# Cleanup
 	rm -f $patternBuffer
-
 }
+
 # spinup - main gravity function
 function gravity_spinup() {
 
@@ -148,6 +153,9 @@ for i in "${activeDomains[@]}"
 	do	
    		cat $i |tr -d '\r' >> $piholeDir/$matter
 	done
+}
+
+function gravity_pulsar() {
 	
 	# Append blacklist entries if they exist
 	if [[ -r $blacklist ]];then
@@ -155,9 +163,6 @@ if [[ -r $blacklist ]];then
         echo "** Blacklisting $numberOf domain(s)..."
         cat $blacklist >> $piholeDir/$matter
 	fi
-}
-
-function gravity_pulsar() {
 
 	# Whitelist (if applicable) domains
 	if [[ -r $whitelist ]];then
@@ -192,6 +197,7 @@ function gravity_unique() {
         numberOf=$(wc -l < $piholeDir/$eventHorizon)
         echo "** $numberOf unique domains trapped in the event horizon."
 }
+
 function gravity_hostFormat() {
         # Format domain list as "192.168.x.x domain.com"
         echo "** Formatting domains into a HOSTS file..."
@@ -199,9 +205,12 @@ function gravity_hostFormat() {
         # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
         cp $piholeDir/$accretionDisc $adList
 }
+
 function gravity_blackbody() {
+	# Loop through list files	
 	for file in $piholeDir/*.$justDomainsExtension
 	do
+		# If list is active then leave it (noop) else rm the list
 		if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
 			:
 		else
@@ -209,6 +218,7 @@ function gravity_blackbody() {
 		fi
 	done
 }
+
 function gravity_advanced() {
 
         # Remove comments and print only the domain name