lanscape 1.2.6a10__tar.gz → 1.2.7a1__tar.gz

lanscape-1.2.7a1/MANIFEST.in

@@ -0,0 +1,3 @@
+recursive-include src/lanscape/resources *.json
+recursive-include src/lanscape/ui/templates *.html
+recursive-include src/lanscape/ui/static *

{lanscape-1.2.6a10/src/lanscape.egg-info → lanscape-1.2.7a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.6a10
+Version: 1.2.7a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape

{lanscape-1.2.6a10 → lanscape-1.2.7a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.2.6a10"
+version = "1.2.7a1"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]
@@ -25,7 +25,3 @@ dependencies = [
 [project.urls]
 Homepage = "https://github.com/mdennis281/py-lanscape"
 Issues = "https://github.com/mdennis281/py-lanscape/issues"
-[tool.hatch.build]
-include = [
-  "src/lanscape/resources/**/*.json"
-]

{lanscape-1.2.6a10 → lanscape-1.2.7a1}/src/lanscape/libraries/mac_lookup.py

@@ -1,5 +1,6 @@
 import re
 import json
+import logging
 import platform
 import subprocess
 from typing import Optional
@@ -8,6 +9,8 @@ from .app_scope import ResourceManager
 
 DB = json.loads(ResourceManager('mac_addresses').get('mac_db.json'))
 
+log = logging.getLogger('MacLookup')
+
 
 def lookup_mac(mac: str) -> str:
     """
@@ -22,8 +25,11 @@ def lookup_mac(mac: str) -> str:
 def get_mac(ip: str) -> Optional[str]:
     """Try to get the MAC address using Scapy, fallback to ARP if it fails."""
     if mac := get_mac_by_scapy(ip):
+        log.debug(f"Used Scapy to resolve ip {ip} to mac {mac}")
         return mac
-    return get_mac_by_arp(ip)
+    arp = get_mac_by_arp(ip)
+    log.debug(f"Used ARP to resolve ip {ip} to mac {arp}")
+    return arp
 
 def get_mac_by_arp(ip: str) -> Optional[str]:
     """Retrieve the last MAC address instance using the ARP command."""