lanscape 1.3.0b1__py3-none-any.whl → 1.3.1a2__py3-none-any.whl

lanscape/libraries/net_tools.py

@@ -347,17 +347,24 @@ def get_all_network_subnets():
 
     return subnets
 
-def smart_select_primary_subnet(subnets: List[dict]=get_all_network_subnets()) -> str:
+def smart_select_primary_subnet(subnets: List[dict] | None = None) -> str:
     """
-     Finds the largest subnet within max ip range
-     not perfect, but works better than subnets[0]
+    Finds the largest subnet within max ip range. If no subnets are
+    available, returns an empty string instead of raising ``KeyError``.
     """
+    subnets = subnets or get_all_network_subnets()
+
+    if not subnets:
+        return ""
+
     selected = {}
     for subnet in subnets:
-        if selected.get('address_cnt',0) < subnet['address_cnt'] < MAX_IPS_ALLOWED:
+        if selected.get("address_cnt", 0) < subnet["address_cnt"] < MAX_IPS_ALLOWED:
             selected = subnet
-    if not selected and len(subnets):
+
+    if not selected:
         selected = subnets[0]
-    return selected['subnet']
+
+    return selected.get("subnet", "")
 
 

lanscape/libraries/web_browser.py

@@ -29,12 +29,21 @@ def open_webapp(url: str) -> bool:
     """
     start = time.time()
     try:
-        exe = get_default_browser_executable()
-        if not exe:
-            raise RuntimeError('Unable to find browser binary')
-        log.debug(f'Opening {url} with {exe}')
+        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" --app=https://weatherlite.app"""
+            subprocess.run(cmd, check=True, shell=True)
 
-        subprocess.run(f'{exe} --app="{url}"')
+        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}"')
 
         if time.time() - start < 2:
             log.debug(f'Unable to hook into closure of UI, listening for flask shutdown')
@@ -117,8 +126,12 @@ def get_default_browser_executable() -> Optional[str]:
                             # strip arguments like “%u”, “--flag”, etc.
                             exec_cmd = exec_cmd.split()[0]
                             exec_cmd = exec_cmd.split("%")[0]
-                            return exec_cmd
+            return exec_cmd
         return None
 
+    elif sys.platform.startswith("darwin"):
+        # macOS will use the system 'open' command to launch the default browser
+        return "/usr/bin/open"
+
     else:
         raise NotImplementedError(f"Unsupported platform: {sys.platform!r}")

lanscape/ui/app.py

@@ -71,7 +71,7 @@ def exit_app():
         if args.persistent:
             log.info('Dectected browser close, not exiting flask.')
             return "Ignored"
-        log.info('Web browser closed, terminating flask.')
+        log.info('Web browser closed, terminating flask. (disable with --peristent)')
     elif req_type == 'core':
         log.info('Core requested exit, terminating flask.')
     else:
@@ -100,7 +100,7 @@ def internal_error(e):
 ## Webserver creation functions
 ################################
 
-def start_webserver_dameon(args: RuntimeArgs) -> threading.Thread:
+def start_webserver_daemon(args: RuntimeArgs) -> threading.Thread:
     proc = threading.Thread(target=start_webserver, args=(args,))
     proc.daemon = True # Kill thread when main thread exits
     proc.start()

lanscape/ui/main.py

@@ -12,7 +12,7 @@ args = parse_args()
 configure_logging(args.loglevel, args.logfile, args.flask_logging)
 
 from ..libraries.version_manager import get_installed_version, is_update_available
-from .app import start_webserver_dameon, start_webserver
+from .app import start_webserver_daemon, start_webserver
 import socket
 
 
@@ -100,13 +100,13 @@ def start_webserver_ui(args: RuntimeArgs):
             ).start()
         start_webserver(args)
     else: 
-        flask_thread = start_webserver_dameon(args)
+        flask_thread = start_webserver_daemon(args)
         app_closed = open_browser(uri)
 
         # depending on env, open_browser may or
         # may not be coupled with the closure of UI
         # (if in browser tab, it's uncoupled)
-        if not app_closed:
+        if not app_closed or args.persistent:
             # not doing a direct join so i can still 
             # terminate the app with ctrl+c
             while flask_thread.is_alive():

lanscape/ui/templates/info.html

@@ -34,7 +34,7 @@
             discover more about your network as well. Enjoy!
         </p>
         <a  href="https://github.com/mdennis281/" target="_blank">
-            <button class="btn btn-primary m-2">Github</button>
+            <button class="btn btn-primary m-2">GitHub</button>
         </a>
         <a  href="https://github.com/mdennis281/LANscape" target="_blank">
             <button class="btn btn-secondary m-2">Project Repo</button>

{lanscape-1.3.0b1.dist-info → lanscape-1.3.1a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.0b1
+Version: 1.3.1a2
 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.0b1.dist-info → lanscape-1.3.1a2.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=GOK2zUdbk8bQ4gHLDZ0e73bZHvnbK7VADce_pTbbw2Q,11736
+lanscape/libraries/net_tools.py,sha256=JU4mnQptO3-WGGlGR4lCRvOM8qpoCIvw6CuApiTQ-t4,11855
 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=ZRtQ0L0rjTYQZTxNEMqmwShOfZNK-6IqWvs1GdcCw5M,4338
+lanscape/libraries/web_browser.py,sha256=1P5X0XlrC-CTK6Rv3FEN1O0IP660mes9KvV53HWJrzU,4972
 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
@@ -26,8 +26,8 @@ lanscape/tests/_helpers.py,sha256=wXJfUwzL3Fq4XBsC3dValCbXsf0U8FisuM_yo1de4QQ,37
 lanscape/tests/test_api.py,sha256=sjcjt3b1ZwvQiALOSfXoQxTlN1Z1_TRPC0EEy-bRIgE,7313
 lanscape/tests/test_env.py,sha256=ivFhCcemJ9vbe0_KtUkbqDY4r9nsDB8rVLUVjV-sNj8,673
 lanscape/tests/test_library.py,sha256=OPcTsUoR5IureSNDbePxid2BG98mfNNIJmCIY0BVz3w,1553
-lanscape/ui/app.py,sha256=fcifRJtaRWxe2gZHPVAB4GQmyaIV7tFhK0_GClIt6Qs,3567
-lanscape/ui/main.py,sha256=uNiMeupLRzZ3mzNd05KF_caAEzgFb_jv74-xuBlwQkI,4008
+lanscape/ui/app.py,sha256=jMr72omFHOJJWxb9vwfpC7Lg-YIpw-4sZFAbWHnx_D4,3594
+lanscape/ui/main.py,sha256=KObgvdOlIhx4VQgcaNLcLrnkFXmOhfVpUyI8tZDQmJo,4027
 lanscape/ui/blueprints/__init__.py,sha256=agvgPOSVbrxddaw6EY64ZZr1CQi1Qzwcs1t0lZMv5oY,206
 lanscape/ui/blueprints/api/__init__.py,sha256=t0QOq3vHFWmlZm_3YFPQbQzCn1a_a5cmRchtIxwy4eY,103
 lanscape/ui/blueprints/api/port.py,sha256=2UA38umzXE8pMitx1E-_wJHyL1dYYbtM6Kg5zVtfj6A,1019
@@ -54,7 +54,7 @@ lanscape/ui/static/js/subnet-info.js,sha256=aytt0LkBx4FVq36TxiMEw3aM7XQLHg_ng1U2
 lanscape/ui/static/js/subnet-selector.js,sha256=OG01pDaSOPLq3Ial0aO0CqPcob9tPZA1MZKGmQG0W7Q,366
 lanscape/ui/templates/base.html,sha256=P5xnMlvDXYkYSXdSZUWaRfhsszNuZPP7A56hemBrAFs,1498
 lanscape/ui/templates/error.html,sha256=zXFO0zPIfQORWq1ZMiSZ8G7FjfhVVr-aaYC0HeBl4Rs,1068
-lanscape/ui/templates/info.html,sha256=uRvR5Y0lDmSq2k-_ibcEcab2Ipzo8Qt6ZNK04h5Bfh8,2457
+lanscape/ui/templates/info.html,sha256=K2ckljQujyXBaf0VmKO7IMm2S_wmN0sHD4vWA8Y4gJA,2457
 lanscape/ui/templates/main.html,sha256=M12xJSN6Ga565vIPhdCiqcr1tYgDrqzuQTeuXtk-8yo,3759
 lanscape/ui/templates/scan.html,sha256=Fz1Q4CzRq5qpKgszTAQLhaLVV0A6gBraT33mNDmpYRE,390
 lanscape/ui/templates/shutdown.html,sha256=v0cGT5CJWi-V8b5sUN3l-QIDNUmHTvKGi2gDlhmRlrs,724
@@ -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.0b1.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
-lanscape-1.3.0b1.dist-info/METADATA,sha256=6Je873VqtOapiau6tCbOyrCpLodk5t1z8x0WuYjcjrc,2567
-lanscape-1.3.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-1.3.0b1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-1.3.0b1.dist-info/RECORD,,
+lanscape-1.3.1a2.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.3.1a2.dist-info/METADATA,sha256=QR9ZK6YwvTDlb5a6Vt-lpSqSwRyg9Rw46Mkh5DNwxdU,2567
+lanscape-1.3.1a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-1.3.1a2.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.3.1a2.dist-info/RECORD,,