From bc0f66d6768ea5230a32d4f12d84f8170fd69367 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Fri, 7 Oct 2022 18:20:43 +0800
Subject: [PATCH] =?UTF-8?q?drpy=E8=81=9A=E6=90=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/rules.db        | Bin 86016 -> 86016 bytes
 js/rules.py          |   5 ++++-
 templates/config.txt |   9 +++++++++
 utils/encode.py      |   1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/base/rules.db b/base/rules.db
index 0e22ae487bb3686748516857a6a9d29d78baf95d..11efcbae7e5daea71f7f26c83e8f68d54ac3e267 100644
GIT binary patch
delta 26
icmZozz}m2Yb%HeG|A{irjQ=+#Ea+x5+|1bX|1bcJ<O@~+

delta 26
icmZozz}m2Yb%HeGzlk!=jQ=(!Ea+x5*v#1T|1bcJ!3$FW

diff --git a/js/rules.py b/js/rules.py
index c56450b..9505a16 100644
--- a/js/rules.py
+++ b/js/rules.py
@@ -71,10 +71,13 @@ def getRules(path='cache',js_mode=0):
         # print(rule_codes[0].quickSearch)
         new_rule_list = []
         for i in range(len(rule_list)):
+            if js_mode == 1 and rule_list[i] == 'drpy':
+                continue
             sable = rule_codes[i].searchable or 0
             tmpObj = {
                 'name':rule_list[i],
-                'searchable':1 if (js_mode==1 and sable==2) else sable,
+                # 'searchable':1 if (js_mode==1 and sable==2) else sable, # 对js模式1开放软件聚搜(还是算了，服务器遭不住)
+                'searchable':sable,
                 'quickSearch':rule_codes[i].quickSearch or 0,
                 'filterable':rule_codes[i].filterable or 0,
             }
diff --git a/templates/config.txt b/templates/config.txt
index 11e5245..ee6b0ab 100644
--- a/templates/config.txt
+++ b/templates/config.txt
@@ -25,6 +25,15 @@
     "filterable": {{ rule.filterable }},
     "ext":"{{ host }}/admin/view/{{ rule.name }}.js"
 }{% endif %}{% if loop.last==False %},{% endif %}{% endfor %}
+{% if js_mode == 1 %},{
+    "key":"dr_drpy",
+    "name":"drpy(道长)",
+    "type":1,
+    "api":"{{ host }}/vod?rule=drpy",
+    "searchable": 2,
+    "quickSearch": 1,
+    "filterable": 1
+}{% endif %}
 {% if pys %}
 ,{% for py in pys %}{
     "key":"{{ py.name }}",
diff --git a/utils/encode.py b/utils/encode.py
index fc7e687..e4d2416 100644
--- a/utils/encode.py
+++ b/utils/encode.py
@@ -134,6 +134,7 @@ def baseDecode(text):
 
 def parseText(text:str):
     text = text.replace('false','False').replace('true','True').replace('null','None')
+    # print(text)
     return literal_eval(text)
 
 def setDetail(title:str,img:str,desc:str,content:str,tabs:list=None,lists:list=None):
-- 
GitLab