Narcissus/pylibmeshctrl
3
0
Fork 1
mirror of https://github.com/HuFlungDu/pylibmeshctrl.git synced 2026-02-20 05:32:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from DaanSelen/conversion

Browse Source 
Fix #9
This commit is contained in:
Josiah Baldwin
2025-01-08 11:46:15 -08:00
committed by GitHub
parent 0ee2e2dc94 3b4a18b379
commit d9991156f6
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/meshctrl/device.py
View File

@@ -96,7 +96,7 @@ class Device(object):
if not isinstance(created_at, datetime.datetime) and created_at is not None: if not isinstance(created_at, datetime.datetime) and created_at is not None:
try: try:
created_at = datetime.datetime.fromtimestamp(created_at) created_at = datetime.datetime.fromtimestamp(created_at)
except OSError: except (OSError, ValueError):
# Meshcentral returns in miliseconds, while fromtimestamp, and most of python, expects the argument in seconds. Try seconds frist, then translate from ms if it fails. # Meshcentral returns in miliseconds, while fromtimestamp, and most of python, expects the argument in seconds. Try seconds frist, then translate from ms if it fails.
# This doesn't work for really early timestamps, but I don't expect that to be a problem here. # This doesn't work for really early timestamps, but I don't expect that to be a problem here.
created_at = datetime.datetime.fromtimestamp(created_at/1000.0) created_at = datetime.datetime.fromtimestamp(created_at/1000.0)
@@ -106,7 +106,7 @@ class Device(object):
if not isinstance(lastconnect, datetime.datetime) and lastconnect is not None: if not isinstance(lastconnect, datetime.datetime) and lastconnect is not None:
try: try:
lastconnect = datetime.datetime.fromtimestamp(lastconnect) lastconnect = datetime.datetime.fromtimestamp(lastconnect)
except OSError: except (OSError, ValueError):
# Meshcentral returns in miliseconds, while fromtimestamp, and most of python, expects the argument in seconds. Try seconds frist, then translate from ms if it fails. # Meshcentral returns in miliseconds, while fromtimestamp, and most of python, expects the argument in seconds. Try seconds frist, then translate from ms if it fails.
# This doesn't work for really early timestamps, but I don't expect that to be a problem here. # This doesn't work for really early timestamps, but I don't expect that to be a problem here.
lastconnect = datetime.datetime.fromtimestamp(lastconnect/1000.0) lastconnect = datetime.datetime.fromtimestamp(lastconnect/1000.0)

2
src/meshctrl/mesh.py
View File

@@ -46,7 +46,7 @@ class Mesh(object):
if not isinstance(created_at, datetime.datetime) and created_at is not None: if not isinstance(created_at, datetime.datetime) and created_at is not None:
try: try:
created_at = datetime.datetime.fromtimestamp(created_at) created_at = datetime.datetime.fromtimestamp(created_at)
except OSError: except (OSError, ValueError):
# Meshcentral returns in miliseconds, while fromtimestamp, and most of python, expects the argument in seconds. Try seconds frist, then translate from ms if it fails. # Meshcentral returns in miliseconds, while fromtimestamp, and most of python, expects the argument in seconds. Try seconds frist, then translate from ms if it fails.
# This doesn't work for really early timestamps, but I don't expect that to be a problem here. # This doesn't work for really early timestamps, but I don't expect that to be a problem here.
created_at = datetime.datetime.fromtimestamp(created_at/1000.0) created_at = datetime.datetime.fromtimestamp(created_at/1000.0)