lanscape 1.2.7a3__py3-none-any.whl → 1.2.8__py3-none-any.whl

lanscape/libraries/runtime_args.py

@@ -7,20 +7,16 @@ from typing import Any, Dict
 class RuntimeArgs:
     reloader: bool = False
     port: int = 5001
-    nogui: bool = False
     logfile: bool = False
     loglevel: str = 'INFO'
-    headless: bool = False
 
 def parse_args() -> RuntimeArgs:
     parser = argparse.ArgumentParser(description='LANscape')
 
     parser.add_argument('--reloader', action='store_true', help='Use flask\'s reloader (helpful for local development)')
     parser.add_argument('--port', type=int, default=5001, help='Port to run the webserver on')
-    parser.add_argument('--nogui', action='store_true', help='Run in standalone mode')
     parser.add_argument('--logfile', action='store_true', help='Log output to lanscape.log')
-    parser.add_argument('--loglevel', default='INFO', choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], help='Set the log level')
-    parser.add_argument('--headless', action="store_true",help="Similar to nogui, but doesnt try to open a browser. Good for running in a container.")
+    parser.add_argument('--loglevel', default='INFO', help='Set the log level')
 
     # Parse the arguments
     args = parser.parse_args()
@@ -33,5 +29,12 @@ def parse_args() -> RuntimeArgs:
     # Only pass arguments that exist in the Args dataclass
     filtered_args = {name: args_dict[name] for name in field_names if name in args_dict}
 
+    # Deal with loglevel formatting
+    filtered_args['loglevel'] = filtered_args['loglevel'].upper()
+
+    valid_levels = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
+    if filtered_args['loglevel'] not in valid_levels:
+        raise ValueError(f"Invalid log level: {filtered_args['loglevel']}. Must be one of: {valid_levels}")
+
     # Return the dataclass instance with the dynamically assigned values
     return RuntimeArgs(**filtered_args)

lanscape/libraries/version_manager.py

@@ -16,7 +16,9 @@ latest = None # used to 'remember' pypi version each runtime
 def is_update_available(package=PACKAGE) -> bool:
     installed = get_installed_version(package)
     available = lookup_latest_version(package)
-    if installed == LOCAL_VERSION: return False #local
+    if installed == LOCAL_VERSION: return False # local
+    if 'a' in installed: return False # alpha
+    if 'b' in installed: return False # beta
 
     return installed != available
 

lanscape/tests/__init__.py

@@ -1,5 +1,3 @@
 from .test_api import ApiTestCase
 from .test_env import EnvTestCase
 from .test_library import LibraryTestCase
-from .test_webview import WebViewTestCase
-

lanscape/tests/_helpers.py

@@ -1,10 +1,7 @@
 
 from ..libraries.ip_parser import get_address_count
-import webview, time
 
-import warnings
 
-from concurrent.futures import ThreadPoolExecutor, Future
 def right_size_subnet(subnet: str):
     """
     Used to improve speed of test time
@@ -16,45 +13,3 @@ def right_size_subnet(subnet: str):
         mask += 1
         return right_size_subnet(f"{ip}/{mask}")
     return subnet
-
-def webview_client(title, url):
-    def decorator(func):
-        def wrapper(*args, **kwargs):
-            baseclass = args[0]
-
-            window = webview.create_window(title, url)
-
-            # Create a Future object to communicate results/exceptions
-            future = Future()
-
-            # Define the function to run in the secondary thread
-            def test_function():
-                # disable resource warning occuring in py >=3.13
-                warnings.filterwarnings("ignore", category=ResourceWarning)
-
-                try:
-                    # Call the decorated function
-                    func(baseclass, window, **kwargs)
-                    future.set_result("Completed Successfully")
-                except Exception as e:
-                    # Set the exception in the Future
-                    future.set_exception(e)
-                finally:
-                    # Close the WebView window
-                    if window is not None:
-                        window.destroy()
-
-            # Define a function to start the thread
-            def start_test_function():
-                # Run the function in a secondary thread
-                with ThreadPoolExecutor() as executor:
-                    executor.submit(test_function)
-
-            # Start the WebView and execute the thread alongside it
-            webview.start(start_test_function)
-
-            # Retrieve the result or exception from the Future
-            future.result()
-
-        return wrapper
-    return decorator

lanscape/ui/app.py

@@ -97,13 +97,14 @@ def start_webserver_dameon(args: RuntimeArgs) -> multiprocessing.Process:
     sleep(2)
 
 def start_webserver(args: RuntimeArgs) -> int:
-    app.run(
-        host='0.0.0.0', 
-        port=args.port, 
-        debug=args.reloader,
-        use_reloader=args.reloader
-    )
-
+    run_args = {
+        'host':'0.0.0.0',
+        'port':args.port,
+        'debug':args.reloader,
+        'use_reloader':args.reloader
+    }
+
+    app.run(**run_args)
 
 if __name__ == "__main__":
     start_webserver(True)

lanscape/ui/main.py

@@ -12,8 +12,8 @@ args = parse_args()
 configure_logging(args.loglevel, args.logfile)
 
 from ..libraries.version_manager import get_installed_version, is_update_available
-from .webviewer import start_webview
 from .app import start_webserver
+import socket
 
 
 log = logging.getLogger('core')
@@ -28,24 +28,23 @@ def main():
     if not IS_FLASK_RELOAD:
         log.info(f'LANscape v{get_installed_version()}')
         try_check_update()
-    else: 
+        
+    else:
         log.info('Flask reloaded app.')
         
+    args.port = get_valid_port(args.port)
+        
         
     try:
-        if args.nogui or args.headless:
-            no_gui(args)
-        else:
-            start_webview(
-                args
-            )
+        
+        no_gui(args)
+
         log.info('Exiting...')
     except Exception:
         # showing error in debug only because this is handled gracefully
-        log.debug('Failed to start webview client. Traceback below')
+        log.debug('Failed to start. Traceback below')
         log.debug(traceback.format_exc())
-        if not args.nogui:
-            log.error('Unable to start webview client. Try running with flag --nogui')
+
 
 
 def try_check_update():
@@ -68,23 +67,31 @@ def open_browser(url: str,wait=2):
             time.sleep(wait)
             webbrowser.open(url, new=2)
         except:
-            srv_url = f"0.0.0.0:{url.split(':')[1]}"
             log.debug(traceback.format_exc())
-            log.info(f'unable to open web browser, server running on {srv_url}')
+            log.info(f'Unable to open web browser, server running on {url}')
 
     threading.Thread(target=do_open).start()
 
 def no_gui(args: RuntimeArgs):
     # determine if it was reloaded by flask debug reloader
     # if it was, dont open the browser again
-    if not IS_FLASK_RELOAD and not args.headless:
+    if not IS_FLASK_RELOAD:
         open_browser(f'http://127.0.0.1:{args.port}')
-    if args.headless:
-        log.info(f'Started in headless mode on: http://127.0.0.1:{args.port}')
+        log.info(f'Flask started: http://127.0.0.1:{args.port}')
+    
     start_webserver(
         args
     )
 
+def get_valid_port(port: int):
+    """
+    Get the first available port starting from the specified port
+    """
+    while True:
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+            if s.connect_ex(('localhost', port)) != 0:
+                return port
+            port += 1
 
 if __name__ == "__main__":
     main()

lanscape/ui/static/css/style.css

@@ -460,8 +460,15 @@ input[type="range"]::-moz-range-thumb {
 }
 
 .text-secondary {
-    color: var(--secondary-accent)
+    color: var(--secondary-accent) !important;
 }
+.text-danger {
+    color: var(--text-danger-color) !important;
+}
+.text-info {
+    color: var(--text-accent-color) !important;
+}
+
 .secondary-icon-btn {
     color: var(--secondary-accent);
     transition: .2s all ease-in-out;

lanscape/ui/templates/base.html

@@ -11,10 +11,15 @@
         <div class="version">
             v{{app_version}}
             {% if is_local %}
-                <span>(Local Run)</span> 
+                <span class="text-info">(Local)</span> 
             {% elif update_available %} 
                 <span>(Update Available)</span> 
-            {% endif %}    
+            {% endif %}   
+            {% if 'a' in app_version %}
+                <span class="text-danger">(Alpha)</span>
+            {% elif 'b' in app_version %}
+                <span class="text-info">(Beta)</span>
+            {% endif %}
         </div>
 
         <div id="app-actions">
@@ -28,7 +33,6 @@
                 </span>
             </a>
 
-            {% if runtime_args.get('nogui') or runtime_args.get('headless') %}
             <a href="/shutdown-ui">
                 <span 
                     id="power-button" 
@@ -39,7 +43,6 @@
                     power_settings_new
                 </span>
             </a>
-            {% endif %}
         </div>
         
     </footer>

{lanscape-1.2.7a3.dist-info → lanscape-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.7a3
+Version: 1.2.8
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape
@@ -15,7 +15,6 @@ Requires-Dist: Flask<5.0,>=3.0
 Requires-Dist: psutil<7.0,>=6.0
 Requires-Dist: requests<3.0,>=2.32
 Requires-Dist: setuptools
-Requires-Dist: pywebview<6.0,>=4.2
 Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pytest
@@ -33,17 +32,15 @@ python -m lanscape
 
 ## Flags
  - `--port <port number>` port of the flask app (default: 5001)
- - `--nogui` run in web mode (default: false)
  - `--reloader` essentially flask debug mode- good for local development (default: false)
  - `--logfile` save log output to lanscape.log
  - `--loglevel <level>` set the logger's log level (default: INFO)
- - `--headless` similar to nogui but doesnt try to open a browser (default: false)
  
 
 Examples:
 ```shell
 python -m lanscape --reloader
-python -m lanscape --nogui --port 5002
+python -m lanscape --port 5002
 python -m lanscape --logfile --loglevel DEBUG
 ```
 

{lanscape-1.2.7a3.dist-info → lanscape-1.2.8.dist-info}/RECORD

@@ -8,9 +8,9 @@ lanscape/libraries/logger.py,sha256=hGbnj1cTGZT5elwdXUBVyLg_E2Pnocs2IfWumUkHj7M,
 lanscape/libraries/mac_lookup.py,sha256=jejM0NHLbxB9G2hfge2qt0qcNgnSlZERbiTP-RLUUPA,2141
 lanscape/libraries/net_tools.py,sha256=zWWvKon46i3ImhaGg2IpCV-Cx01-jFBBZCIHHHyFmqg,10112
 lanscape/libraries/port_manager.py,sha256=fNext3FNfGnGYRZK9RhTEwQ2K0e0YmmMlhK4zVAvoCw,1977
-lanscape/libraries/runtime_args.py,sha256=Ksu9xb4zyVl2RRBSus_-c9UrbU5A3XFmDxHrUeTUwdw,1670
+lanscape/libraries/runtime_args.py,sha256=JJTzWgQ-0aRh7Ce5efIwBmHZv1LfWjFagtNUNlLN7Uo,1660
 lanscape/libraries/subnet_scan.py,sha256=2BW69tbntqEujiqsdlQruLHfoAwnFrv6OLMhvQWauYM,11191
-lanscape/libraries/version_manager.py,sha256=MQ9hOZqiK_fe0jQR9FsbiSW52zKpryPFT6p8fQdKWTM,1505
+lanscape/libraries/version_manager.py,sha256=wdB5DPW8IjHJfgvT4mUKz7ndEV922WgVEqbwd6jfun4,1599
 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
@@ -18,15 +18,13 @@ lanscape/resources/ports/full.json,sha256=Abfbi-b5yZF4jR5NS6CT6QpIDfx4Vk04gIC1fK
 lanscape/resources/ports/large.json,sha256=jK4gkzlPT74uv4y0TvFjsaOaUcX7Cy8Zxe2bh5FYcc0,144496
 lanscape/resources/ports/medium.json,sha256=3yHAca0_pEWXK4k1wmda1eNVM6ftzcpKn5VspVwmkRs,3667
 lanscape/resources/ports/small.json,sha256=Mj3zGVG1F2eqZx2YkrLpTL8STeLcqB8_65IR67MS1Tg,397
-lanscape/tests/__init__.py,sha256=oFe5tRDmeHd8ynBSEXIaN7I1pwN0_Bvvoks_ptoLBME,158
-lanscape/tests/_helpers.py,sha256=jXD9Bnoxb8Hhwne3Algqt1mAAysB1GYA7CTh24ECpqM,2028
+lanscape/tests/__init__.py,sha256=xYPeceOF-ppTS0wnq7CkVYQMwupmeSHxbYLbGj_imZ0,113
+lanscape/tests/_helpers.py,sha256=wXJfUwzL3Fq4XBsC3dValCbXsf0U8FisuM_yo1de4QQ,371
 lanscape/tests/test_api.py,sha256=fIVIA6O9ssPRjofTHLS6z7XPNTkvv2rl2jDaxVCjFGU,5669
 lanscape/tests/test_env.py,sha256=ivFhCcemJ9vbe0_KtUkbqDY4r9nsDB8rVLUVjV-sNj8,673
 lanscape/tests/test_library.py,sha256=u-UBx76Dyh2xLhiCNxnzv7lIsWoUGKUtbPqkVUg7xwE,1552
-lanscape/tests/test_webview.py,sha256=2KQ7pr05AJ8DbaXkpA2FngRP0-UYIpjIwIYpcddBhAE,605
-lanscape/ui/app.py,sha256=pY-wZIGsqARWgFigpdLe16TdfOwGdN1EfWmvA7Ew9M8,3151
-lanscape/ui/main.py,sha256=DZZiFCZUZUxK6_tXIrRTe5-pG_DLBGHqazvcM20Q4rY,2703
-lanscape/ui/webviewer.py,sha256=BuD17wwUzRdpL4LsEb4cUVSBFr0CZirqkTQ46coUVj4,482
+lanscape/ui/app.py,sha256=hGmzoyH4YW2WmQsqZ6v-9r5DYzWi2KYP6_toZSxQqFg,3186
+lanscape/ui/main.py,sha256=HMQythH0fijX1Mt9fGQBcqmY37dQQ19ROC99JbCNAvs,2701
 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
@@ -35,8 +33,7 @@ lanscape/ui/blueprints/api/tools.py,sha256=CD0NDSX8kN6_lpl0jEw-ULLsDx7pKODCMFQia
 lanscape/ui/blueprints/web/__init__.py,sha256=-WRjENG8D99NfaiSDk9uAa8OX6XJq9Zmq1ck29ARL-w,92
 lanscape/ui/blueprints/web/routes.py,sha256=9S-xDBnUR-8Wf-B0fipBNFeTz-xiHhHy0WmhW9qWqZk,2166
 lanscape/ui/static/lanscape.webmanifest,sha256=0aauJk_Bybd0B2iwzJfvPcs7AX43kVHs0dtpV6_jSWk,459
-lanscape/ui/static/css/style.css,sha256=UECPZTx2vm7Ntgvm3dAaCq8sFyG_xmkx2HgorSa7rIs,15653
-lanscape/ui/static/img/readme1.png,sha256=JrvCM5ZZoJ9YvY1W1nUIXcw4su4dmlhTY-o-iIZDvkc,39347
+lanscape/ui/static/css/style.css,sha256=LbQ4O98uttwY2Msxv9XnniOTzZApGsqkFg8PCoe1ZcQ,15801
 lanscape/ui/static/img/ico/android-chrome-192x192.png,sha256=DxM2E9GjpKX-hSaSmAoW0GxLJ2fdXKJ-WOgoxYlDybw,24130
 lanscape/ui/static/img/ico/android-chrome-512x512.png,sha256=UoL_8UdhGU1q2_XkJ2T7QojgcNnz7FrBChlVRaMOWIs,73788
 lanscape/ui/static/img/ico/apple-touch-icon.png,sha256=Yhzhva3J_wjnC3zk2e7GXhEVNLozGVE_IjQkg4R5Ip4,21664
@@ -51,7 +48,7 @@ lanscape/ui/static/js/quietReload.js,sha256=_mHzpUsGL4Lm1hNsr3VYSOGVcgGA2y1-eZHa
 lanscape/ui/static/js/shutdown-server.js,sha256=WkO7_SNSHM_6kReUoCoExIdCf7Sl7IPiSiNxpbI-r0s,469
 lanscape/ui/static/js/subnet-info.js,sha256=aytt0LkBx4FVq36TxiMEw3aM7XQLHg_ng1U2WDwZVF4,577
 lanscape/ui/static/js/subnet-selector.js,sha256=OG01pDaSOPLq3Ial0aO0CqPcob9tPZA1MZKGmQG0W7Q,366
-lanscape/ui/templates/base.html,sha256=i6Gz4l2wSuByGqkKmQBCMYVlezH2J4nS7zU1G4KTMEg,1368
+lanscape/ui/templates/base.html,sha256=P5xnMlvDXYkYSXdSZUWaRfhsszNuZPP7A56hemBrAFs,1498
 lanscape/ui/templates/error.html,sha256=zXFO0zPIfQORWq1ZMiSZ8G7FjfhVVr-aaYC0HeBl4Rs,1068
 lanscape/ui/templates/info.html,sha256=oCC59keGEfgUB4WaCozaeZEfNb8Nr7y61DmkRBMqs18,2461
 lanscape/ui/templates/main.html,sha256=M12xJSN6Ga565vIPhdCiqcr1tYgDrqzuQTeuXtk-8yo,3759
@@ -64,8 +61,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=Q0gmkVI-xNLZ-zWA9qm4H14cv_eF_bQs1KYPyAaoHLY,1141
 lanscape/ui/templates/scan/scan-error.html,sha256=Q4eZM5ThrxnFaWOSTUpK8hA2ksHwhxOBTaVUCLALhyA,1032
-lanscape-1.2.7a3.dist-info/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
-lanscape-1.2.7a3.dist-info/METADATA,sha256=BfD04zXE0DAEm0wHdiGEZ2g-6TpbSO1i5opabklOhN8,2619
-lanscape-1.2.7a3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-lanscape-1.2.7a3.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-1.2.7a3.dist-info/RECORD,,
+lanscape-1.2.8.dist-info/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.2.8.dist-info/METADATA,sha256=758DXrtDG7mYKA-iEduUgi7Zw5hiaNCG5ZvON5jdZe4,2442
+lanscape-1.2.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+lanscape-1.2.8.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.2.8.dist-info/RECORD,,

lanscape/tests/test_webview.py

@@ -1,16 +0,0 @@
-import webview
-from ._helpers import webview_client
-import unittest
-from time import sleep
-
-
-
-class WebViewTestCase(unittest.TestCase):
-    
-    @webview_client('Test Window','https://google.com')
-    def test_webview_launch(self, client: webview.Window):
-        # This test checks that the window has been created successfully
-        sleep(2)
-        self.assertIsNotNone(client,msg="WebView window failed to create.")
-        self.assertEqual(client.title,'Test Window',msg='WebView window title did not match.')
-        self.assertIn('google.com',client.real_url,msg=f'URL mismatch')

lanscape/ui/webviewer.py

@@ -1,20 +0,0 @@
-import webview
-from .app import start_webserver_dameon
-from ..libraries.runtime_args import RuntimeArgs
-
-
-
-def start_webview(args: RuntimeArgs) -> None:
-    # Start Flask server in a separate thread
-    start_webserver_dameon(args)
-
-    # Start the Pywebview window
-    webview.create_window('LANscape', f'http://127.0.0.1:{args.port}')
-    webview.start()
-
-
-    
-if __name__ == "__main__":
-    # Start Flask server in a separate thread
-    start_webview(True)
-