iup 0.2__py3-none-any.whl → 0.4__py3-none-any.whl

iup/__init__.py

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

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
 
@@ -16,21 +17,57 @@ MAGIC_STR = "update rule to"
 MAGIC_STR2 = "update blk"
 
 def is_domain_name(string: str):
-    if re.match(HOSTNAME_PATTERN, string):
-        return True
-    else:
+    if not string:
         return False
-    
+    s = string.strip().lower()
+    return re.fullmatch(HOSTNAME_PATTERN, s) is not None
+
 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
+    """Normalize input and return domain name only (no scheme, no port).
+
+    Accepts inputs like:
+    - a.com:443
+    - https://a.com
+    - http//:a.com:443
+
+    Returns domain (e.g. 'a.com') or None. IP addresses are rejected.
+    """
+    if not hostname_str:
+        return None
+    s = hostname_str.strip()
+    # detect and strip scheme (require '://', e.g. http:// or https://)
+    # this prevents malformed inputs like 'http:a.com:443' being treated as scheme
+    m = re.match(r'^([a-zA-Z][a-zA-Z0-9+\-]*)://', s)
+    has_scheme = bool(m)
+    if m:
+        s = s[m.end():]
+    # remove credentials if present (user:pass@host)
+    if '@' in s:
+        s = s.split('@')[-1]
+    # if there was a scheme, remove path part
+    if has_scheme and '/' in s:
+        s = s.split('/')[0]
+    # now s should be host[:port]
+    host_port = s.strip()
+    # strip port if present (last :digits)
+    if ':' in host_port:
+        parts = host_port.rsplit(':', 1)
+        if parts[1].isdigit():
+            host_port = parts[0]
+    host = host_port.strip().lower()
+    # reject pure IPs
+    if is_ip_address(host):
+        return None
+    if is_domain_name(host):
+        return host
     return None
 
 def parse_port(port: str):
@@ -55,8 +92,9 @@ def read_hostname_from_file(path: str):
     with open(path, 'r') as f:
         for line in f:
             host_name_str = line.strip()
-            if is_domain_name(host_name_str):
-                hostnames.append(host_name_str)
+            parsed = parse_host_name(host_name_str)
+            if parsed:
+                hostnames.append(parsed)
     hostnames = list(dict.fromkeys(hostnames))
     return hostnames
 
@@ -64,6 +102,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):
@@ -113,8 +156,9 @@ def gen_hostnames_by_sources(sources):
     hostnames = []
     for source in sources:
         if not path.exists(source):
-            if is_domain_name(source):
-                hostnames.append(source)
+            parsed = parse_host_name(source)
+            if parsed:
+                hostnames.append(parsed)
         elif path.isfile(source):
             hostnames += read_hostname_from_file(source)
     return list(dict.fromkeys(hostnames))

{iup-0.2.dist-info → iup-0.4.dist-info}/METADATA

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

iup-0.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+iup/__init__.py,sha256=WXPOI9BwESIVzJ-XhG7bIFhsRg98u_v5gp16nY0bcbI,108
+iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
+iup/main.py,sha256=zp5hwKjakNMbv1ITwlSJuukrtN5kqjAq-jyMegdzMl0,6671
+iup-0.4.dist-info/METADATA,sha256=mPaJ2h7F5i2W-XFXIh6IV3AohZ1gUmyY1ugi_RP0Sho,204
+iup-0.4.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
+iup-0.4.dist-info/entry_points.txt,sha256=ER1eUBmB6bXwudHBT51NoOtDSlnUgBi4T6J9_kA4pwc,68
+iup-0.4.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
+iup-0.4.dist-info/RECORD,,

{iup-0.2.dist-info → iup-0.4.dist-info}/WHEEL

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

iup/default_config.py

@@ -1,21 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-from configparser import ConfigParser
-
-
-DEFAULT_CONFIG = '''[common]
-host = 192.168.1.1
-port = 22
-username = root
-password = 123457
-refresh = False'''
-
-
-def write_default_config(path):
-    with open(path, 'w', encoding='utf-8') as f:
-        f.write(DEFAULT_CONFIG)
-
-def write_config(config: ConfigParser, path):
-    with open(path, 'w', encoding='utf-8') as f:
-        config.write(f)

iup-0.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-iup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
-iup/default_config.py,sha256=JsNdlf_Imsa8KYlrI7A38fgBCDvn9zTZMotMK2kd0CQ,433
-iup/main.py,sha256=pPwHBn6vhKNqpDw6aPMdaG0eWOIzEmi6Bx7usA-9BfY,5334
-iup-0.2.dist-info/METADATA,sha256=ulXkVNr0sOFsTSipP_C5FZEPaI1cilwPrUM0xaZN8Vc,204
-iup-0.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-iup-0.2.dist-info/entry_points.txt,sha256=ER1eUBmB6bXwudHBT51NoOtDSlnUgBi4T6J9_kA4pwc,68
-iup-0.2.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
-iup-0.2.dist-info/RECORD,,