iup-nft 0.4__py3-none-any.whl → 0.6__py3-none-any.whl

iup/main.py

@@ -99,16 +99,16 @@ def update_rule_by_ssh(hostnames: list, config: Config):
         print('msg', msg) if msg else print()
         print('err', err) if err else print()
     if config.refresh:
-        if need_restart_dns:
-            print('reboot dnsmasq')
-            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
+        if need_restart_cdns:
+            print('reboot chinadns')
+            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
             msg = stdout.readlines()
             err = stderr.readlines()
             print('msg', msg) if msg else print()
             print('err', err) if err else print()
-        if need_restart_cdns:
-            print('reboot chinadns')
-            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
+        if need_restart_dns:
+            print('reboot dnsmasq')
+            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
             msg = stdout.readlines()
             err = stderr.readlines()
             print('msg', msg) if msg else print()

iup/main_iupd.py

@@ -12,6 +12,10 @@ import ipaddress
 HOSTNAME_PATTERN = r'^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$'
 CMD_TEMPLATE = 'iupd {}'
 CFG_FILE = 'config.ini'
+CMD_DNSMASQ = '/etc/init.d/dnsmasq restart'
+CMD_CHNDNS = '/etc/init.d/chinadns-ng restart'
+MAGIC_STR = "del dnsmasq rule"
+MAGIC_STR2 = "del chinadns rule"
 
 def is_domain_name(string: str):
     if re.match(HOSTNAME_PATTERN, string):
@@ -61,6 +65,7 @@ def read_hostname_from_file(path: str):
 def load_and_overlay_config() -> Config:
     parser = argparse.ArgumentParser(description='iupd参数说明')
     parser.add_argument("sources", nargs='+', help='域名或者域名文件路径')
+    parser.add_argument("-nr", "--no_refresh", action='store_true', default=False, help="是否刷新")
     parser.add_argument(
         "--version",
         action="version",
@@ -72,9 +77,14 @@ def load_and_overlay_config() -> Config:
         gen_config()
     print('当前配置文件路径为:', config_path)
     config = Config(config_path)
+    if args.no_refresh:
+        config.refresh = False
+    print('是否重启相关服务:', config.refresh)
     return args.sources, config
 
 def update_rule_by_ssh(hostnames: list, config: Config):
+    need_restart_dns = False
+    need_restart_cdns = False
     ssh = paramiko.SSHClient()
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
     ssh.connect(config.host, port=config.port, username=config.username, password=config.password)
@@ -83,8 +93,27 @@ def update_rule_by_ssh(hostnames: list, config: Config):
         _, stdout, stderr = ssh.exec_command(cmd)
         msg = stdout.readlines()
         err = stderr.readlines()
+        if MAGIC_STR in str(msg):
+            need_restart_dns = True
+        if MAGIC_STR2 in str(msg):
+            need_restart_cdns = True
         print('msg', msg) if msg else print()
         print('err', err) if err else print()
+    if config.refresh:
+        if need_restart_cdns:
+            print('reboot chinadns')
+            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
+            msg = stdout.readlines()
+            err = stderr.readlines()
+            print('msg', msg) if msg else print()
+            print('err', err) if err else print()
+        if need_restart_dns:
+            print('reboot dnsmasq')
+            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
+            msg = stdout.readlines()
+            err = stderr.readlines()
+            print('msg', msg) if msg else print()
+            print('err', err) if err else print()
     ssh.close()
 
 def gen_hostnames_by_sources(sources):

{iup_nft-0.4.dist-info → iup_nft-0.6.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: iup-nft
-Version: 0.4
-Summary: ipset updater for openwrt
+Version: 0.6
+Summary: nftset updater for openwrt
 Author: nobitaqaq
 Author-email: xiaoleigs@gmail.com
 Keywords: ipset,openwrt

iup_nft-0.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+iup/__init__.py,sha256=CJiAR6OdV8OFR6zNHs9vvRnJV8UgZ_c7dcvaVHeSHkY,112
+iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
+iup/main.py,sha256=cO20fqi4so3tW_qT_zRUsbdgWAWt7FQl7_6C8Knc0tI,5508
+iup/main_iupd.py,sha256=bbTA3H_VPVyyz5g46ZMiSE7Yt0YLweD9LLVbtosjir8,5400
+iup_nft-0.6.dist-info/METADATA,sha256=19bv18biH47C3NjIeTEb8HbYJwaat9oD2t34TizNTNw,209
+iup_nft-0.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+iup_nft-0.6.dist-info/entry_points.txt,sha256=__DnLePT02PMCliwlVR7zwdJVJXmIWIwa5jeAb-U9rM,94
+iup_nft-0.6.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
+iup_nft-0.6.dist-info/RECORD,,

{iup_nft-0.4.dist-info → iup_nft-0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: bdist_wheel (0.37.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

iup_nft-0.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-iup/__init__.py,sha256=CJiAR6OdV8OFR6zNHs9vvRnJV8UgZ_c7dcvaVHeSHkY,112
-iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
-iup/main.py,sha256=j7-6cFrI6_RFkWR-Y4_LChs3fBVb1JGKQ8aW_w_9kMk,5508
-iup/main_iupd.py,sha256=JA4ZQRZV5q-DO3hig-vWe6HMxKXKKmdtZFwL9XhrHl0,4204
-iup_nft-0.4.dist-info/METADATA,sha256=7lPKohW7t9jXhEiZpW_msi42Au7NnNRwf4WDN9w43EY,208
-iup_nft-0.4.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-iup_nft-0.4.dist-info/entry_points.txt,sha256=__DnLePT02PMCliwlVR7zwdJVJXmIWIwa5jeAb-U9rM,94
-iup_nft-0.4.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
-iup_nft-0.4.dist-info/RECORD,,