bugfix
This commit is contained in:
parent
03853a8ac0
commit
f7417f0939
13
nodedb.py
13
nodedb.py
|
@ -190,9 +190,13 @@ class NodeDB:
|
|||
|
||||
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]
|
||||
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:
|
||||
node = self.maybe_node_by_mac((pair[0], ))
|
||||
except:
|
||||
|
@ -200,8 +204,9 @@ class NodeDB:
|
|||
node.add_mac(pair[0])
|
||||
self._nodes.append(node)
|
||||
|
||||
if pair[2]:
|
||||
node.name = pair[2]
|
||||
if '2' in pair:
|
||||
if pair[2]:
|
||||
node.name = pair[2]
|
||||
|
||||
node.gps = pair[1]
|
||||
|
||||
|
|
Loading…
Reference in a new issue