lanscape 1.3.0b1__tar.gz → 1.3.1a2__tar.gz

{lanscape-1.3.0b1/src/lanscape.egg-info → lanscape-1.3.1a2}/PKG-INFO

@@ -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 → lanscape-1.3.1a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.3.0b1"
+version = "1.3.1a2"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]

{lanscape-1.3.0b1 → lanscape-1.3.1a2}/src/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-1.3.0b1 → lanscape-1.3.1a2}/src/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-1.3.0b1 → lanscape-1.3.1a2}/src/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-1.3.0b1 → lanscape-1.3.1a2}/src/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-1.3.0b1 → lanscape-1.3.1a2}/src/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 → lanscape-1.3.1a2/src/lanscape.egg-info}/PKG-INFO

@@ -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