Compare commits
2 Commits
6a3e3e8448
...
2973178cb8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2973178cb8 | ||
|
|
827830b043 |
@@ -1,6 +1,6 @@
|
||||
gps:
|
||||
latitude: 50.858495376473314
|
||||
longitude: 4.397614016072339
|
||||
latitude: 50.85846541332012
|
||||
longitude: 4.397570348817993
|
||||
web:
|
||||
host: 0.0.0.0
|
||||
port: 5000
|
||||
|
||||
@@ -1025,9 +1025,24 @@ class DeviceDatabase:
|
||||
if cursor.rowcount > 0:
|
||||
updated_count += 1
|
||||
else:
|
||||
# Device doesn't exist locally - we can only sync metadata for
|
||||
# devices we've seen, so skip unknown devices
|
||||
pass
|
||||
# Device doesn't exist locally - create it if it has useful metadata
|
||||
if dev.get("assigned_floor") is not None or dev.get("custom_label") or dev.get("is_favorite"):
|
||||
device_type = dev.get("device_type", "bluetooth")
|
||||
name = dev.get("name") or dev.get("ssid") or device_id
|
||||
now = datetime.now().isoformat()
|
||||
|
||||
cursor.execute("""
|
||||
INSERT INTO devices (device_id, device_type, name, ssid, manufacturer,
|
||||
custom_label, assigned_floor, is_favorite, notes,
|
||||
first_seen, last_seen, total_observations, updated_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?)
|
||||
""", (
|
||||
device_id, device_type, name, dev.get("ssid"), dev.get("manufacturer"),
|
||||
dev.get("custom_label"), dev.get("assigned_floor"),
|
||||
1 if dev.get("is_favorite") else 0, dev.get("notes"),
|
||||
now, now, dev.get("updated_at", now)
|
||||
))
|
||||
updated_count += 1
|
||||
|
||||
conn.commit()
|
||||
return updated_count
|
||||
|
||||
@@ -1389,12 +1389,14 @@ def create_app(config: Config | None = None) -> Flask:
|
||||
peer_id = peer["scanner_id"]
|
||||
peer_url = peer["url"]
|
||||
try:
|
||||
updated = peer_sync.sync_devices_from_peer(peer_url)
|
||||
peer_sync.push_devices_to_peer(peer_url)
|
||||
pulled = peer_sync.sync_devices_from_peer(peer_url)
|
||||
push_result = peer_sync.push_devices_to_peer(peer_url)
|
||||
pushed = push_result.get("updated", 0) if push_result else 0
|
||||
results.append({
|
||||
"peer_id": peer_id,
|
||||
"status": "success",
|
||||
"devices_updated": updated
|
||||
"devices_pulled": pulled,
|
||||
"devices_pushed": pushed
|
||||
})
|
||||
except Exception as e:
|
||||
results.append({
|
||||
|
||||
Reference in New Issue
Block a user