result = get_local_ipinfo()

hawkhai · Dec 27, 2024 · d06403c · d06403c
1 parent aa2afc1
commit d06403c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/imgserv.py b/imgserv.py
@@ -67,14 +67,9 @@ class HTTPServer:
     def __init__(self, host="localhost", port=9001, directory="."):
 
         if host == "localhost":
-            ipaddrx = mydllfunc("getipaddr", {"minorVer": 2, "majorVer": 2,})
-            if ipaddrx and ipaddrx["ret"] == 0:
-                ipaddrx = ipaddrx["result"]
-                ipaddrx = ipaddrx["result"]
-                # ['192.168.110.1', '192.168.245.1', '192.168.0.102']
-                ipaddrx = [i for i in ipaddrx if not refindall("^[0-9]+\\.[0-9]+\\.[0-9]+\\.1$", i)]
-                if ipaddrx and len(ipaddrx) == 1:
-                    host = ipaddrx[0] # 换算成 IP。
+            ipaddrx = get_local_ipinfo()
+            if ipaddrx and len(ipaddrx) == 1:
+                host = ipaddrx[0] # 换算成 IP。
 
         assert host != "localhost", "host 不能是 'localhost'!!"
 

diff --git a/mdserv.py b/mdserv.py
@@ -166,15 +166,10 @@ def do_GET(self):
         self.send_header('Content-type', 'application/json')
 
         CrossOrigin = False
-        ipaddrx = mydllfunc("getipaddr", {"minorVer": 2, "majorVer": 2,})
-        if ipaddrx and ipaddrx["ret"] == 0:
-            ipaddrx = ipaddrx["result"]
-            ipaddrx = ipaddrx["result"]
-            # ['192.168.110.1', '192.168.245.1', '192.168.0.102']
-            ipaddrx = [i for i in ipaddrx if not refindall("^[0-9]+\\.[0-9]+\\.[0-9]+\\.1$", i)]
-            if ipaddrx and len(ipaddrx) == 1:
-                self.send_header('Access-Control-Allow-Origin', 'http://{}:4000'.format(ipaddrx[0]))
-                CrossOrigin = True
+        ipaddrx = get_local_ipinfo()
+        if ipaddrx and len(ipaddrx) == 1:
+            self.send_header('Access-Control-Allow-Origin', 'http://{}:4000'.format(ipaddrx[0]))
+            CrossOrigin = True
         if not CrossOrigin:
             self.send_header('Access-Control-Allow-Origin', 'http://localhost:4000')
 

diff --git a/runserv.py b/runserv.py
@@ -104,7 +104,7 @@ def mainjekyll():
 
 if __name__ == "__main__":
     if IS_WINDOWS:
-        result = mydllfunc("getipaddr", {"minorVer": 2, "majorVer": 2,})
+        result = get_local_ipinfo()
         copyfile("Gemfile-win", "Gemfile")
         copyfile("Gemfile-win.lock", "Gemfile.lock")
     else:
@@ -113,14 +113,9 @@ def mainjekyll():
         copyfile("Gemfile-mac.lock", "Gemfile.lock")
     osremove("assets\\localhost.js")
     ipaddrx = result
-    if ipaddrx and ipaddrx["ret"] == 0:
-        ipaddrx = ipaddrx["result"]
-        ipaddrx = ipaddrx["result"]
-        # ['192.168.110.1', '192.168.245.1', '192.168.0.102']
-        ipaddrx = [i for i in ipaddrx if not refindall("^[0-9]+\\.[0-9]+\\.[0-9]+\\.1$", i)]
-        if ipaddrx and len(ipaddrx) == 1:
-            result = ipaddrx[0]
-            writefile("assets\\localhost.js", "var localhostip = '" + result + "';\r\n")
+    if ipaddrx and len(ipaddrx) == 1:
+        result = ipaddrx[0]
+        writefile("assets\\localhost.js", "var localhostip = '" + result + "';\r\n")
     print(result)
     if IS_MACOS:
         while True: