lanscape 1.2.8a1__py3-none-any.whl → 1.2.8a3__py3-none-any.whl

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/ui/app.py

@@ -106,8 +106,6 @@ def start_webserver(args: RuntimeArgs) -> int:
 
     app.run(**run_args)
 
-    
-
 if __name__ == "__main__":
     start_webserver(True)
 

lanscape/ui/main.py

@@ -13,6 +13,7 @@ configure_logging(args.loglevel, args.logfile)
 
 from ..libraries.version_manager import get_installed_version, is_update_available
 from .app import start_webserver
+import socket
 
 
 log = logging.getLogger('core')
@@ -27,9 +28,12 @@ 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:
         
@@ -63,9 +67,8 @@ 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()
 
@@ -74,13 +77,21 @@ def no_gui(args: RuntimeArgs):
     # if it was, dont open the browser again
     if not IS_FLASK_RELOAD:
         open_browser(f'http://127.0.0.1:{args.port}')
-    
-    log.info(f'Server started: 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">

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.8a1
+Version: 1.2.8a3
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape
@@ -32,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.8a1.dist-info → lanscape-1.2.8a3.dist-info}/RECORD

@@ -10,7 +10,7 @@ lanscape/libraries/net_tools.py,sha256=zWWvKon46i3ImhaGg2IpCV-Cx01-jFBBZCIHHHyFm
 lanscape/libraries/port_manager.py,sha256=fNext3FNfGnGYRZK9RhTEwQ2K0e0YmmMlhK4zVAvoCw,1977
 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
@@ -23,8 +23,8 @@ lanscape/tests/_helpers.py,sha256=wXJfUwzL3Fq4XBsC3dValCbXsf0U8FisuM_yo1de4QQ,37
 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/ui/app.py,sha256=HAH6IlJWJD3Mkwj1Z5h1hvk3U09ekwvg66Gfasphv54,3194
-lanscape/ui/main.py,sha256=0JOGmYOSMwYPc66Q5c9fVHN92KZCzgPjLNWtwJgMlWM,2373
+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
@@ -33,7 +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/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
@@ -48,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=zFG5MjG1kSEXE6nF8gpSw1Ff75kIpRmeJV5i5H876hY,1263
+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
@@ -61,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.8a1.dist-info/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
-lanscape-1.2.8a1.dist-info/METADATA,sha256=7xDqZ3e0HfGTuy1jo0NI5_9bqxguj8ccJspdLHg4LBY,2583
-lanscape-1.2.8a1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-lanscape-1.2.8a1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-1.2.8a1.dist-info/RECORD,,
+lanscape-1.2.8a3.dist-info/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.2.8a3.dist-info/METADATA,sha256=-Zu4Dm6pAjzV5VAZhdQvOSBVUBUzXu2vOZj5-w5TlLQ,2444
+lanscape-1.2.8a3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+lanscape-1.2.8a3.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.2.8a3.dist-info/RECORD,,