perf(server): improve server rule

src/genpac/core.py

@@ -210,7 +210,7 @@ def parse_options(self, cli=True, **kwargs):
         for fmter in self.__class__._formaters.values():
             opts.update(fmter['cls']._predefined_options)
 
-        self.clear_jobs()
+        self.jobs.clear()
 
         job_cfgs, common_cfgs = self.read_config(config_file)
 
@@ -235,16 +235,15 @@ def parse_options(self, cli=True, **kwargs):
         self.jobs.sort(key=lambda j: j._order)
 
     def add_rule(self, rule):
-        rule = rule.strip()
+        if not isinstance(rule, list):
+            rule = [str(rule)]
+        rule = [r.strip() for r in rule if r.strip()]
         if rule:
-            self.extra_rules.append(rule)
+            self.extra_rules.extend(rule)
 
     def add_job(self, job_cfgs):
         self.extra_jobs.append(job_cfgs)
 
-    def clear_jobs(self):
-        self.jobs = []
-
     def walk_jobs(self):
         for job in self.jobs:
             yield job

src/genpac/server/base.py

@@ -1,12 +1,6 @@
 from flask import current_app
 
-from .. import GenPAC, formater, FmtBase
-
-
-def init_genpac(options):
-    gp = GenPAC(config_file=options.config_file)
-    gp.parse_options(cli=False, workdir=options.target)
-    return gp
+from .. import formater, FmtBase
 
 
 @formater('genpac-server-domains')

src/genpac/server/build.py

@@ -9,9 +9,8 @@
 from watchdog.events import FileSystemEventHandler, \
     EVENT_TYPE_CLOSED, EVENT_TYPE_OPENED
 
-from .. import Generator
+from .. import GenPAC, Generator
 from ..util import logger
-from .base import init_genpac
 
 
 # ====
@@ -32,7 +31,7 @@ def build(app):
 
         try:
             Generator.clear_cache()
-            gp = init_genpac(options)
+            gp = GenPAC(config_file=options.config_file)
             gp.add_job({'format': 'genpac-server-domains',
                         'output': options._private.domain_file,
                         '_order': -100})
@@ -41,8 +40,8 @@ def build(app):
                         '_order': -100})
             if options.server_rule_enabled:
                 with open(options._private.server_rule_file, 'r') as fp:
-                    for line in fp.readlines():
-                        gp.add_rule(line.strip())
+                    gp.add_rule(fp.readlines())
+            gp.parse_options(cli=False, workdir=options.target)
             gp.generate_all()
         except Exception:
             logger.error('GenPAC build fail.', exc_info=True)

src/genpac/server/core.py

@@ -5,12 +5,12 @@
 from flask import Flask, Blueprint
 from flask_apscheduler import APScheduler
 
+from .. import GenPAC
 from ..config import Config
 from ..util import get_version
 from ..util import Namespace
 from ..util import exit_error, FatalError, mktemp
 from ..util import logger, conv_bool, conv_list, conv_path
-from .base import init_genpac
 from .build import start_watch, autobuild_task
 
 _SERVER_RULE_FILENAME = '_server_rules.txt'
@@ -138,7 +138,8 @@ def _update(attr, *convs, **kwargs):
 
     # 如果允许监控文件更改
     if options.watch_enabled:
-        gp = init_genpac(options)
+        gp = GenPAC(config_file=options.config_file)
+        gp.parse_options(cli=False, workdir=options.target)
         # 添加config_file到监控列表
         options.watch_files.add(options.config_file)
         if options.server_rule_enabled: