From f89eaa0777b490364824dde5ecbd4005e368f7f3 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Mon, 21 Nov 2022 15:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddrpy=E8=81=9A=E6=90=9C?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=B1=A0=E5=86=85=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/rules.db      | Bin 155648 -> 155648 bytes
 controllers/vod.py |  23 +++++++++++++++++------
 js/version.txt     |   2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/base/rules.db b/base/rules.db
index 1414a80857c52a0d7edb12293f75513257f71f92..c596c67bba5a8a12a5607b59ad025f2b80f99603 100644
GIT binary patch
delta 247
zcmZoTz}awsbAmMEmWeXXj9WG)1okr;ZQj&B_X1<X_J9ONQD!wcZU*^ANoxj9M@P=*
zbGlzFZ+kwq=lPVaPxo$Y^lnUt$c9c|pUjx065tUK>>3>G>0+BwTxwEKRFsutZdR6V
znwC~zm}-=fU65*4Ha#(&QFOXq3L~$Ok)eX2iIs_gm5G_2ftjU|iRpIV6viN%=?fPy
zYBI4fPB&c4D7O8<0>&an#!ZtC?w8q~zld=Xqk=rMBa@MVk&&*Up)RHw49~YKE@7-;
dVq&{HJy4WUZ2AsMMhzx*TQFz)*JX^{I{}9cPo)3=

delta 167
zcmZoTz}awsbAmMErin7njGHzl1oktUZQj&B_X6XR?EwjlqRc!_+zj%KlGY5Ij*gtu
z`;!@sxf|6R)1iXXyOSBSrYEK|icZ%{VdR~@CxelP&C<}o$i!^BZwh0O4ddPE^A<2_
zO*dT3D7O8<0>&an#!HhA?w8q~zld=X<MabDjGWWC#Tdo6D=uNIVPaypogOI4C^mhE
TC8N=F>4l7Z+rKVj<lYGYn$tCq

diff --git a/controllers/vod.py b/controllers/vod.py
index bee6d16..b590727 100644
--- a/controllers/vod.py
+++ b/controllers/vod.py
@@ -5,7 +5,7 @@
 # Date  : 2022/9/6
 import json
 
-from flask import Blueprint,abort,request,render_template,render_template_string,jsonify,make_response,redirect
+from flask import Blueprint,abort,request,render_template,render_template_string,jsonify,make_response,redirect,current_app
 from time import time
 from utils.web import getParmas,get_interval
 from utils.cfg import cfg
@@ -46,7 +46,7 @@ def search_one_py(rule, wd, before: str = ''):
         print(f'{rule}发生错误:{e}')
         return None
 
-def search_one(rule, wd, before: str = ''):
+def search_one(rule, wd, before: str = '',env:dict=None,app=None):
     t1 = time()
     if not before:
         with open('js/模板.js', encoding='utf-8') as f:
@@ -57,9 +57,12 @@ def search_one(rule, wd, before: str = ''):
     try:
         with open(js_path, encoding='utf-8') as f2:
             jscode = f2.read()
-        env = get_env()
         if env:
-            jscode = render_template_string(jscode, **env)
+            # 渲染字符串文本 render_template_string 必须带 flask的上下文
+            with app.app_context():
+                jscode = render_template_string(jscode, **env)
+            # if '007' in rule:
+            #     print(rule,jscode)
         jscode = before + jscode + end_code
         # print(jscode)
         ctx.eval(jscode)
@@ -139,8 +142,14 @@ def merged_hide(merged_rules):
     logger.info(f'数据库筛选隐藏规则耗时{get_interval(t1)}毫秒,共计{all_cnt}条规则,隐藏后可渲染{len(merged_rules)}条规则')
     return merged_rules
 
+def disable_exit_for_threadpool_executor():
+    import atexit
+    import concurrent.futures
+    atexit.unregister(concurrent.futures.thread._python_exit)
+
 def multi_search(wd):
     lsg = storage_service()
+    env = get_env()
     t1 = time()
     try:
         timeout = round(int(lsg.getItem('SEARCH_TIMEOUT',5000))/1000,2)
@@ -167,7 +176,7 @@ def multi_search(wd):
         with ThreadPoolExecutor(max_workers=len(search_sites)) as executor:
             to_do = []
             for site in search_sites:
-                future = executor.submit(search_one, site, wd, before)
+                future = executor.submit(search_one, site, wd, before,env,current_app._get_current_object())
                 to_do.append(future)
             try:
                 for future in as_completed(to_do, timeout=timeout):  # 并发执行
@@ -180,6 +189,8 @@ def multi_search(wd):
                 import atexit
                 atexit.unregister(thread._python_exit)
                 executor.shutdown = lambda wait: None
+
+                # disable_exit_for_threadpool_executor()
     logger.info(f'drpy聚搜{len(search_sites)}个源共计耗时{get_interval(t1)}毫秒')
     return jsonify({
         "list": res
@@ -323,7 +334,7 @@ def vod_home():
         return jsonify(data)
     if wd: # 搜索
         if rule == 'drpy':
-            # print(f'准备单独处理聚合搜索:{wd}')
+            print(f'准备单独处理聚合搜索:{wd}')
             return multi_search(wd)
             # return multi_search2(wd)
         else:
diff --git a/js/version.txt b/js/version.txt
index d83e8e6..4e4a0e4 100644
--- a/js/version.txt
+++ b/js/version.txt
@@ -1 +1 @@
-3.9.22beta1
\ No newline at end of file
+3.9.22beta2
\ No newline at end of file
-- 
GitLab