adam/Remote-Terminal-for-MeshCore
1
0
Fork 0
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-08-07 01:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop some duplicated logic and defns

Browse Source
This commit is contained in:
Jack Kingsman
2026-04-03 17:47:44 -07:00
parent e2ddf5f79f
commit 67873e8dd9
8 changed files with 58 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/repository/messages.py
+2 -29
View File
@@ -804,7 +804,7 @@ class MessageRepository:
"""
import time as _time
from app.path_utils import parse_packet_envelope
from app.path_utils import bucket_path_hash_widths
now = int(_time.time())
t_1h = now - 3600
@@ -858,9 +858,6 @@ class MessageRepository:
]
# Path hash width distribution for last 24h (in-Python parse of raw packet envelopes)
single_byte = 0
double_byte = 0
triple_byte = 0
cursor3 = await db.conn.execute(
"""
SELECT rp.data FROM raw_packets rp
@@ -870,31 +867,7 @@ class MessageRepository:
""",
(conversation_key, t_24h),
)
while True:
batch = await cursor3.fetchmany(500)
if not batch:
break
for pkt_row in batch:
envelope = parse_packet_envelope(bytes(pkt_row["data"]))
if envelope is None:
continue
if envelope.hash_size == 1:
single_byte += 1
elif envelope.hash_size == 2:
double_byte += 1
elif envelope.hash_size == 3:
triple_byte += 1
hash_total = single_byte + double_byte + triple_byte
path_hash_width_24h = {
"total_packets": hash_total,
"single_byte": single_byte,
"double_byte": double_byte,
"triple_byte": triple_byte,
"single_byte_pct": (single_byte / hash_total * 100) if hash_total else 0.0,
"double_byte_pct": (double_byte / hash_total * 100) if hash_total else 0.0,
"triple_byte_pct": (triple_byte / hash_total * 100) if hash_total else 0.0,
}
path_hash_width_24h = await bucket_path_hash_widths(cursor3)
return {
"message_counts": message_counts,
app/repository/settings.py
+2 -43
View File
@@ -5,7 +5,7 @@ from typing import Any, Literal
from app.database import db
from app.models import AppSettings, Favorite
from app.path_utils import parse_packet_envelope
from app.path_utils import bucket_path_hash_widths
logger = logging.getLogger(__name__)
@@ -324,48 +324,7 @@ class StatisticsRepository:
"SELECT data FROM raw_packets WHERE timestamp >= ?",
(now - SECONDS_24H,),
)
single_byte = 0
double_byte = 0
triple_byte = 0
while True:
rows = await cursor.fetchmany(RAW_PACKET_STATS_BATCH_SIZE)
if not rows:
break
for row in rows:
envelope = parse_packet_envelope(bytes(row["data"]))
if envelope is None:
continue
if envelope.hash_size == 1:
single_byte += 1
elif envelope.hash_size == 2:
double_byte += 1
elif envelope.hash_size == 3:
triple_byte += 1
total_packets = single_byte + double_byte + triple_byte
if total_packets == 0:
return {
"total_packets": 0,
"single_byte": 0,
"double_byte": 0,
"triple_byte": 0,
"single_byte_pct": 0.0,
"double_byte_pct": 0.0,
"triple_byte_pct": 0.0,
}
return {
"total_packets": total_packets,
"single_byte": single_byte,
"double_byte": double_byte,
"triple_byte": triple_byte,
"single_byte_pct": (single_byte / total_packets) * 100,
"double_byte_pct": (double_byte / total_packets) * 100,
"triple_byte_pct": (triple_byte / total_packets) * 100,
}
return await bucket_path_hash_widths(cursor, batch_size=RAW_PACKET_STATS_BATCH_SIZE)
@staticmethod
async def get_all() -> dict: