diff --git a/EDMarketConnector.py b/EDMarketConnector.py index e5fcdd91..1931b912 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -414,12 +414,6 @@ class AppWindow: if not monitor.cmdr or not monitor.mode or monitor.state['Captain'] or not monitor.system: return # In CQC or on crew - do nothing - if auto_update and monitor.carrying_rares(): - # https://github.com/Marginal/EDMarketConnector/issues/92 - self.status['text'] = _("Didn't update: Carrying Rares") # Status text displayed when auto-update is suppressed - https://github.com/Marginal/EDMarketConnector/issues/92 - hotkeymgr.play_bad() - return - if not retrying: if time() < self.holdofftime: # Was invoked by key while in cooldown self.status['text'] = '' diff --git a/L10n/en.template b/L10n/en.template index d7eba486..f9d1c552 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -112,9 +112,6 @@ /* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [prefs.py] */ "Delay sending until docked" = "Delay sending until docked"; -/* Status text displayed when auto-update is suppressed - https://github.com/Marginal/EDMarketConnector/issues/92. [EDMarketConnector.py] */ -"Didn't update: Carrying Rares" = "Didn't update: Carrying Rares"; - /* List of plugins in settings. [prefs.py] */ "Disabled Plugins" = "Disabled Plugins"; diff --git a/README.md b/README.md index 61d56aa6..e9a6d754 100644 --- a/README.md +++ b/README.md @@ -131,13 +131,6 @@ The Frontier server that supplies the data to this app sometimes fails to supply This problem is tracked as [Issue #86](https://github.com/Marginal/EDMarketConnector/issues/86). -### Didn't update: Carrying Rares -Due to a bug in the server that supplies the data to this app, profit on any Rare cargo in your hold may be wiped out when you visit the in-game Commodity Market after having “Updated”. - -This app will not auto-update when you dock if you're carrying Rares. Visit the in-game Commodity Market at a station where you intend to sell Rares **before** hitting “Update”. - -This problem is tracked as [Issue #92](https://github.com/Marginal/EDMarketConnector/issues/92). - ### Doesn't auto-update and/or persistently gives “Server is lagging” error This app uses Elite: Dangerous' log files to track the systems and stations that you visit. If you're running this app on a different machine from the Elite: Dangerous game, or if you find that this app isn't automatically tracking the systems that you visit and/or isn't automatically “updating” on docking (if you have that option selected), then adjust the “E:D journal file location” and “E:D interaction log location” settings on the Configuration tab to point to the game's log files. diff --git a/monitor.py b/monitor.py index 5d593062..a0d61496 100644 --- a/monitor.py +++ b/monitor.py @@ -71,36 +71,6 @@ class EDLogs(FileSystemEventHandler): _POLL = 1 # Polling is cheap, so do it often _RE_CANONICALISE = re.compile('\$(.+)_name;') - # Mostly taken from http://elite-dangerous.wikia.com/wiki/List_of_Rare_Commodities - RARES = set([ - 'cetiaepyornisegg', 'aganipperush', 'alacarakmoskinart', 'albinoquechuamammoth', 'altairianskin', 'alyabodilysoap', - 'anduligafireworks', 'anynacoffee', 'aroucaconventualsweets', 'azcancriformula42', 'bluemilk', - 'baltahsinevacuumkrill', 'bakedgreebles', 'bankiamphibiousleather', 'bastsnakegin', 'belalansrayleather', - 'borasetanipathogenetics', 'burnhambiledistillate', 'cd75catcoffee', 'centaurimegagin', 'ceremonialheiketea', - 'cetirabbits', 'chameleoncloth', 'chateaudeaegaeon', 'cherbonesbloodcrystals', 'chieridanimarinepaste', - 'coquimspongiformvictuals', 'cromsilverfesh', 'crystallinespheres', 'damnacarapaces', 'deltaphoenicispalms', - 'deuringastruffles', 'disomacorn', 'aerialedenapple', 'eleuthermals', 'eraninpearlwhisky', 'eshuumbrellas', - 'esusekucaviar', 'ethgrezeteabuds', 'fujintea', 'galactictravelguide', 'geawendancedust', 'gerasiangueuzebeer', - 'giantirukamasnails', 'giantverrix', 'gilyasignatureweapons', 'gomanyauponcoffee', 'haidneblackbrew', - 'havasupaidreamcatcher', 'helvetitjpearls', 'hip10175bushmeat', 'hip118311swarm', 'hiporganophosphates', - 'hip41181squid', 'holvaduellingblades', 'honestypills', 'hr7221wheat', 'indibourbon', 'jaquesquinentianstill', - 'jaradharrepuzzlebox', 'jarouarice', 'jotunmookah', 'kachiriginleaches', 'kamitracigars', 'kamorinhistoricweapons', - 'karetiicouture', 'karsukilocusts', 'kinagoinstruments', 'konggaale', 'korrokungpellets', 'lavianbrandy', - 'alieneggs', 'leestianeviljuice', 'livehecateseaworms', 'ltthypersweet', 'lyraeweed', 'transgeniconionhead', - 'masterchefs', 'mechucoshightea', 'medbstarlube', 'mokojingbeastfeast', 'momusbogspaniel', 'motronaexperiencejelly', - 'mukusubiichitinos', 'mulachigiantfungus', 'neritusberries', 'ngadandarifireopals', 'ngunamodernantiques', - 'njangarisaddles', 'noneuclidianexotanks', 'ochoengchillies', 'onionhead', 'onionheada', 'onionheadb', 'onionheadc', - 'onionheadd', 'onionheade', 'onionheadderivatives', 'onionheadsamples', 'ophiuchiexinoartefacts', - 'orrerianviciousbrew', 'pantaaprayersticks', 'pavoniseargrubs', 'personalgifts', 'rajukrustoves', - 'rapabaosnakeskins', 'rusanioldsmokey', 'sanumameat', 'saxonwine', 'shanscharisorchid', 'soontillrelics', - 'sothiscrystallinegold', 'tanmarktranquiltea', 'tarachtorspice', 'taurichimes', 'terramaterbloodbores', - 'thehuttonmug', 'thrutiscream', 'tiegfriessynthsilk', 'tiolcewaste2pasteunits', 'toxandjivirocide', 'advert1', - 'uszaiantreegrub', 'utgaroarmillenialeggs', 'uzumokulowgwings', 'vherculisbodyrub', 'vacuumkrill', - 'vanayequirhinofur', 'vegaslimweed', 'vidavantianlace', 'lftvoidextractcoffee', 'voidworms', 'volkhabbeedrones', - 'watersofshintara', 'wheemetewheatcakes', 'witchhaulkobebeef', 'wolf1301fesh', 'wulpahyperboresystems', - 'wuthielokufroth', 'xihecompanions', 'yasokondileaf', 'zeesszeantglue', 'buckyballbeermats', - ]) - def __init__(self): FileSystemEventHandler.__init__(self) # futureproofing - not need for current version of watchdog self.root = None @@ -511,12 +481,6 @@ class EDLogs(FileSystemEventHandler): self.event_queue.append('{ "timestamp":"%s", "event":"StartUp" }' % strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())) return entry - def carrying_rares(self): - for commodity in self.state['Cargo']: - if commodity in self.RARES: - return True - return False - def game_running(self): if platform == 'darwin':