From a5dc3eff191ffc7962d354d495b37dea58384b2a Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Mon, 3 Oct 2022 17:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF.js?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/admin.py | 7 +++++--
 controllers/cms.py   | 2 +-
 controllers/vod.py   | 8 ++++----
 js/rules.py          | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/controllers/admin.py b/controllers/admin.py
index 5713b66..967c281 100644
--- a/controllers/admin.py
+++ b/controllers/admin.py
@@ -38,8 +38,11 @@ def admin_index():  # 管理员界面
     live_url = lsg.getItem('LIVE_URL')
     use_py = lsg.getItem('USE_PY')
     # print(f'live_url:', live_url)
+    rules = getRules('js')
+    # print(rules)
     cache_count = getCacheCount()
-    return render_template('admin.html', pystate=use_py,rules=getRules('js'),cache_count=cache_count, ver=getLocalVer(), live_url=live_url)
+    # print(cache_count)
+    return render_template('admin.html', pystate=use_py,rules=rules,cache_count=cache_count, ver=getLocalVer(), live_url=live_url)
 
 @admin.route('/settings')
 def admin_settings():  # 管理员界面
@@ -214,7 +217,7 @@ def upload_file():
             if os.path.exists(savePath):
                 return R.failed(f'上传失败,文件已存在,请先查看删除再试')
             with open('js/模板.js', encoding='utf-8') as f2:
-                before = f2.read()
+                before = f2.read().split('export')[0]
             upcode = file.stream.read().decode('utf-8')
             check_to_run = before + upcode
             # print(check_to_run)
diff --git a/controllers/cms.py b/controllers/cms.py
index 1a94218..bfb81a1 100644
--- a/controllers/cms.py
+++ b/controllers/cms.py
@@ -1245,7 +1245,7 @@ if __name__ == '__main__':
     # js_path = f'js/玩偶姐姐.js'
     # js_path = f'js/555影视.js'
     with open('../js/模板.js', encoding='utf-8') as f:
-        before = f.read()
+        before = f.read().split('export')[0]
     js_path = f'js/360影视.js'
     ctx, js_code = parser.runJs(js_path,before=before)
     ruleDict = ctx.rule.to_dict()
diff --git a/controllers/vod.py b/controllers/vod.py
index 4902db3..6b7cbfd 100644
--- a/controllers/vod.py
+++ b/controllers/vod.py
@@ -27,7 +27,7 @@ def search_one(rule, wd, before: str = ''):
     t1 = time()
     if not before:
         with open('js/模板.js', encoding='utf-8') as f:
-            before = f.read()
+            before = f.read().split('export')[0]
     js_path = f'js/{rule}.js'
     try:
         ctx, js_code = parser.runJs(js_path, before=before)
@@ -63,7 +63,7 @@ def multi_search2(wd):
     # print(search_sites)
     res = []
     with open('js/模板.js', encoding='utf-8') as f:
-        before = f.read()
+        before = f.read().split('export')[0]
     logger.info(f'聚搜准备工作耗时:{get_interval(t1)}毫秒')
     t2 = time()
     thread_pool = ThreadPoolExecutor(len(search_sites))  # 定义线程池来启动多线程执行此任务
@@ -109,7 +109,7 @@ def multi_search(wd):
     # print(search_sites)
     res = []
     with open('js/模板.js', encoding='utf-8') as f:
-        before = f.read()
+        before = f.read().split('export')[0]
     with ThreadPoolExecutor(max_workers=len(search_sites)) as executor:
         to_do = []
         for site in search_sites:
@@ -159,7 +159,7 @@ def vod_home():
     # js_path = f'js/{rule}.js' if not ext.startswith('http') else ext
     js_path = f'js/{rule}.js' if not ext else ext
     with open('js/模板.js', encoding='utf-8') as f:
-        before = f.read()
+        before = f.read().split('export')[0]
     # logger.info(f'js读取耗时:{get_interval(t1)}毫秒')
     logger.info(f'参数检验js读取共计耗时:{get_interval(t0)}毫秒')
     t2 = time()
diff --git a/js/rules.py b/js/rules.py
index 223c2cd..c39d94a 100644
--- a/js/rules.py
+++ b/js/rules.py
@@ -40,7 +40,7 @@ def getRules(path='cache'):
     rule_list = [file.replace('.js', '') for file in file_name]
     js_path = [f'{path}/{rule}.js' for rule in rule_list]
     with open('js/模板.js', encoding='utf-8') as f:
-        before = f.read()
+        before = f.read().split('export')[0]
     rule_codes = []
     # for js in js_path:
     #     with open(js,encoding='utf-8') as f:
-- 
GitLab