From 2f7a640bc7e95a300cd890002b6b2837e8dc3c4c Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.ca>
Date: Fri, 4 Nov 2022 00:53:26 +0000
Subject: [PATCH] simple-adblock: update to 1.9.2-4

* update default config file to list options alphabetically
* rearrange some of the init script code to support transition
  of WebUI to javascript
* rename wan6_trigger to procd_trigger_wan6 for readability

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 7393b744574a72430f491183853729d941c634ea)
---
 net/simple-adblock/files/simple-adblock.init | 139 ++++++++++---------
 1 file changed, 71 insertions(+), 68 deletions(-)

diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init
index 19fe9ba182..2f10eb0d7a 100644
--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@@ -1098,11 +1098,82 @@ adb_start() {
 	json del all
 	json set triggers
 
+	if [ "$action" = 'restore' ]; then
+		output 0 "Starting $serviceName... "
+		output 3 "Starting $serviceName...\\n"
+		json set status "statusStarting"
+		if cache 'test_gzip' && ! cache 'test' && [ ! -s "$outputFile" ]; then
+			output 3 'Found compressed cache file, unpacking it '
+			json set message 'found compressed cache file, unpacking it.'
+			if cache 'unpack_gzip'; then
+				output_okn
+			else
+				output_failn
+				json add error "errorRestoreCompressedCache"
+				output "$_ERROR_: $(get_error_text 'errorRestoreCompressedCache')!\\n"
+				action='download'
+			fi
+		fi
+		if cache 'test' && [ ! -s "$outputFile" ]; then
+			output 3 'Found cache file, reusing it '
+			json set message 'found cache file, reusing it.'
+			if cache 'restore'; then 
+				output_okn
+				dns 'on_start'
+			else
+				output_failn
+				json add error "errorRestoreCache"
+				output "$_ERROR_: $(get_error_text 'errorRestoreCache')!\\n"
+				action='download'
+			fi
+		fi
+	fi
+	if [ "$action" = 'download' ]; then
+		if [ -s "$outputFile" ] || cache 'test' || cache 'test_gzip'; then
+			output 0 "Force-reloading $serviceName... "
+			output 3 "Force-reloading $serviceName...\\n"
+			json set status "statusForceReloading"
+		else
+			output 0 "Starting $serviceName... "
+			output 3 "Starting $serviceName...\\n"
+			json set status "statusStarting"
+		fi
+		download_lists
+		dns 'on_start'
+	fi
+	if [ "$action" = 'restart' ]; then
+		output 0 "Restarting $serviceName... "
+		output 3 "Restarting $serviceName...\\n"
+		json set status "statusRestarting"
+		dns 'on_start'
+	fi
+	if [ "$action" = 'start' ]; then
+		output 0 "Starting $serviceName... "
+		output 3 "Starting $serviceName...\\n"
+		json set status "statusStarting"
+		dns 'on_start'
+	fi
+	if [ -s "$outputFile" ] && [ "$(json get status)" != "statusFail" ]; then
+		output 0 "$__OK__\\n";
+		json del message
+		json set status "statusSuccess"
+		json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})"
+		status_service
+	else
+		output 0 "$__FAIL__\\n";
+		json set status "statusFail"
+		json add error "errorOhSnap"
+		status_service
+	fi
+
 	procd_open_instance 'main'
 	procd_set_param command /bin/true
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_open_data
+	json_add_string 'status' "$(json get status)"
+	json_add_string 'errors' "$(json get errors)"
+	json_add_int 'entries' "$(wc -l < "$outputFile")"
 	json_add_array firewall
 	if [ "$force_dns" -ne 0 ]; then
 		for c in $force_dns_port; do
@@ -1181,74 +1252,6 @@ adb_start() {
 	json_close_array
 	procd_close_data
 	procd_close_instance
-
-	if [ "$action" = 'restore' ]; then
-		output 0 "Starting $serviceName... "
-		output 3 "Starting $serviceName...\\n"
-		json set status "statusStarting"
-		if cache 'test_gzip' && ! cache 'test' && [ ! -s "$outputFile" ]; then
-			output 3 'Found compressed cache file, unpacking it '
-			json set message 'found compressed cache file, unpacking it.'
-			if cache 'unpack_gzip'; then
-				output_okn
-			else
-				output_failn
-				json add error "errorRestoreCompressedCache"
-				output "$_ERROR_: $(get_error_text 'errorRestoreCompressedCache')!\\n"
-				action='download'
-			fi
-		fi
-		if cache 'test' && [ ! -s "$outputFile" ]; then
-			output 3 'Found cache file, reusing it '
-			json set message 'found cache file, reusing it.'
-			if cache 'restore'; then 
-				output_okn
-				dns 'on_start'
-			else
-				output_failn
-				json add error "errorRestoreCache"
-				output "$_ERROR_: $(get_error_text 'errorRestoreCache')!\\n"
-				action='download'
-			fi
-		fi
-	fi
-	if [ "$action" = 'download' ]; then
-		if [ -s "$outputFile" ] || cache 'test' || cache 'test_gzip'; then
-			output 0 "Force-reloading $serviceName... "
-			output 3 "Force-reloading $serviceName...\\n"
-			json set status "statusForceReloading"
-		else
-			output 0 "Starting $serviceName... "
-			output 3 "Starting $serviceName...\\n"
-			json set status "statusStarting"
-		fi
-		download_lists
-		dns 'on_start'
-	fi
-	if [ "$action" = 'restart' ]; then
-		output 0 "Restarting $serviceName... "
-		output 3 "Restarting $serviceName...\\n"
-		json set status "statusRestarting"
-		dns 'on_start'
-	fi
-	if [ "$action" = 'start' ]; then
-		output 0 "Starting $serviceName... "
-		output 3 "Starting $serviceName...\\n"
-		json set status "statusStarting"
-		dns 'on_start'
-	fi
-	if [ -s "$outputFile" ] && [ "$(json get status)" != "statusFail" ]; then
-		output 0 "$__OK__\\n";
-		json del message
-		json set status "statusSuccess"
-		json set stats "$serviceName is blocking $(wc -l < "$outputFile") domains (with ${dns})"
-		status_service
-	else
-		output 0 "$__FAIL__\\n";
-		json set status "statusFail"
-		json add error "errorOhSnap"
-		status_service
-	fi
 }
 
 adb_status() {
-- 
2.30.2