ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-02 00:21:05 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1086 from EDCD/enhancement/1083/edsm-backpack

Browse Source 
Fix BackPack event support to actually work.
This commit is contained in:
Athanasius 2021-05-21 11:00:07 +01:00 committed by GitHub
commit bd56948f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PLUGINS.md
View File

@ -599,6 +599,7 @@ Content of `state` (updated to the current journal entry):
| `Consumable` | `dict` | 'Consumable' MicroResources in Odyssey, `int` count each. | | `Consumable` | `dict` | 'Consumable' MicroResources in Odyssey, `int` count each. |
| `Data` | `dict` | 'Data' MicroResources in Odyssey, `int` count each. | | `Data` | `dict` | 'Data' MicroResources in Odyssey, `int` count each. |
| `BackPack` | `dict` | `dict` of Odyssey MicroResources in backpack. | | `BackPack` | `dict` | `dict` of Odyssey MicroResources in backpack. |
| `BackpackJSON` | `dict` | Content of Backpack.json as of last read. |
| `SuitCurrent` | `dict` | CAPI-returned data of currently worn suit. NB: May be `None` if no data. | | `SuitCurrent` | `dict` | CAPI-returned data of currently worn suit. NB: May be `None` if no data. |
| `Suits` | `dict`[1] | CAPI-returned data of owned suits. NB: May be `None` if no data. | | `Suits` | `dict`[1] | CAPI-returned data of owned suits. NB: May be `None` if no data. |
| `SuitLoadoutCurrent` | `dict` | CAPI-returned data of current Suit Loadout. NB: May be `None` if no data. | | `SuitLoadoutCurrent` | `dict` | CAPI-returned data of current Suit Loadout. NB: May be `None` if no data. |

9
monitor.py
View File

@ -151,6 +151,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
'Item': defaultdict(int), # BackPack Items 'Item': defaultdict(int), # BackPack Items
'Data': defaultdict(int), # Backpack Data 'Data': defaultdict(int), # Backpack Data
}, },
'BackpackJSON': None, # Raw JSON from `Backpack.json` file, if available
'SuitCurrent': None, 'SuitCurrent': None,
'Suits': {}, 'Suits': {},
'SuitLoadoutCurrent': None, 'SuitLoadoutCurrent': None,
@ -866,17 +867,21 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
{self.canonicalise(x['Name']): x['Count'] for x in clean_data} {self.canonicalise(x['Name']): x['Count'] for x in clean_data}
) )
elif event_type == 'Backpack': elif event_type == 'BackPack':
# TODO: v31 doc says this is`backpack.json` ... but Howard Chalkley # TODO: v31 doc says this is`backpack.json` ... but Howard Chalkley
# said it's `Backpack.json` # said it's `Backpack.json`
with open(join(self.currentdir, 'Backpack.json'), 'rb') as backpack: # type: ignore with open(join(self.currentdir, 'Backpack.json'), 'rb') as backpack: # type: ignore
try: try:
entry = json.load(backpack) # Preserve property order because why not?
entry = json.load(backpack, object_pairs_hook=OrderedDict)
except json.JSONDecodeError: except json.JSONDecodeError:
logger.exception('Failed decoding Backpack.json', exc_info=True) logger.exception('Failed decoding Backpack.json', exc_info=True)
else: else:
# Store in monitor.state
self.state['BackpackJSON'] = entry
# Assume this reflects the current state when written # Assume this reflects the current state when written
self.state['BackPack']['Component'] = defaultdict(int) self.state['BackPack']['Component'] = defaultdict(int)
self.state['BackPack']['Consumable'] = defaultdict(int) self.state['BackPack']['Consumable'] = defaultdict(int)

5
plugins/edsm.py
View File

@ -432,6 +432,11 @@ def journal_entry(
elif entry['event'] == 'NavBeaconScan': elif entry['event'] == 'NavBeaconScan':
this.navbeaconscan = entry['NumBodies'] this.navbeaconscan = entry['NumBodies']
elif entry['event'] == 'BackPack':
# Use the stored file contents, not the empty journal event
if state['BackpackJSON']:
entry = state['BackpackJSON']
# Send interesting events to EDSM # Send interesting events to EDSM
if ( if (
config.get_int('edsm_out') and not is_beta and not this.multicrew and credentials(cmdr) and config.get_int('edsm_out') and not is_beta and not this.multicrew and credentials(cmdr) and