meshcore-dev/meshcore-cli
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore-cli.git synced 2026-04-20 22:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

bug in time format

Browse source
This commit is contained in:
Florent 2025-12-06 13:50:32 +01:00
parent 6b8724a1e1
commit 7b0631bc4b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project] [project]
name = "meshcore-cli" name = "meshcore-cli"
version = "1.3.8" version = "1.3.9"
authors = [ authors = [
{ name="Florent de Lamotte", email="florent@frizoncorrea.fr" }, { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
] ]

10
src/meshcore_cli/meshcore_cli.py
View file

@ -32,7 +32,7 @@ import re
from meshcore import MeshCore, EventType, logger from meshcore import MeshCore, EventType, logger
# Version # Version
VERSION = "v1.3.8" VERSION = "v1.3.9"
# default ble address is stored in a config file # default ble address is stored in a config file
MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/" MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@ -136,9 +136,9 @@ async def process_event_message(mc, ev, json_output, end="\n", above=False):
ts = data["sender_timestamp"] ts = data["sender_timestamp"]
if process_event_message.timestamp == "on": if process_event_message.timestamp == "on":
if (abs(time.time()-ts) < 86400): if (abs(time.time()-ts) < 86400):
fmt = "%H:%S" fmt = "%H:%M"
else: else:
fmt = "%y-%m-%d %H:%S" fmt = "%y-%m-%d %H:%M"
else: else:
fmt = process_event_message.timestamp fmt = process_event_message.timestamp
path_str += f'{datetime.datetime.fromtimestamp(ts).strftime(fmt)},' path_str += f'{datetime.datetime.fromtimestamp(ts).strftime(fmt)},'
@ -339,9 +339,9 @@ async def handle_log_rx(event):
ts = adv_timestamp ts = adv_timestamp
if process_event_message.timestamp == "on": if process_event_message.timestamp == "on":
if (abs(time.time()-ts) < 86400): if (abs(time.time()-ts) < 86400):
fmt = "%H:%S" fmt = "%H:%M"
else: else:
fmt = "%y-%m-%d %H:%S" fmt = "%y-%m-%d %H:%M"
else: else:
fmt = process_event_message.timestamp fmt = process_event_message.timestamp
ts_str = f' at {datetime.datetime.fromtimestamp(ts).strftime(fmt)}' ts_str = f' at {datetime.datetime.fromtimestamp(ts).strftime(fmt)}'