From 323b414e19a0b930515019637f1eceeca3c20b29 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Thu, 14 Sep 2017 18:08:12 +0100 Subject: [PATCH] Stop sending EDDN blackmarket messages --- EDMarketConnector.py | 17 ----------------- eddn.py | 6 ------ 2 files changed, 23 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 89f5bbd8..31d6d9f3 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -679,23 +679,6 @@ class AppWindow: self.eddn.export_journal_entry(monitor.cmdr, monitor.is_beta, entry) - elif (config.getint('output') & config.OUT_MKT_EDDN and monitor.cmdr and - entry['event'] == 'MarketSell' and entry.get('BlackMarket')): - # Construct blackmarket message - msg = OrderedDict([ - ('systemName', monitor.system), - ('stationName', monitor.station), - ('timestamp', entry['timestamp']), - ('name', entry['Type']), - ('sellPrice', entry['SellPrice']), - ('prohibited' , entry.get('IllegalGoods', False)), - ]) - - self.status['text'] = _('Sending data to EDDN...') - self.w.update_idletasks() - self.eddn.export_blackmarket(monitor.cmdr, monitor.is_beta, msg) - self.status['text'] = '' - except requests.exceptions.RequestException as e: if __debug__: print_exc() self.status['text'] = _("Error: Can't connect to EDDN") diff --git a/eddn.py b/eddn.py index 9b4f308c..516bc80b 100644 --- a/eddn.py +++ b/eddn.py @@ -228,9 +228,3 @@ class EDDN: self.parent.w.update_idletasks() self.send(cmdr, msg) self.parent.status['text'] = '' - - def export_blackmarket(self, cmdr, is_beta, msg): - self.send(cmdr, { - '$schemaRef' : 'https://eddn.edcd.io/schemas/blackmarket/1' + (is_beta and '/test' or ''), - 'message' : msg - })