lanscape 1.2.8a1__tar.gz → 1.2.8a3__tar.gz

{lanscape-1.2.8a1/src/lanscape.egg-info → lanscape-1.2.8a3}/PKG-INFO

@@ -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 → lanscape-1.2.8a3}/README.md

@@ -11,17 +11,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 → lanscape-1.2.8a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.2.8a1"
+version = "1.2.8a3"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]

{lanscape-1.2.8a1 → lanscape-1.2.8a3}/src/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-1.2.8a1 → lanscape-1.2.8a3}/src/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-1.2.8a1 → lanscape-1.2.8a3}/src/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-1.2.8a1 → lanscape-1.2.8a3}/src/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-1.2.8a1 → lanscape-1.2.8a3}/src/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 → lanscape-1.2.8a3/src/lanscape.egg-info}/PKG-INFO

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