ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Remove last traces of 'BPC' output code

Browse Source 
close #576
This commit is contained in:
Athanasius 2020-07-10 10:25:08 +01:00
parent accc361d54
commit 65086be1cd
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
commodity.py
View File

@ -14,24 +14,21 @@ bracketmap = {
3: 'High', 3: 'High',
} }
(COMMODITY_DEFAULT, COMMODITY_BPC, COMMODITY_CSV) = range(3) # DEFAULT means semi-colon separation
# CSV means comma separation
(COMMODITY_DEFAULT, COMMODITY_CSV) = range(2)
def export(data, kind=COMMODITY_DEFAULT, filename=None): def export(data, kind=COMMODITY_DEFAULT, filename=None):
querytime = config.getint('querytime') or int(time.time()) querytime = config.getint('querytime') or int(time.time())
if not filename: if not filename:
kind_str = 'bpc'
if kind != COMMODITY_BPC:
kind_str = 'csv'
filename = '{system}.{starport}.{time}.{kind}'.format( filename = '{system}.{starport}.{time}.{kind}'.format(
system=data['lastSystem']['name'].strip(), system=data['lastSystem']['name'].strip(),
starport=data['lastStarport']['name'].strip(), starport=data['lastStarport']['name'].strip(),
time=time.strftime('%Y-%m-%dT%H.%M.%S', time.localtime(querytime)), time=time.strftime('%Y-%m-%dT%H.%M.%S', time.localtime(querytime)),
kind=kind_str kind='csv'
) )
filename = join(config.get('outdir'), filename) filename = join(config.get('outdir'), filename)
if kind == COMMODITY_CSV: if kind == COMMODITY_CSV:
@ -39,20 +36,6 @@ def export(data, kind=COMMODITY_DEFAULT, filename=None):
header = sep.join(('System', 'Station', 'Commodity', 'Sell', 'Buy', 'Demand', '', 'Supply', '', 'Date', '\n')) header = sep.join(('System', 'Station', 'Commodity', 'Sell', 'Buy', 'Demand', '', 'Supply', '', 'Date', '\n'))
rowheader = sep.join((data['lastSystem']['name'], data['lastStarport']['name'])) rowheader = sep.join((data['lastSystem']['name'], data['lastStarport']['name']))
elif kind == COMMODITY_BPC:
sep = ';'
header = sep.join(
('userID', 'System', 'Station', 'Commodity', 'Sell', 'Buy', 'Demand', '', 'Supply', '', 'Date\n')
)
cmdr = data['commander']['name'].strip()
header_cmdr = cmdr
if sep in cmdr:
header_cmdr = f'"{cmdr}"'
rowheader = sep.join((header_cmdr, data['lastSystem']['name'], data['lastStarport']['name']))
else: else:
sep = ',' sep = ','
header = sep.join( header = sep.join(