diff --git a/base/rules.db b/base/rules.db index 0e22ae487bb3686748516857a6a9d29d78baf95d..11efcbae7e5daea71f7f26c83e8f68d54ac3e267 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git a/js/rules.py b/js/rules.py index c56450b781d66a8765962239df32c14f2f85de0e..9505a164e509e663e919aa4593bb85b624bec50f 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 11e5245f90bb7747a31829beb6144bff09396fc0..ee6b0ab6770e8c8edac3ebf4ad63aecaa6fb0f45 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 fc7e68793aa47e09c2d6a202626435cb2d837cfd..e4d2416a0740e4c16094bb2b0f5779e37ec9d6f7 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):