From 8adb27e8d18663278f20119405c6ff7b8b9eea22 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 17 Jun 2025 12:10:47 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?= =?UTF-8?q?=D0=BD=D0=B5=D0=B9=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=B0=20=D0=B2=20=D1=87=D0=B8=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=D1=8B=D0=B9=20=D0=B2=D0=B8=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SRV/services/subnet_service.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/SRV/services/subnet_service.py b/SRV/services/subnet_service.py index b2a008a..858f396 100644 --- a/SRV/services/subnet_service.py +++ b/SRV/services/subnet_service.py @@ -130,7 +130,7 @@ class DeviceStorage: def _clean_old_devices(self, devices: Dict[str, Device]) -> Dict[str, Device]: - now = datetime.now(ZoneInfo("UTC")) + now = datetime.now() filtered = {} for mac, device in devices.items(): if device.status == "offline" and device.last_seen: @@ -189,14 +189,15 @@ class SubnetService: ports: List[int] = None) -> SubnetScanResult: start_time = time.time() devices = [] - now = datetime.now(ZoneInfo("UTC")).isoformat() + now = datetime.now().astimezone() + formatted_now = now.strftime("%d %B %Y, %H:%M") try: saved_devices = self.storage.load_devices() local_device = self._get_local_device(subnet) if local_device: local_device.status = "online" - local_device.last_seen = now + local_device.last_seen = formatted_now devices.append(local_device) if local_device.mac: saved_devices[local_device.mac] = local_device @@ -219,7 +220,7 @@ class SubnetService: open_ports=self.port_scanner.scan(ip) or existing_device.open_ports, status="online", - last_seen=now, + last_seen=formatted_now, note=existing_device.note, ) vendor = self.device_info.get_vendor(mac) @@ -232,7 +233,7 @@ class SubnetService: vendor=vendor, open_ports=open_ports, status="online", - last_seen=now, + last_seen=formatted_now, note=None, ) @@ -265,7 +266,8 @@ class SubnetService: return SubnetScanResult(devices=devices) def _get_local_device(self, subnet: str) -> Optional[Device]: - now = datetime.now(ZoneInfo("UTC")).isoformat() + now = datetime.now().astimezone() + formatted_now = now.strftime("%d %B %Y, %H:%M") try: subnet_network = ipaddress.ip_network(subnet, strict=False) interfaces = netifaces.interfaces() @@ -290,7 +292,7 @@ class SubnetService: vendor=vendor, open_ports=open_ports, status="online", - last_seen=now, + last_seen=formatted_now, note=None, ) logger.warning(