ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-15 08:40:34 +03:00
Code Issues Projects Releases Wiki Activity

Strip *_Localised subkeys from EDDN messages

Browse Source
This commit is contained in:
Jonathan Harris 2018-03-11 17:53:30 +00:00
parent b3f6751a5b
commit 2900ea80a3
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
EDMarketConnector.py
View File

@ -661,9 +661,6 @@ class AppWindow:
# strip out properties disallowed by the schema
for thing in ['CockpitBreach', 'BoostUsed', 'FuelLevel', 'FuelUsed', 'JumpDist', 'Latitude', 'Longitude', 'Wanted']:
entry.pop(thing, None)
for thing in entry.keys():
if thing.endswith('_Localised'):
entry.pop(thing, None)
# add planet to Docked event for planetary stations if known
if entry['event'] == 'Docked' and monitor.planet:
@ -678,7 +675,7 @@ class AppWindow:
if 'SystemAddress' not in entry and monitor.systemaddress:
entry['SystemAddress'] = monitor.systemaddress
self.eddn.export_journal_entry(monitor.cmdr, monitor.is_beta, entry)
self.eddn.export_journal_entry(monitor.cmdr, monitor.is_beta, self.filter_localised(entry))
except requests.exceptions.RequestException as e:
if __debug__: print_exc()
@ -751,6 +748,18 @@ class AppWindow:
self.status['text'] = ''
return coriolis.url(data, monitor.is_beta)
# Recursively filter '*_Localised' keys from dict
def filter_localised(self, d):
filtered = OrderedDict()
for k, v in d.iteritems():
if k.endswith('_Localised'):
pass
elif hasattr(v, 'iteritems'):
filtered[k] = self.filter_localised(v)
else:
filtered[k] = v
return filtered
def cooldown(self):
if time() < self.holdofftime:
self.button['text'] = self.theme_button['text'] = _('cooldown {SS}s').format(SS = int(self.holdofftime - time())) # Update button in main window