lanscape 2.0.0a2__py3-none-any.whl → 2.0.1a1__py3-none-any.whl

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

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.

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,22 +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/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.0a2.dist-info → lanscape-2.0.1a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.0.0a2
+Version: 2.0.1a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -88,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.0a2.dist-info → lanscape-2.0.1a1.dist-info}/RECORD

@@ -3,16 +3,16 @@ lanscape/__main__.py,sha256=PuY42yuCLAwHrOREJ6u2DgVyGX5hZKRQeoE9pajkNfM,170
 lanscape/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lanscape/core/app_scope.py,sha256=qfzX8Ed4bFdxHMGjgnLlWuLZDTCBKObermz91KbGVn0,3298
 lanscape/core/decorators.py,sha256=CZbPEfnLS1OF-uejQweetadzqf0pVo736jKko4Xs-g4,7264
-lanscape/core/device_alive.py,sha256=YUppwI_SwCRlOz1zVs_GiyBbFD1srIIomIpclrFETAw,6836
+lanscape/core/device_alive.py,sha256=TC6c5uR-2xwT8IXcRA3NAPJ9iPhdVx9a42bGSKq9N6w,6833
 lanscape/core/errors.py,sha256=QTf42UzR9Zxj1t1mdwfLvZIp0c9a5EItELOdCR7kTmE,1322
-lanscape/core/ip_parser.py,sha256=yCHAe7d8YIEw0yC8GEHyLTXFTD9l4pYnMWllkNsDDi4,4196
+lanscape/core/ip_parser.py,sha256=kn5H4ERitLnreRAqifWphwbxdjItGqwu50lsMCPDMcA,3474
 lanscape/core/logger.py,sha256=nzo6J8UdlMdhRkOJEDOIHKztoE3Du8PQZad7ixvNgeM,2534
 lanscape/core/mac_lookup.py,sha256=PxBSMe3wEVDtivCsh5NclSAguZz9rqdAS7QshBiuWvM,3519
 lanscape/core/net_tools.py,sha256=W-yyQ05k6BJc8VOnOi9_hpVD2G8i5HuQ_A39O8qk30Y,19676
 lanscape/core/port_manager.py,sha256=3_ROOb6JEiB0NByZVtADuGcldFkgZwn1RKtvwgs9AIk,4479
 lanscape/core/runtime_args.py,sha256=2vIqRrcWr-NHRSBlZGrxh1PdkPY0ytkPguu8KZqy2L8,2543
 lanscape/core/scan_config.py,sha256=A2ZKXqXKW9nrP6yLb7b9b3XqSY_cQB3LZ5K0LVCSebE,11114
-lanscape/core/service_scan.py,sha256=kkJUcAc326kOCVou0TPKCHlh32awioYw6jiaGHix31E,6948
+lanscape/core/service_scan.py,sha256=wTDxOdazOsbI0hwCBR__4UCmB2RIbl2pw3F2YUW9aaE,6428
 lanscape/core/subnet_scan.py,sha256=IegcrpzevL2zMf1fuvCqegUGCBXtO3iAI49aCweXmvw,14444
 lanscape/core/version_manager.py,sha256=eGjyKgsv31QO0W26se9pPQ1TwmEN8qn37dHULtoocqc,2841
 lanscape/core/web_browser.py,sha256=23MuGIrBYdGhw6ejj6OWxwReeKIlWhtWukc1dKV_3_0,6736
@@ -62,16 +62,16 @@ lanscape/ui/templates/scan.html,sha256=00QX2_1S_1wGzk42r00LjEkJvoioCLs6JgjOibi6r
 lanscape/ui/templates/shutdown.html,sha256=iXVCq2yl5TjZfNFl4esbDJra3gJA2VQpae0jj4ipy9w,701
 lanscape/ui/templates/core/head.html,sha256=eZiebt24xYd_NALe-fFL25rb4uFjUrF4XJjxFH61MgM,779
 lanscape/ui/templates/core/scripts.html,sha256=rSRi4Ut8iejajMPhOc5bzEz-Z3EHxpj_3PxwwyyhmTQ,640
-lanscape/ui/templates/scan/config.html,sha256=ec7EptfdgssKhHDSp_c06xYq7Deyhdu6a5XadLHw58I,14607
+lanscape/ui/templates/scan/config.html,sha256=nmk7Vn-9sXrTDJxSSR7JbCUJEVVadXSMji7LJv2tzKQ,14604
 lanscape/ui/templates/scan/device-detail.html,sha256=Yo4t4S5tkOboMQ3b0y-dHlTJIp6_Zb--9iopyQjNMSc,4825
 lanscape/ui/templates/scan/export.html,sha256=Nvs_unojzT3qhN_ZnEgYHou2C9wqWGr3dVr2UiLnYjY,749
 lanscape/ui/templates/scan/ip-table-row.html,sha256=nO5ZMhl3Gnlc8lg5nWmE05_6_5oz9ZfVCDUOgegVGpg,1267
 lanscape/ui/templates/scan/ip-table.html,sha256=AT2ZvCPYdKl-XJiAkEAawPOVuQw-w0MXumGQTr3zyKM,926
 lanscape/ui/templates/scan/overview.html,sha256=xWj9jWDPg2KcPLvS8fnSins23_UXjKCdb2NJwNG2U2Q,1176
 lanscape/ui/templates/scan/scan-error.html,sha256=wmAYQ13IJHUoO8fAGNDjMvNml7tu4rsIU3Vav71ETlA,999
-lanscape-2.0.0a2.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
-lanscape-2.0.0a2.dist-info/METADATA,sha256=ArqLYoFvGuLx6lx-ODdqxcxkmW83XfqvQJGGFBmpgDY,3489
-lanscape-2.0.0a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-2.0.0a2.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
-lanscape-2.0.0a2.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-2.0.0a2.dist-info/RECORD,,
+lanscape-2.0.1a1.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
+lanscape-2.0.1a1.dist-info/METADATA,sha256=9knsdho7VVTkyArjKZitij6-qb0VBGSMGAV7_ktveI8,3486
+lanscape-2.0.1a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-2.0.1a1.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
+lanscape-2.0.1a1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-2.0.1a1.dist-info/RECORD,,