lanscape 1.3.1a3__py3-none-any.whl → 1.3.1a5__py3-none-any.whl

lanscape/libraries/net_tools.py

@@ -76,7 +76,7 @@ class IPAlive:
         if os_name == "windows":
             # -n count, -w timeout in ms
             cmd = ['ping', '-n', str(ping_count), '-w', str(timeout*1000)]
-        else:
+        else:  # Linux, macOS, and other Unix-like systems
             # -c count, -W timeout in s
             cmd = ['ping', '-c', str(ping_count), '-W', str(timeout)]
 
@@ -211,9 +211,9 @@ mac_selector = MacSelector()
 
 def get_ip_address(interface: str):
     """
-    Get the IP address of a network interface on Windows or Linux.
+    Get the IP address of a network interface on Windows, Linux, or macOS.
     """
-    def linux():
+    def unix_like():  # Combined Linux and macOS
         try:
             import fcntl
             import struct
@@ -239,17 +239,15 @@ def get_ip_address(interface: str):
     # Call the appropriate function based on the platform
     if psutil.WINDOWS:
         return windows()
-    elif psutil.LINUX:
-        return linux()
-    else:
-        return None
+    else:  # Linux, macOS, and other Unix-like systems
+        return unix_like()
 
 def get_netmask(interface: str):
     """
     Get the netmask of a network interface.
     """
     
-    def linux():
+    def unix_like():  # Combined Linux and macOS
         try:
             import fcntl
             sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -273,7 +271,8 @@ def get_netmask(interface: str):
     
     if psutil.WINDOWS:
         return windows()
-    return linux()
+    else:  # Linux, macOS, and other Unix-like systems
+        return unix_like()
 
 def get_cidr_from_netmask(netmask: str):
     """

lanscape/libraries/web_browser.py

@@ -29,22 +29,13 @@ def open_webapp(url: str) -> bool:
     """
     start = time.time()
     try:
-        if sys.platform.startswith("darwin"):
-            # macOS does not support chrome-style app mode via the generic
-            # method. Fallback to the system "open" command which will use the
-            # default browser.
-            cmd = """"$(mdfind 'kMDItemCFBundleIdentifier == "com.google.Chrome"' | head -n1)/Contents/MacOS/Google Chrome" """
-            cmd += f' --app="{url}"'
-            subprocess.run(cmd, check=True, shell=True)
+        exe = get_default_browser_executable()
+        if not exe:
+            raise RuntimeError('Unable to find browser binary')
+        log.debug(f'Opening {url} with {exe}')
 
-        else:
-
-            exe = get_default_browser_executable()
-            if not exe:
-                raise RuntimeError('Unable to find browser binary')
-            log.debug(f'Opening {url} with {exe}')
-
-            subprocess.run(f'{exe} --app="{url}"')
+        cmd = f'"{exe}" --app="{url}"'
+        subprocess.run(cmd, check=True, shell=True)
 
         if time.time() - start < 2:
             log.debug(f'Unable to hook into closure of UI, listening for flask shutdown')
@@ -131,7 +122,19 @@ def get_default_browser_executable() -> Optional[str]:
         return None
 
     elif sys.platform.startswith("darwin"):
-        # macOS will use the system 'open' command to launch the default browser
+        # macOS: try to find Chrome first for app mode support, fallback to default
+        try:
+            p = subprocess.run(
+                ["mdfind", "kMDItemCFBundleIdentifier == 'com.google.Chrome'"],
+                capture_output=True, text=True, check=True
+            )
+            chrome_paths = p.stdout.strip().split('\n')
+            if chrome_paths and chrome_paths[0]:
+                return f"\"{chrome_paths[0]}/Contents/MacOS/Google Chrome\""
+        except subprocess.CalledProcessError:
+            pass
+        
+        # Fallback to system default
         return "/usr/bin/open"
 
     else:

{lanscape-1.3.1a3.dist-info → lanscape-1.3.1a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.1a3
+Version: 1.3.1a5
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape

{lanscape-1.3.1a3.dist-info → lanscape-1.3.1a5.dist-info}/RECORD

@@ -6,13 +6,13 @@ lanscape/libraries/errors.py,sha256=DaercNEZD_tUuXF7KsNk3SD6AqAwT-S7fvzpEybVn08,
 lanscape/libraries/ip_parser.py,sha256=ElXz3LU5CUYWqKOHEyrj5Y4Iv6OBtoSlbCcxhCsibfQ,2226
 lanscape/libraries/logger.py,sha256=doD8KKb4TNWDwVXc1VR7NK4UdharrAoRHl8vZnSAupI,1407
 lanscape/libraries/mac_lookup.py,sha256=-dRV0ygtjjh3JkgL3GTi_5-w7pcZ1oj4XVH4chjsmRs,2121
-lanscape/libraries/net_tools.py,sha256=JU4mnQptO3-WGGlGR4lCRvOM8qpoCIvw6CuApiTQ-t4,11855
+lanscape/libraries/net_tools.py,sha256=_XWdZjboJ76dIoi90gDkk2fUzvEKHPsy2TQ7URj7QlE,12040
 lanscape/libraries/port_manager.py,sha256=fNext3FNfGnGYRZK9RhTEwQ2K0e0YmmMlhK4zVAvoCw,1977
 lanscape/libraries/runtime_args.py,sha256=ICX_JkOmqDQdewZNfRxJb9jMggDw1XqF5CxM9zXZE_Q,1947
 lanscape/libraries/service_scan.py,sha256=jLU84ZoJnqSQbE30Zly2lm2zHrCGutNXjla1sEvp1hE,1949
 lanscape/libraries/subnet_scan.py,sha256=0LW_xdoL-PRp59rJr6r6pSL3LiXEO_SJnjdrgEF_pO8,13120
 lanscape/libraries/version_manager.py,sha256=v-IsZ7sYIsNRiraIRckGZthlyL0iTuscR6jF_o9LBK8,1720
-lanscape/libraries/web_browser.py,sha256=geXxw5xv9y_XGwMc7k8agazGzqibpl2TkLfvTz-wE1k,4981
+lanscape/libraries/web_browser.py,sha256=PEPW-lfe31VixJW8KuQmGAFkZIrZ1oqy_fGUc7kKI9M,5032
 lanscape/resources/mac_addresses/convert_csv.py,sha256=w3Heed5z2mHYDEZNBep3_hNg4dbrp_N6J54MGxnrq4s,721
 lanscape/resources/mac_addresses/mac_db.json,sha256=ygtFSwNwJzDlg6hmAujdgCyzUjxt9Di75J8SO4xYIs8,2187804
 lanscape/resources/ports/convert_csv.py,sha256=mWe8zucWVfnlNEx_ZzH5Vc3tJJbdi-Ih4nm2yKNrRN0,720
@@ -65,8 +65,8 @@ lanscape/ui/templates/scan/ip-table-row.html,sha256=ptY24rxJRaA4PEEQRDncaq6Q0ql5
 lanscape/ui/templates/scan/ip-table.html,sha256=ds__UP9JiTKf5IxCmTMzw--eN_yg1Pvn3Nj1KvQxeZg,940
 lanscape/ui/templates/scan/overview.html,sha256=FsX-jSFhGKwCxZGKE8AMKk328UuawN6O9RNTzYvIOts,1205
 lanscape/ui/templates/scan/scan-error.html,sha256=Q4eZM5ThrxnFaWOSTUpK8hA2ksHwhxOBTaVUCLALhyA,1032
-lanscape-1.3.1a3.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
-lanscape-1.3.1a3.dist-info/METADATA,sha256=xHhw_GlkbSRLen_UqJjJlKDZvsB9Bk5pCv3wXtbYf3A,2567
-lanscape-1.3.1a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-1.3.1a3.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-1.3.1a3.dist-info/RECORD,,
+lanscape-1.3.1a5.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.3.1a5.dist-info/METADATA,sha256=2z1NR8XEa_GB7vWrDzyD1VluYp3az47aNyXDBd3XJp8,2567
+lanscape-1.3.1a5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-1.3.1a5.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.3.1a5.dist-info/RECORD,,