From 119d77b2cd73f4bd9ae02a7da413f00e66bd3f35 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Fri, 16 Sep 2022 19:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=BA=90=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=AD=A3=E5=B8=B8=E7=94=9F=E6=88=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/rules.db       | Bin 40960 -> 40960 bytes
 controllers/home.py |  10 +++-------
 utils/files.py      |  12 +++++++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/base/rules.db b/base/rules.db
index 57cdfde6bf281e61b4fee69153fd7c2f356ca1ab..da78990916ac72782681b9644563ccab85fcade2 100644
GIT binary patch
delta 64
zcmZoTz|?SnX@WH4&xtb5j6XLf^a(4NnkSi<B_~>>r6s2rrdb%8q#2l)8(SC{m>Qd>
UrkR^;<`el=$!M^dwePne0L(`fNdN!<

delta 64
zcmZoTz|?SnX@WH4_lYvjjNdmV^a(2@r<ht=CL5R-rdgULnwgs=TBaBznI)zfTNqfF
U8dw-^<`el=$!NHlwePne0LBLu7XSbN

diff --git a/controllers/home.py b/controllers/home.py
index 7290fb0..e1b93dd 100644
--- a/controllers/home.py
+++ b/controllers/home.py
@@ -17,7 +17,7 @@ from utils.system import getHost,is_linux
 from utils.cfg import cfg
 from utils import parser
 from utils.log import logger
-from utils.files import getAlist,get_live_url
+from utils.files import getAlist,get_live_url,get_multi_rules
 from utils.update import getLocalVer,getHotSuggest
 from utils.encode import parseText
 from utils.files import getCustonDict
@@ -198,12 +198,7 @@ def config_render(mode):
     alists_str = json.dumps(alists, ensure_ascii=False)
     live_url = get_live_url(new_conf,mode)
     rules = getRules('js')
-    multi_mode = lsg.getItem('MULTI_MODE')
-    fix_multi = ['drpy']
-    if not multi_mode:
-        rules['list'] = list(filter(lambda x:x['name'] in fix_multi or x.get('multi'),rules['list']))
-        rules['count'] = len(rules['list'])
-        print(rules)
+    rules = get_multi_rules(rules)
     # html = render_template('config.txt',rules=getRules('js'),host=host,mode=mode,jxs=jxs,base64Encode=base64Encode,config=new_conf)
     html = render_template('config.txt',pys=pys,rules=rules,host=host,mode=mode,jxs=jxs,alists=alists,alists_str=alists_str,live_url=live_url,config=new_conf)
     merged_config = custom_merge(parseText(html),customConfig)
@@ -230,6 +225,7 @@ def config_gen():
         alists = getAlist()
         alists_str = json.dumps(alists,ensure_ascii=False)
         rules = getRules('js')
+        rules = get_multi_rules(rules)
         set_local = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,0),mode=0,host=getHost(0),jxs=jxs)
         # print(set_local)
         set_area = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,1),mode=1,host=getHost(1),jxs=jxs)
diff --git a/utils/files.py b/utils/files.py
index 8c5fc08..26e8ae0 100644
--- a/utils/files.py
+++ b/utils/files.py
@@ -103,4 +103,14 @@ def getCustonDict(host):
             customConfig = parseText(render_template_string(text,host=host))
     except Exception as e:
         logger.info(f'用户自定义配置加载失败:{e}')
-    return customConfig
\ No newline at end of file
+    return customConfig
+
+def get_multi_rules(rules):
+    lsg = storage_service()
+    multi_mode = lsg.getItem('MULTI_MODE')
+    fix_multi = ['drpy']
+    if not multi_mode:
+        rules['list'] = list(filter(lambda x: x['name'] in fix_multi or x.get('multi'), rules['list']))
+        rules['count'] = len(rules['list'])
+        # print(rules)
+    return rules
\ No newline at end of file
-- 
GitLab