lanscape 2.1.2__py3-none-any.whl → 2.2.0a2__py3-none-any.whl

lanscape/ui/main.py

@@ -8,6 +8,9 @@ import logging
 import traceback
 import os
 import requests
+from subprocess import Popen
+
+from pwa_launcher import open_pwa
 
 from lanscape.core.logger import configure_logging
 from lanscape.core.runtime_args import parse_args
@@ -70,7 +73,7 @@ def try_check_update():
         log.warning('Unable to check for updates.')
 
 
-def open_browser(url: str, wait=2) -> bool:
+def open_browser(url: str, wait=2) -> Popen:
     """
     Open a browser window to the specified
     url after waiting for the server to start
@@ -78,12 +81,12 @@ def open_browser(url: str, wait=2) -> bool:
     try:
         time.sleep(wait)
         log.info(f'Starting UI - http://127.0.0.1:{args.port}')
-        return open_webapp(url)
+        return open_pwa(url)
 
     except BaseException:
         log.debug(traceback.format_exc())
         log.info(f'Unable to open web browser, server running on {url}')
-    return False
+    return None
 
 
 def start_webserver_ui():
@@ -97,19 +100,17 @@ def start_webserver_ui():
         # if it was, dont open the browser again
         log.info('Opening UI as daemon')
         if not IS_FLASK_RELOAD:
-            threading.Thread(
-                target=open_browser,
-                args=(uri,),
-                daemon=True
-            ).start()
+            open_browser(uri)
         start_webserver(args)
     else:
         flask_thread = start_webserver_daemon(args)
-        app_closed = open_browser(uri)
+        proc = open_browser(uri)
+        
+        if proc:
+            app_closed = proc.wait()
+        else:
+            app_closed = False
 
-        # 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 or args.persistent:
             # not doing a direct join so i can still
             # terminate the app with ctrl+c

{lanscape-2.1.2.dist-info → lanscape-2.2.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.1.2
+Version: 2.2.0a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,6 +25,7 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Requires-Dist: pwa-launcher>=0.3.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0; extra == "dev"

{lanscape-2.1.2.dist-info → lanscape-2.2.0a2.dist-info}/RECORD

@@ -27,7 +27,7 @@ lanscape/resources/ports/test_port_list_scan.json,sha256=qXuWGQ_sGIRCVrhJxMeWcHK
 lanscape/resources/services/definitions.jsonc,sha256=M9BDeK-mh25sEVj8xDEYbU2ix7EETVWhbiYmMb14Gjg,20905
 lanscape/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lanscape/ui/app.py,sha256=rg4UGHgbVHpU2jdabSwBoSqGna7WGOunPkPc5Tvds9w,4076
-lanscape/ui/main.py,sha256=UCrhHnyFBqVmHTMus33CTp3vdNn3miT1xXJatR4N7ho,4176
+lanscape/ui/main.py,sha256=AthtTJDoxWBMxMysdG569E_mIsY5B8KkYy2RlyNdc-4,4077
 lanscape/ui/shutdown_handler.py,sha256=HrEnWrdYSzLDVsPgD8tf9FgtAwQrZNECDu6wnEs27EY,1704
 lanscape/ui/blueprints/__init__.py,sha256=EjPtaR5Nh17pGiOVYTJULVNaZntpFZOiYyep8rBWAiE,265
 lanscape/ui/blueprints/api/__init__.py,sha256=5Z4Y7B36O-bNFenpomfuNhPuJ9dW_MC0TPUU3pCFVfA,103
@@ -69,9 +69,9 @@ lanscape/ui/templates/scan/ip-table-row.html,sha256=iSW3PYev3_k7pxTZUJUboqDUgdhs
 lanscape/ui/templates/scan/ip-table.html,sha256=AT2ZvCPYdKl-XJiAkEAawPOVuQw-w0MXumGQTr3zyKM,926
 lanscape/ui/templates/scan/overview.html,sha256=xWj9jWDPg2KcPLvS8fnSins23_UXjKCdb2NJwNG2U2Q,1176
 lanscape/ui/templates/scan/scan-error.html,sha256=wmAYQ13IJHUoO8fAGNDjMvNml7tu4rsIU3Vav71ETlA,999
-lanscape-2.1.2.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
-lanscape-2.1.2.dist-info/METADATA,sha256=oxHxoHbAYnhTnSIgsMyzzgqevSrWmF5Fzti1bqjLAao,3578
-lanscape-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-2.1.2.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
-lanscape-2.1.2.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-2.1.2.dist-info/RECORD,,
+lanscape-2.2.0a2.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
+lanscape-2.2.0a2.dist-info/METADATA,sha256=uX-ooreN2kgR0A6c9sFb31u1dxYsw7v0SrfjBVs8-To,3615
+lanscape-2.2.0a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-2.2.0a2.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
+lanscape-2.2.0a2.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-2.2.0a2.dist-info/RECORD,,