lanscape 2.2.0a1__tar.gz → 2.2.1__tar.gz

{lanscape-2.2.0a1/lanscape.egg-info → lanscape-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.2.0a1
+Version: 2.2.1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,7 +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
+Requires-Dist: pwa-launcher>=1.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0; extra == "dev"

{lanscape-2.2.0a1 → lanscape-2.2.1}/lanscape/ui/main.py

@@ -1,20 +1,19 @@
 """Main entry point for the LANscape application when running as a module."""
 import socket
 
-
-import threading
 import time
 import logging
 import traceback
 import os
-import requests
 from subprocess import Popen
+import webbrowser
+import requests
+
+from pwa_launcher import open_pwa, ChromiumNotFoundError
 
-from pwa_launcher import open_pwa
 
 from lanscape.core.logger import configure_logging
 from lanscape.core.runtime_args import parse_args
-from lanscape.core.web_browser import open_webapp
 from lanscape.core.version_manager import get_installed_version, is_update_available
 from lanscape.ui.app import start_webserver_daemon, start_webserver
 # do this so any logs generated on import are displayed
@@ -73,7 +72,7 @@ def try_check_update():
         log.warning('Unable to check for updates.')
 
 
-def open_browser(url: str, wait=2) -> Popen:
+def open_browser(url: str, wait=2) -> Popen | None:
     """
     Open a browser window to the specified
     url after waiting for the server to start
@@ -83,6 +82,12 @@ def open_browser(url: str, wait=2) -> Popen:
         log.info(f'Starting UI - http://127.0.0.1:{args.port}')
         return open_pwa(url)
 
+    except ChromiumNotFoundError:
+        success = webbrowser.open(url)
+        if success:
+            log.warning("Chromium browser not found. Falling back to default web browser.")
+        else:
+            log.warning(f"Cannot find any web browser. LANScape UI running on {url}")
     except BaseException:
         log.debug(traceback.format_exc())
         log.info(f'Unable to open web browser, server running on {url}')
@@ -105,7 +110,6 @@ def start_webserver_ui():
     else:
         flask_thread = start_webserver_daemon(args)
         proc = open_browser(uri)
-        
         if proc:
             app_closed = proc.wait()
         else:

{lanscape-2.2.0a1 → lanscape-2.2.1/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.2.0a1
+Version: 2.2.1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,7 +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
+Requires-Dist: pwa-launcher>=1.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0; extra == "dev"

{lanscape-2.2.0a1 → lanscape-2.2.1}/lanscape.egg-info/SOURCES.txt

@@ -25,7 +25,6 @@ lanscape/core/scan_config.py
 lanscape/core/service_scan.py
 lanscape/core/subnet_scan.py
 lanscape/core/version_manager.py
-lanscape/core/web_browser.py
 lanscape/resources/mac_addresses/convert_csv.py
 lanscape/resources/mac_addresses/mac_db.json
 lanscape/resources/ports/convert_csv.py

{lanscape-2.2.0a1 → lanscape-2.2.1}/lanscape.egg-info/requires.txt

@@ -6,7 +6,7 @@ scapy<3.0,>=2.3.2
 tabulate==0.9.0
 pydantic
 icmplib
-pwa-launcher
+pwa-launcher>=1.1.0
 
 [dev]
 pytest>=8.0

{lanscape-2.2.0a1 → lanscape-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "2.2.0a1"
+version = "2.2.1"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]
@@ -28,7 +28,7 @@ dependencies = [
     "tabulate==0.9.0",
     "pydantic",
     "icmplib",
-    "pwa-launcher"
+    "pwa-launcher>=1.1.0"
 ]
 
 [project.optional-dependencies]

{lanscape-2.2.0a1 → lanscape-2.2.1}/tests/test_api.py

@@ -41,7 +41,7 @@ def test_scan_config():
     return {
         'subnet': TEST_SUBNET,
         'port_list': 'test_port_list_scan',
-        'lookup_type': ['ICMP','POKE_THEN_ARP'],  # Use ICMP for reliable external IP detection
+        'lookup_type': ['ICMP', 'POKE_THEN_ARP'],  # Use ICMP for reliable external IP detection
         'ping_config': {'timeout': 0.8, 'attempts': 2}  # Reasonable timeout for external IPs
     }
 

{lanscape-2.2.0a1 → lanscape-2.2.1}/tests/test_utils.py

@@ -252,9 +252,9 @@ def test_is_internal_block_edge_cases():
     ('192.168.1.1-192.168.1.10', True, 'Private range'),
     ('1.1.1.1-1.1.1.5', False, 'Public range'),
     ('192.168.1.1,10.0.0.1', True, 'Multiple private'),
-   ('192.168.1.1, 10.0.0.1', True, 'Multiple private (comma with space)'),
+    ('192.168.1.1, 10.0.0.1', True, 'Multiple private (comma with space)'),
     ('192.168.1.1,8.8.8.8', False, 'Mixed private/public'),
-   ('192.168.1.1, 8.8.8.8', False, 'Mixed private/public (comma with space)'),
+    ('192.168.1.1, 8.8.8.8', False, 'Mixed private/public (comma with space)'),
     ('192.168.1.1', True, 'Single private IP'),
     ('8.8.8.8', False, 'Single public IP'),
     ('invalid', False, 'Invalid input'),

lanscape-2.2.0a1/lanscape/core/web_browser.py

@@ -1,210 +0,0 @@
-"""
-Get the executable path of the system’s default web browser.
-
-Supports:
-  - Windows (reads from the registry)
-  - Linux   (uses xdg-mime / xdg-settings + .desktop file parsing)
-"""
-
-import sys
-import os
-import subprocess
-import webbrowser
-import logging
-import re
-import time
-from typing import Optional
-
-log = logging.getLogger('WebBrowser')
-
-
-def open_webapp(url: str) -> bool:
-    """
-    will try to open the web page as an app
-    on failure, will open as a tab in default browser
-
-    returns:
-    """
-    start = time.time()
-    try:
-        exe = get_default_browser_executable()
-        if not exe:
-            raise RuntimeError('Unable to find browser binary')
-        log.debug(f'Opening {url} with {exe}')
-
-        cmd = f'"{exe}" --app="{url}"'
-        subprocess.run(cmd, check=True, shell=True)
-
-        if time.time() - start < 2:
-            log.debug(
-                'Unable to hook into closure of UI, listening for flask shutdown')
-            return False
-        return True
-
-    except Exception as e:
-        log.warning(
-            'Failed to open webpage as app, falling back to browser tab')
-        log.debug(f'As app error: {e}')
-        try:
-            success = webbrowser.open(url)
-            log.debug(f'Opened {url} in browser tab: {success}')
-            if not success:
-                # pylint: disable=raise-missing-from
-                raise RuntimeError(
-                    'Unknown error while opening browser tab') from e
-        except Exception as e2:
-            log.warning(
-                'Exhausted all options to open browser, you need to open manually')
-            log.debug(f'As tab error: {e2}')
-            log.info(f'LANScape UI is running on {url}')
-    return False
-
-
-def get_default_browser_executable() -> Optional[str]:
-    """Platform-agnostic method to get the default browser executable path."""
-    if sys.platform.startswith("win"):
-        return windows_get_browser_from_registry()
-
-    if sys.platform.startswith("linux"):
-        return linux_get_browser_executable()
-
-    if sys.platform.startswith("darwin"):
-        # macOS: try to find Chrome first for app mode support, fallback to default
-        try:
-            p = subprocess.run(
-                ["mdfind", "kMDItemCFBundleIdentifier == 'com.google.Chrome'"],
-                capture_output=True, text=True, check=True
-            )
-            chrome_paths = p.stdout.strip().split('\n')
-            if chrome_paths and chrome_paths[0]:
-                return f"{chrome_paths[0]}/Contents/MacOS/Google Chrome"
-        except subprocess.CalledProcessError:
-            pass
-
-        # Fallback to system default
-        return "/usr/bin/open"
-
-    # Unsupported platform
-    return None
-
-
-def linux_get_browser_executable() -> Optional[str]:
-    """Get the default web browser executable path on Linux."""
-    # First, find the .desktop file name
-    desktop_file = None
-    try:
-        # Try xdg-mime
-        p = subprocess.run(
-            ["xdg-mime", "query", "default", "x-scheme-handler/http"],
-            capture_output=True, text=True,
-            check=True
-        )
-        desktop_file = p.stdout.strip()
-    except subprocess.CalledProcessError:
-        pass
-
-    if not desktop_file:
-        # Fallback to xdg-settings
-        try:
-            p = subprocess.run(
-                ["xdg-settings", "get", "default-web-browser"],
-                capture_output=True, text=True,
-                check=True
-            )
-            desktop_file = p.stdout.strip()
-        except subprocess.CalledProcessError:
-            pass
-
-    # Final fallback: BROWSER environment variable
-    if not desktop_file:
-        return os.environ.get("BROWSER")
-
-    # Look for that .desktop file in standard locations
-    search_paths = [
-        os.path.expanduser("~/.local/share/applications"),
-        "/usr/local/share/applications",
-        "/usr/share/applications",
-    ]
-
-    exec_cmd = None
-    for path in search_paths:
-        full_path = os.path.join(path, desktop_file)
-        if os.path.isfile(full_path):
-            with open(full_path, encoding="utf-8", errors="ignore") as f:
-                for line in f:
-                    if line.startswith("Exec="):
-                        exec_cmd = line[len("Exec="):].strip()
-                        # strip arguments like "%u", "--flag", etc.
-                        exec_cmd = exec_cmd.split()[0]
-                        exec_cmd = exec_cmd.split("%")[0]
-                        return exec_cmd
-
-    return exec_cmd
-
-
-def windows_get_browser_from_registry() -> Optional[str]:
-    """Get the default web browser executable path on Windows."""
-    # Import winreg only on Windows platforms
-    if not sys.platform.startswith("win"):
-        return None
-
-    try:
-        import winreg  # pylint: disable=import-outside-toplevel
-    except ImportError:
-        log.debug("winreg module not available")
-        return None
-
-    def get_reg(base, path, key=None):
-        """Helper function to read a registry key."""
-        try:
-            with winreg.OpenKey(base, path) as reg:
-                return winreg.QueryValueEx(reg, key)[0]
-        except FileNotFoundError:
-            return None
-
-    def extract_executable(cmd: str) -> Optional[str]:
-        """Extract the executable path from a command string."""
-        match = re.match(r'"?([^"]+)"?', cmd)
-        return match.group(1) if match else None
-
-    def get_user_preferred_browser():
-        """Get the user preferred browser from the registry."""
-        progid = get_reg(
-            winreg.HKEY_CURRENT_USER,
-            r'Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice',
-            'ProgId'
-        )
-        if not progid:
-            log.debug('No user preferred browser found in registry')
-            return None
-
-        browser_path = get_reg(
-            winreg.HKEY_CLASSES_ROOT,
-            f'{progid}\\shell\\open\\command'
-        )
-
-        if not browser_path:
-            log.debug(f'progid {progid} does not have a command in registry')
-            return None
-
-        return extract_executable(browser_path)
-
-    def get_system_default_browser():
-        """Get the system default browser from the registry."""
-        reg = get_reg(
-            winreg.HKEY_CLASSES_ROOT,
-            r'http\shell\open\command'
-        )
-        if not reg:
-            log.debug('No system default browser found in registry')
-            return None
-
-        return extract_executable(reg)
-
-    user_browser = get_user_preferred_browser()
-    if user_browser:
-        return extract_executable(user_browser)
-
-    system_browser = get_system_default_browser()
-    if system_browser:
-        return extract_executable(system_browser)