thooge
/
ffmap-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

alfred-data
Nils Schneider 2012-06-04 18:55:20 +02:00
parent 03853a8ac0
commit f7417f0939
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nodedb.py
View File

@ -190,9 +190,13 @@ class NodeDB:
macs = [s for s in [s.strip() for s in node['MAC'].split(',')] if s] macs = [s for s in [s.strip() for s in node['MAC'].split(',')] if s]
gps = [s for s in [s.strip() for s in node['GPS'].split(',')] if s] gps = [s for s in [s.strip() for s in node['GPS'].split(',')] if s]
names = [s for s in [s.strip() for s in node['Nick'].split(',')] if s] if 'MAC' in node:
names = [s for s in [s.strip() for s in node['Nick'].split(',')] if s]
zipped = zip(macs, gps, names)
else:
zipped = zip(macs, gps)
for pair in zip(macs, gps, names): for pair in zipped:
try: try:
node = self.maybe_node_by_mac((pair[0], )) node = self.maybe_node_by_mac((pair[0], ))
except: except:
@ -200,8 +204,9 @@ class NodeDB:
node.add_mac(pair[0]) node.add_mac(pair[0])
self._nodes.append(node) self._nodes.append(node)
if pair[2]: if '2' in pair:
node.name = pair[2] if pair[2]:
node.name = pair[2]
node.gps = pair[1] node.gps = pair[1]