Mercurial > code > home > repos > homeauto

changeset 427:db031d9ec28e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't use 'connected' for time and for network. add rdf:type. Ignore-this: 59899796d4785300f40137de2c2c44d5
author drewp@bigasterisk.com
date Thu, 04 Apr 2019 02:19:10 -0700
parents bfe555dd0c91
children d6a6076fce6e
files service/wifi/scrape.py service/wifi/wifi.py
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/service/wifi/scrape.py	Thu Apr 04 02:16:22 2019 -0700
+++ b/service/wifi/scrape.py	Thu Apr 04 02:19:10 2019 -0700
@@ -60,7 +60,7 @@
     rows = []
     for row in json.loads(resp.body.split(b'device=', 1)[-1]):
         extra = []
-        extra.append((ROOM['connected'], {
+        extra.append((ROOM['connectedToNetwork'], {
                     'wireless': AST['wifiAccessPoints'],
                     '2.4G': AST['wifiAccessPoints'],
                     '5G':  AST['wifiAccessPoints'],
--- a/service/wifi/wifi.py	Thu Apr 04 02:16:22 2019 -0700
+++ b/service/wifi/wifi.py	Thu Apr 04 02:19:10 2019 -0700
@@ -17,7 +17,7 @@
 from dateutil import tz
 from influxdb import InfluxDBClient
 from pymongo import MongoClient as Connection, DESCENDING
-from rdflib import Namespace, Literal, ConjunctiveGraph
+from rdflib import Namespace, Literal, ConjunctiveGraph, RDF
 from twisted.internet import reactor, task
 from twisted.internet.defer import inlineCallbacks
 import ago
@@ -200,6 +200,7 @@
         for dev in self.lastAddrs:
             if not dev.connected:
                 continue
+            g.add((dev.uri, RDF.type, ROOM['NetworkedDevice'], ctx))
             g.add((dev.uri, ROOM['macAddress'], Literal(dev.mac), ctx))
             g.add((dev.uri, ROOM['ipAddress'], Literal(dev.ip), ctx))