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

Add support for BacKPackMaterials event

Browse Source 
It's unclear from my Journals if this is adding to the current or is the
total state at the time.  I think it's the latter, despite not finding
where a '737844537' had come from (looks like from a mission, but that
would be reward and should have gone straight to ShipLocker?).
This commit is contained in:
Athanasius 2021-04-05 11:02:30 +01:00
parent 7040975bd2
commit 28c4fa03b1
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
monitor.py
View File

@ -139,9 +139,14 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
'CargoJSON': None, # The raw data from the last time cargo.json was read
'Route': None, # Last plotted route from Route.json file
'OnFoot': False, # Whether we think you're on-foot
'Component': defaultdict(int), # Odyssey Components in Ship Locker
'Items': defaultdict(int), # Odyssey Items in Ship Locker
'Consumables': defaultdict(int), # Odyssey Consumables in Ship Locker
'Component': defaultdict(int), # Odyssey Components in Ship Locker
'Item': defaultdict(int), # Odyssey Items in Ship Locker
'Consumable': defaultdict(int), # Odyssey Consumables in Ship Locker
'BackPack': { # Odyssey BackPack contents
'Component': defaultdict(int), # BackPack Components
'Consumable': defaultdict(int), # BackPack Consumables
'Item': defaultdict(int), # BackPack Items
},
}
def start(self, root: 'tkinter.Tk') -> bool: # noqa: CCR001
@ -714,13 +719,40 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['Item'] = defaultdict(int)
clean_components = self.coalesce_cargo(entry['Components'])
self.state['Component'].update({self.canonicalise(x['Name']): x['Count'] for x in clean_components})
self.state['Component'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_components}
)
clean_consumables = self.coalesce_cargo(entry['Consumables'])
self.state['Consumable'].update({self.canonicalise(x['Name']): x['Count'] for x in clean_consumables})
self.state['Consumable'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_consumables}
)
clean_items = self.coalesce_cargo(entry['Items'])
self.state['Item'].update({self.canonicalise(x['Name']): x['Count'] for x in clean_items})
self.state['Item'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_items}
)
elif event_type == 'BackPackMaterials':
# Assume this reflects the current state when written
self.state['BackPack']['Component'] = defaultdict(int)
self.state['BackPack']['Consumable'] = defaultdict(int)
self.state['BackPack']['Item'] = defaultdict(int)
clean_components = self.coalesce_cargo(entry['Components'])
self.state['BackPack']['Component'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_components}
)
clean_consumables = self.coalesce_cargo(entry['Consumables'])
self.state['BackPack']['Consumable'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_consumables}
)
clean_items = self.coalesce_cargo(entry['Items'])
self.state['BackPack']['Item'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_items}
)
elif event_type == 'NavRoute':
# Added in ED 3.7 - multi-hop route details in NavRoute.json