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

Merge pull request #573 from A-UNDERSCORE-D/fix/477-inara-cargo-slow-update

Browse Source 
Fixed updating inara cargo only on major events
This commit is contained in:
Athanasius 2020-07-11 20:04:17 +01:00 committed by GitHub
commit c78d9241df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/inara.py
View File

@ -50,6 +50,9 @@ this.loadout = None
this.fleet = None this.fleet = None
this.shipswap = False # just swapped ship this.shipswap = False # just swapped ship
this.last_update_time = time.time() # last time we updated (set to now because we're going to update quickly)
FLOOD_LIMIT_SECONDS = 45 # minimum time between sending non-major cargo triggered messages
# Main window clicks # Main window clicks
this.system_link = None this.system_link = None
@ -404,12 +407,16 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
if config.get('station_provider') == 'Inara': if config.get('station_provider') == 'Inara':
this.station_link['url'] = this.station or this.system this.station_link['url'] = this.station or this.system
cargo = [OrderedDict([('itemName', k), ('itemCount', state['Cargo'][k])]) for k in sorted(state['Cargo'])]
# if our cargo differers from last we checked, we're at a station,
# and our flood limit isnt covered, queue an update
should_poll = this.cargo != cargo and time.time() - this.last_update_time > FLOOD_LIMIT_SECONDS
# Send event(s) to Inara # Send event(s) to Inara
if entry['event'] == 'ShutDown' or len(this.events) > old_events: if entry['event'] == 'ShutDown' or len(this.events) > old_events or should_poll:
# Send cargo and materials if changed # Send cargo and materials if changed
cargo = [ OrderedDict([('itemName', k), ('itemCount', state['Cargo'][k])]) for k in sorted(state['Cargo']) ]
if this.cargo != cargo: if this.cargo != cargo:
add_event('setCommanderInventoryCargo', entry['timestamp'], cargo) add_event('setCommanderInventoryCargo', entry['timestamp'], cargo)
this.cargo = cargo this.cargo = cargo
@ -803,6 +810,8 @@ def call(callback=None):
if not this.events: if not this.events:
return return
this.last_update_time = time.time()
data = OrderedDict([ data = OrderedDict([
('header', OrderedDict([ ('header', OrderedDict([
('appName', applongname), ('appName', applongname),