lanscape 2.0.0a1__tar.gz → 2.0.0b1__tar.gz

{lanscape-2.0.0a1/lanscape.egg-info → lanscape-2.0.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.0.0a1
+Version: 2.0.0b1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,6 +25,9 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: pytest-cov>=5.0; extra == "dev"
 Dynamic: license-file
 
 # LANscape
@@ -85,7 +88,7 @@ I use a combination of ARP, ICMP & port testing to determine if a device is onli
 Recommendations:
 
   - Adjust scan configuration
-  - Configure ARP lookup [ARP lookup setup](./support/arp-issues.md)
+  - Configure ARP lookup [ARP lookup setup](./docs/arp-issues.md)
   - Create a bug
 
 

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/README.md

@@ -56,7 +56,7 @@ I use a combination of ARP, ICMP & port testing to determine if a device is onli
 Recommendations:
 
   - Adjust scan configuration
-  - Configure ARP lookup [ARP lookup setup](./support/arp-issues.md)
+  - Configure ARP lookup [ARP lookup setup](./docs/arp-issues.md)
   - Create a bug
 
 

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/__init__.py

@@ -22,4 +22,3 @@ from lanscape.core.scan_config import (
 from lanscape.core.port_manager import PortManager
 
 from lanscape.core import net_tools
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/__main__.py

@@ -7,4 +7,3 @@ from lanscape.ui.main import main
 
 if __name__ == "__main__":
     main()
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/app_scope.py

@@ -90,4 +90,3 @@ def is_local_run() -> bool:
     if any(parts):
         return False
     return True  # Installed package
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/decorators.py

@@ -229,4 +229,3 @@ def timeout_enforcer(timeout: int, raise_on_timeout: bool = True):
                     return None  # Return None if not raising an exception
         return wrapper
     return decorator
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/device_alive.py

@@ -156,7 +156,7 @@ class ArpLookup():
     NOTE: This lookup method requires elevated privileges to access the ARP cache.
 
 
-    [Arp Lookup Requirements](/support/arp-issues.md)
+    [Arp Lookup Requirements](/docs/arp-issues.md)
     """
 
     @classmethod
@@ -227,4 +227,3 @@ class Poker():
                 sock.close()
 
         do_poke()
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/errors.py

@@ -40,4 +40,3 @@ class DeviceError(Exception):
 
     def __str__(self):
         return f'Error(source={self.method}, msg={self.base})'
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/ip_parser.py

@@ -10,7 +10,6 @@ This module provides utilities for parsing various IP address formats including:
 It also includes validation to prevent processing excessively large IP ranges.
 """
 import ipaddress
-import re
 
 from lanscape.core.errors import SubnetTooLargeError
 
@@ -50,14 +49,10 @@ def parse_ip_input(ip_input):
             for ip in net.hosts():
                 ip_ranges.append(ip)
 
-        # Handle IP range (e.g., 10.0.0.15-10.0.0.25)
+        # Handle IP range (e.g., 10.0.0.15-10.0.0.25) and (e.g., 10.0.9.1-253)
         elif '-' in entry:
             ip_ranges += parse_ip_range(entry)
 
-        # Handle shorthand IP range (e.g., 10.0.9.1-253)
-        elif re.search(r'\d+\-\d+', entry):
-            ip_ranges += parse_shorthand_ip_range(entry)
-
         # If no CIDR or range, assume a single IP
         else:
             ip_ranges.append(ipaddress.IPv4Address(entry))
@@ -106,25 +101,6 @@ def parse_ip_range(entry):
     return list(ip_range_to_list(start_ip, end_ip))
 
 
-def parse_shorthand_ip_range(entry):
-    """
-    Parse a shorthand IP range (e.g., 192.168.1.1-10).
-
-    In this format, only the last octet of the end IP is specified.
-
-    Args:
-        entry (str): String containing a shorthand IP range
-
-    Returns:
-        list: List of IPv4Address objects in the range (inclusive)
-    """
-    start_ip, end_part = entry.split('-')
-    start_ip = ipaddress.IPv4Address(start_ip.strip())
-    end_ip = start_ip.exploded.rsplit('.', 1)[0] + '.' + end_part.strip()
-
-    return list(ip_range_to_list(start_ip, ipaddress.IPv4Address(end_ip)))
-
-
 def ip_range_to_list(start_ip, end_ip):
     """
     Convert an IP range defined by start and end addresses to a list of addresses.
@@ -139,4 +115,3 @@ def ip_range_to_list(start_ip, end_ip):
     # Yield the range of IPs
     for ip_int in range(int(start_ip), int(end_ip) + 1):
         yield ipaddress.IPv4Address(ip_int)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/logger.py

@@ -72,4 +72,3 @@ def disable_flask_logging() -> None:
     werkzeug_log.setLevel(logging.ERROR)
 
     override_click_logging()
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/mac_lookup.py

@@ -105,4 +105,3 @@ def lookup_mac(mac: str) -> Optional[str]:
 def get_macs(ip: str) -> List[str]:
     """Backward compatibility function for MAC resolution."""
     return MacResolver().get_macs(ip)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/net_tools.py

@@ -566,4 +566,3 @@ def is_arp_supported():
         return True
     except (Scapy_Exception, PermissionError, RuntimeError):
         return False
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/port_manager.py

@@ -148,4 +148,3 @@ class PortManager:
             return True
         except BaseException:
             return False
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/runtime_args.py

@@ -63,4 +63,3 @@ def parse_args() -> RuntimeArgs:
 
     # Return the dataclass instance with the dynamically assigned values
     return RuntimeArgs(**filtered_args)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/scan_config.py

@@ -395,4 +395,3 @@ DEFAULT_CONFIGS: Dict[str, ScanConfig] = {
         )
     )
 }
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/service_scan.py

@@ -2,7 +2,6 @@
 """
 
 from typing import Optional, Union
-import sys
 import asyncio
 import logging
 import traceback
@@ -10,6 +9,9 @@ import traceback
 from lanscape.core.app_scope import ResourceManager
 from lanscape.core.scan_config import ServiceScanConfig, ServiceScanStrategy
 
+# asyncio complains more than it needs to
+logging.getLogger("asyncio").setLevel(logging.WARNING)
+
 log = logging.getLogger('ServiceScan')
 SERVICES = ResourceManager('services').get_jsonc('definitions.jsonc')
 
@@ -183,23 +185,3 @@ def scan_service(ip: str, port: int, cfg: ServiceScanConfig) -> str:
 
     # Use asyncio.run to execute the asynchronous logic synchronously
     return asyncio.run(_async_scan_service(ip, port, cfg=cfg))
-
-
-def asyncio_logger_suppression():
-    """Suppress the noisy asyncio transport errors since they are expected in service scanning."""
-
-    # Reduce noisy asyncio transport errors on Windows by switching to Selector policy
-    if sys.platform.startswith("win"):
-        try:
-            asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-        except Exception:
-            pass
-    # Also tone down asyncio logger noise from transport callbacks
-    try:
-        logging.getLogger("asyncio").setLevel(logging.WARNING)
-    except Exception:
-        pass
-
-
-asyncio_logger_suppression()
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/subnet_scan.py

@@ -428,4 +428,3 @@ class ScanManager:
         t = threading.Thread(target=scan.start)
         t.start()
         return t
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/version_manager.py

@@ -95,4 +95,3 @@ def get_installed_version(package=PACKAGE):
             log.debug(traceback.format_exc())
             log.warning(f'Cannot find {package} installation')
     return LOCAL_VERSION
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/core/web_browser.py

@@ -208,4 +208,3 @@ def windows_get_browser_from_registry() -> Optional[str]:
     system_browser = get_system_default_browser()
     if system_browser:
         return extract_executable(system_browser)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/resources/mac_addresses/convert_csv.py

@@ -39,4 +39,3 @@ def csv_to_dict(data):
 
 
 main()
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/resources/ports/convert_csv.py

@@ -38,4 +38,3 @@ def csv_to_dict(data):
 
 
 main()
-

lanscape-2.0.0b1/lanscape/resources/ports/test_port_list_scan.json

@@ -0,0 +1,4 @@
+{
+  "443": "https",
+  "80": "http"
+}

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/app.py

@@ -51,6 +51,18 @@ app.jinja_env.filters['is_substring_in_values'] = is_substring_in_values
 ################################
 
 
+def get_runtime_args_safe():
+    """
+    Safely get runtime args, returning empty dict if parsing fails.
+    This prevents conflicts when the module is imported during testing.
+    """
+    try:
+        return vars(parse_args())
+    except SystemExit:
+        # This happens when pytest tries to import the module
+        return {}
+
+
 def set_global_safe(key: str, value):
     """ Safely set global vars without worrying about an exception """
     app_globals = app.jinja_env.globals
@@ -73,7 +85,7 @@ def set_global_safe(key: str, value):
 set_global_safe('app_version', get_installed_version)
 set_global_safe('update_available', is_update_available)
 set_global_safe('latest_version', lookup_latest_version)
-set_global_safe('runtime_args', vars(parse_args()))
+set_global_safe('runtime_args', get_runtime_args_safe)
 set_global_safe('is_local', is_local_run)
 set_global_safe('is_arp_supported', is_arp_supported)
 
@@ -122,4 +134,3 @@ def start_webserver(args: RuntimeArgs) -> int:
         'use_reloader': args.reloader
     }
     app.run(**run_args)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/__init__.py

@@ -8,4 +8,3 @@ from lanscape.core.subnet_scan import ScanManager
 scan_manager = ScanManager()
 
 log = logging.getLogger('Blueprints')
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/api/__init__.py

@@ -3,4 +3,3 @@
 from flask import Blueprint
 
 api_bp = Blueprint('api', __name__)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/api/port.py

@@ -77,4 +77,3 @@ def delete_port_list(port_list):
         JSON response indicating success or failure
     """
     return jsonify(PortManager().delete_port_list(port_list))
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/api/scan.py

@@ -121,4 +121,3 @@ def get_scan_config():
     """
     data = request.get_json()
     return ScanConfig.from_dict(data)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/api/tools.py

@@ -69,4 +69,3 @@ def get_default_configs():
         configs[key] = config_dict
 
     return jsonify(configs)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/web/__init__.py

@@ -5,4 +5,3 @@ Blueprint for web-related routes and views.
 from flask import Blueprint
 
 web_bp = Blueprint('web', __name__)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/blueprints/web/routes.py

@@ -150,4 +150,3 @@ def app_info():
         Rendered info template
     """
     return render_template('info.html')
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/main.py

@@ -136,4 +136,3 @@ def terminate():
 
 if __name__ == "__main__":
     main()
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/shutdown_handler.py

@@ -55,4 +55,3 @@ class FlaskShutdownHandler:
         """Exits the application if a shutdown request has been made."""
         if self._exiting:
             os._exit(0)
-

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape/ui/templates/scan/config.html

@@ -56,7 +56,7 @@
                                         data-bs-toggle="tooltip"
                                         data-bs-placement="top"
                                         title="ARP lookup is not supported on this system, click for more info"
-                                        onclick="window.open('https://github.com/mdennis281/LANscape/blob/main/support/arp-issues.md', '_blank')"
+                                        onclick="window.open('https://github.com/mdennis281/LANscape/blob/main/docs/arp-issues.md', '_blank')"
                                     >
                                         help
                                     </span>

{lanscape-2.0.0a1 → lanscape-2.0.0b1/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.0.0a1
+Version: 2.0.0b1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,6 +25,9 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: pytest-cov>=5.0; extra == "dev"
 Dynamic: license-file
 
 # LANscape
@@ -85,7 +88,7 @@ I use a combination of ARP, ICMP & port testing to determine if a device is onli
 Recommendations:
 
   - Adjust scan configuration
-  - Configure ARP lookup [ARP lookup setup](./support/arp-issues.md)
+  - Configure ARP lookup [ARP lookup setup](./docs/arp-issues.md)
   - Create a bug
 
 

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ lanscape/resources/ports/full.json
 lanscape/resources/ports/large.json
 lanscape/resources/ports/medium.json
 lanscape/resources/ports/small.json
+lanscape/resources/ports/test_port_list_scan.json
 lanscape/resources/services/definitions.jsonc
 lanscape/ui/__init__.py
 lanscape/ui/app.py

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/lanscape.egg-info/requires.txt

@@ -6,3 +6,7 @@ scapy<3.0,>=2.3.2
 tabulate==0.9.0
 pydantic
 icmplib
+
+[dev]
+pytest>=8.0
+pytest-cov>=5.0

{lanscape-2.0.0a1 → lanscape-2.0.0b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "2.0.0a1"
+version = "2.0.0b1"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]
@@ -29,6 +29,12 @@ dependencies = [
     "pydantic",
     "icmplib"
 ]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0",
+    "pytest-cov>=5.0"
+]
 [project.urls]
 Homepage = "https://github.com/mdennis281/py-lanscape"
 Issues = "https://github.com/mdennis281/py-lanscape/issues"