lanscape 1.2.7a2__tar.gz → 1.2.8__tar.gz

{lanscape-1.2.7a2/src/lanscape.egg-info → lanscape-1.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.7a2
+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
@@ -23,7 +22,7 @@ Requires-Dist: pytest
 # LANscape
 A python based local network scanner.
 
-![screenshot](https://github.com/mdennis281/py-lanscape/raw/main/src/lanscape/ui/static/img/readme1.png)
+![screenshot](https://github.com/user-attachments/assets/ba09c656-9fd9-4d74-8426-506d9a5c316c)
 
 ## Local Run
 ```sh
@@ -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.7a2 → lanscape-1.2.8}/README.md

@@ -1,7 +1,7 @@
 # LANscape
 A python based local network scanner.
 
-![screenshot](https://github.com/mdennis281/py-lanscape/raw/main/src/lanscape/ui/static/img/readme1.png)
+![screenshot](https://github.com/user-attachments/assets/ba09c656-9fd9-4d74-8426-506d9a5c316c)
 
 ## Local Run
 ```sh
@@ -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.7a2 → lanscape-1.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.2.7a2"
+version = "1.2.8"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]
@@ -17,7 +17,6 @@ dependencies = [
     "psutil>=6.0,<7.0",
     "requests>=2.32,<3.0", 
     "setuptools",
-    "pywebview>=4.2,<6.0",
     "scapy>=2.3.2,<3.0",
     "tabulate==0.9.0",
     "pytest"

{lanscape-1.2.7a2 → lanscape-1.2.8}/src/lanscape/libraries/net_tools.py

@@ -131,6 +131,14 @@ class Device(IPAlive):
     
 
 class MacSelector:
+    """
+    Essentially filters out bad mac addresses
+    you send in a list of macs, 
+    it will return the one that has been seen the least
+    (ideally meaning it is the most likely to be the correct one)
+    this was added because some lookups return multiple macs,
+    usually the hwid of a vpn tunnel etc
+    """
     def __init__(self):
         self.macs = {}
     

{lanscape-1.2.7a2 → lanscape-1.2.8}/src/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-1.2.7a2 → lanscape-1.2.8}/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.7a2 → lanscape-1.2.8}/src/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-1.2.8/src/lanscape/tests/_helpers.py

@@ -0,0 +1,15 @@
+
+from ..libraries.ip_parser import get_address_count
+
+
+def right_size_subnet(subnet: str):
+    """
+    Used to improve speed of test time
+    """
+    if get_address_count(subnet) > 500:
+        parts = subnet.split('/')
+        ip = parts[0]
+        mask = int(parts[1])
+        mask += 1
+        return right_size_subnet(f"{ip}/{mask}")
+    return subnet

{lanscape-1.2.7a2 → lanscape-1.2.8}/src/lanscape/ui/app.py

@@ -1,4 +1,5 @@
 from flask import Flask, render_template
+from time import sleep
 import multiprocessing
 import traceback
 import threading
@@ -92,15 +93,18 @@ def start_webserver_dameon(args: RuntimeArgs) -> multiprocessing.Process:
     proc = threading.Thread(target=start_webserver, args=(args,))
     proc.daemon = True # Kill thread when main thread exits
     proc.start()
+    log.info('Flask server initializing as dameon')
+    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-1.2.7a2 → lanscape-1.2.8}/src/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,23 +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():
@@ -67,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-1.2.7a2 → lanscape-1.2.8}/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.7a2 → lanscape-1.2.8}/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">
@@ -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.7a2 → lanscape-1.2.8/src/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.7a2
+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
@@ -23,7 +22,7 @@ Requires-Dist: pytest
 # LANscape
 A python based local network scanner.
 
-![screenshot](https://github.com/mdennis281/py-lanscape/raw/main/src/lanscape/ui/static/img/readme1.png)
+![screenshot](https://github.com/user-attachments/assets/ba09c656-9fd9-4d74-8426-506d9a5c316c)
 
 ## Local Run
 ```sh
@@ -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.7a2 → lanscape-1.2.8}/src/lanscape.egg-info/SOURCES.txt

@@ -32,10 +32,8 @@ src/lanscape/tests/_helpers.py
 src/lanscape/tests/test_api.py
 src/lanscape/tests/test_env.py
 src/lanscape/tests/test_library.py
-src/lanscape/tests/test_webview.py
 src/lanscape/ui/app.py
 src/lanscape/ui/main.py
-src/lanscape/ui/webviewer.py
 src/lanscape/ui/blueprints/__init__.py
 src/lanscape/ui/blueprints/api/__init__.py
 src/lanscape/ui/blueprints/api/port.py
@@ -45,7 +43,6 @@ src/lanscape/ui/blueprints/web/__init__.py
 src/lanscape/ui/blueprints/web/routes.py
 src/lanscape/ui/static/lanscape.webmanifest
 src/lanscape/ui/static/css/style.css
-src/lanscape/ui/static/img/readme1.png
 src/lanscape/ui/static/img/ico/android-chrome-192x192.png
 src/lanscape/ui/static/img/ico/android-chrome-512x512.png
 src/lanscape/ui/static/img/ico/apple-touch-icon.png

{lanscape-1.2.7a2 → lanscape-1.2.8}/src/lanscape.egg-info/requires.txt

@@ -2,7 +2,6 @@ Flask<5.0,>=3.0
 psutil<7.0,>=6.0
 requests<3.0,>=2.32
 setuptools
-pywebview<6.0,>=4.2
 scapy<3.0,>=2.3.2
 tabulate==0.9.0
 pytest

lanscape-1.2.7a2/src/lanscape/tests/_helpers.py

@@ -1,60 +0,0 @@
-
-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
-    """
-    if get_address_count(subnet) > 500:
-        parts = subnet.split('/')
-        ip = parts[0]
-        mask = int(parts[1])
-        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-1.2.7a2/src/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-1.2.7a2/src/lanscape/ui/webviewer.py

@@ -1,22 +0,0 @@
-import webview
-from .app import start_webserver_dameon
-from ..libraries.runtime_args import RuntimeArgs
-from time import sleep
-
-
-
-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}')
-    sleep(1)
-    webview.start()
-
-
-    
-if __name__ == "__main__":
-    # Start Flask server in a separate thread
-    start_webview(True)
-