From 7bdd3034f0779ee1218c37dbfa59ca6f2dbaad1a Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Tue, 4 Jun 2024 07:10:19 +0800
Subject: [PATCH] fixup! luci-app-mosdns: Add streaming media DNS server
 support

Signed-off-by: sbwml <admin@cooluc.com>
---
 luci-app-mosdns/Makefile                        |  2 +-
 luci-app-mosdns/root/etc/init.d/mosdns          | 14 ++++++++------
 luci-app-mosdns/root/usr/share/mosdns/mosdns.sh |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile
index f58c2e0..bb832df 100644
--- a/luci-app-mosdns/Makefile
+++ b/luci-app-mosdns/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-mosdns
-PKG_VERSION:=1.5.21
+PKG_VERSION:=1.5.22
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI Support for mosdns
diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns
index 0843e7a..aa16291 100755
--- a/luci-app-mosdns/root/etc/init.d/mosdns
+++ b/luci-app-mosdns/root/etc/init.d/mosdns
@@ -620,12 +620,14 @@ generate_config() {
     json_add_object
     json_add_string "exec" "jump has_resp_sequence"
     json_close_object
-    json_add_object
-    json_add_string "exec" "\$query_is_stream_media_domain"
-    json_close_object
-    json_add_object
-    json_add_string "exec" "jump has_resp_sequence"
-    json_close_object
+    [ "$custom_stream_media_dns" -eq 1 ] && {
+        json_add_object
+        json_add_string "exec" "\$query_is_stream_media_domain"
+        json_close_object
+        json_add_object
+        json_add_string "exec" "jump has_resp_sequence"
+        json_close_object
+    }
     json_add_object
     json_add_string "exec" "\$query_is_local_domain"
     json_close_object
diff --git a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
index 91817a6..32eaf55 100755
--- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
+++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
@@ -151,7 +151,8 @@ v2dat_dump() {
         v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat
         v2dat unpack geosite -o /var/mosdns -f cn -f apple -f 'geolocation-!cn' $v2dat_dir/geosite.dat
         [ "$adblock" -eq 1 ] && [ $(echo $ad_source | grep -c geosite.dat) -ge '1' ] && v2dat unpack geosite -o /var/mosdns -f category-ads-all $v2dat_dir/geosite.dat
-        [ "$streaming_media" -eq 1 ] && v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu $v2dat_dir/geosite.dat
+        [ "$streaming_media" -eq 1 ] && v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu $v2dat_dir/geosite.dat || \
+        touch /var/mosdns/geosite_disney.txt ; touch /var/mosdns/geosite_netflix.txt ; touch /var/mosdns/geosite_hulu.txt
     else
         # custom config
         v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat