iup 0.1__py3-none-any.whl → 0.3__py3-none-any.whl

iup/__init__.py

@@ -0,0 +1,5 @@
+import importlib_metadata
+
+metadata = importlib_metadata.metadata("iup")
+
+__version__ = metadata['version']

iup/config.py

@@ -36,13 +36,12 @@ class Config:
             if k.startswith('cm'):
                 pass
             else:
-                parser['common'].update({k: str(v)})
+                parser[SECTION_COMMON].update({k: str(v)})
         return parser
 
-    @staticmethod
-    def write_config(config: configparser.ConfigParser, path):
+    def save_to(self, path):
         with open(path, 'w', encoding='utf-8') as f:
-            config.write(f)
+            self.parser.write(f)
 
     def __update(self, path):
         variables = vars(self)

iup/main.py

@@ -4,6 +4,7 @@ import argparse
 from os import path
 import re
 import paramiko
+import iup
 from iup.config import Config
 import ipaddress
 
@@ -20,14 +21,14 @@ def is_domain_name(string: str):
         return True
     else:
         return False
-    
+
 def is_ip_address(ip_str: str):
     try:
         ip = ipaddress.ip_address(ip_str)
         return ip is not None
     except ValueError:
         return False
-    
+
 def parse_host_name(hostname_str: str):
     if is_domain_name(hostname_str) or is_ip_address(hostname_str):
         return hostname_str
@@ -64,6 +65,11 @@ def load_and_overlay_config() -> Config:
     parser = argparse.ArgumentParser(description='参数说明')
     parser.add_argument("-nr", "--no_refresh", action='store_true', default=False, help="是否刷新")
     parser.add_argument("sources", nargs='+', help='域名或者域名文件路径')
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"%(prog)s version {iup.__version__} installed in {path.dirname(__file__)}",
+    )
     args = parser.parse_args()
     config_path = path.join(path.dirname(__file__), 'config.ini')
     if not path.exists(config_path):
@@ -151,7 +157,7 @@ def gen_config():
     config = Config()
     config.update(host, port, username, password, refresh)
     config_path = path.join(path.dirname(__file__), 'config.ini')
-    Config.write_config(config.parser, config_path)
+    config.save_to(config_path)
     print('已生成配置文件写入到{}'.format(config_path))
 
 

{iup-0.1.dist-info → iup-0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iup
-Version: 0.1
+Version: 0.3
 Summary: ipset updater for openwrt
 Author: nobitaqaq
 Author-email: xiaoleigs@gmail.com

iup-0.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+iup/__init__.py,sha256=WXPOI9BwESIVzJ-XhG7bIFhsRg98u_v5gp16nY0bcbI,108
+iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
+iup/default_config.py,sha256=JsNdlf_Imsa8KYlrI7A38fgBCDvn9zTZMotMK2kd0CQ,433
+iup/main.py,sha256=j7-6cFrI6_RFkWR-Y4_LChs3fBVb1JGKQ8aW_w_9kMk,5508
+iup-0.3.dist-info/METADATA,sha256=C50LOOcCcyhAeTMUSei_oImuxkL2h5yCvz2jLV2ScSs,204
+iup-0.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+iup-0.3.dist-info/entry_points.txt,sha256=ER1eUBmB6bXwudHBT51NoOtDSlnUgBi4T6J9_kA4pwc,68
+iup-0.3.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
+iup-0.3.dist-info/RECORD,,

{iup-0.1.dist-info → iup-0.3.dist-info}/entry_points.txt

@@ -1,3 +1,3 @@
 [console_scripts]
 iup = iup.main:main
-iup-gen = iup.main:gen_config
+iup-cfg = iup.main:gen_config

iup-0.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-iup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iup/config.py,sha256=iBD6DQakavEYpGRWsRW0YSWxq0HTYMH8j1EwqneMCcc,2903
-iup/default_config.py,sha256=JsNdlf_Imsa8KYlrI7A38fgBCDvn9zTZMotMK2kd0CQ,433
-iup/main.py,sha256=UwOA1ohFaEJDEXrpQp4yf4AjdlD-YrTq6LxCl3dN8_0,5354
-iup-0.1.dist-info/METADATA,sha256=BYXIC9Nr6cwlVQN-j3_vuERNK2Rx44bDkVhUGovWCuU,204
-iup-0.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-iup-0.1.dist-info/entry_points.txt,sha256=iFwUViv-61zd2U9zbkFf7StoZhmZ7SdY4mHAN8PNJT0,68
-iup-0.1.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
-iup-0.1.dist-info/RECORD,,