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

switched to using config for last update time

Browse Source
This commit is contained in:
A_D 2020-07-23 18:38:55 +02:00
parent 34760683e5
commit 340f8928b3
No known key found for this signature in database
GPG Key ID: 4BE9EB7DF45076C4
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/inara.py
View File

@ -50,7 +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) # last time we updated, if unset in config this is 0, which means an instant update
LAST_UPDATE_CONF_KEY = 'inara_last_update'
# this.last_update_time = config.getint(LAST_UPDATE_CONF_KEY)
FLOOD_LIMIT_SECONDS = 30 # minimum time between sending events FLOOD_LIMIT_SECONDS = 30 # minimum time between sending events
this.timer_run = True this.timer_run = True
@ -442,10 +444,6 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
cargo = [OrderedDict([('itemName', k), ('itemCount', state['Cargo'][k])]) for k in sorted(state['Cargo'])] 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 cargo and materials if changed # Send cargo and materials if changed
if this.cargo != cargo: if this.cargo != cargo:
add_event('setCommanderInventoryCargo', entry['timestamp'], cargo) add_event('setCommanderInventoryCargo', entry['timestamp'], cargo)
@ -861,7 +859,7 @@ def add_event(name, timestamp, data):
def call_timer(wait=FLOOD_LIMIT_SECONDS): def call_timer(wait=FLOOD_LIMIT_SECONDS):
while this.timer_run: while this.timer_run:
time.sleep(wait) time.sleep(wait)
print("INARA: TICK") print(f"INARA: {time.asctime()} TICK")
if this.timer_run: # check again in here just in case we're closing and the stars align if this.timer_run: # check again in here just in case we're closing and the stars align
call() call()
@ -870,11 +868,11 @@ def call(callback=None, force=False):
if not this.events: if not this.events:
return return
if (time.time() - this.last_update_time) <= FLOOD_LIMIT_SECONDS and not force: if (time.time() - config.getint(LAST_UPDATE_CONF_KEY)) <= FLOOD_LIMIT_SECONDS and not force:
return return
this.last_update_time = time.time() config.set(LAST_UPDATE_CONF_KEY, int(time.time()))
print(f"INARA: {time.asctime()}sending {len(this.events)} entries to inara (call)") print(f"INARA: {time.asctime()} sending {len(this.events)} entries to inara (call)")
data = OrderedDict([ data = OrderedDict([
('header', OrderedDict([ ('header', OrderedDict([
('appName', applongname), ('appName', applongname),
@ -897,7 +895,7 @@ def worker():
else: else:
(url, data, callback) = item (url, data, callback) = item
print(f"INARA: {time.asctime()}sending {len(data['events'])} entries to inara (worker)") print(f"INARA: {time.asctime()} sending {len(data['events'])} entries to inara (worker)")
retrying = 0 retrying = 0
while retrying < 3: while retrying < 3: