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

FDevIDs: Switch code to using FDevIDs/ files

Browse Source
This commit is contained in:
Athanasius 2021-12-17 11:08:14 +00:00
parent 096b41fa84
commit bcabd97f4c
No known key found for this signature in database
GPG Key ID: AE3E527847057C7D
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collate.py
View File

@ -4,6 +4,7 @@
import csv import csv
import json import json
import os import os
import pathlib
import sys import sys
from os.path import isfile from os.path import isfile
from traceback import print_exc from traceback import print_exc
@ -38,7 +39,7 @@ def addcommodities(data) -> None: # noqa: CCR001
if not data['lastStarport'].get('commodities'): if not data['lastStarport'].get('commodities'):
return return
commodityfile = 'commodity.csv' commodityfile = pathlib.Path('FDevIDs/commodity.csv')
commodities = {} commodities = {}
# slurp existing # slurp existing

3
companion.py
View File

@ -22,7 +22,6 @@ import urllib.parse
import webbrowser import webbrowser
from builtins import object, range, str from builtins import object, range, str
from email.utils import parsedate from email.utils import parsedate
from os.path import join
from queue import Queue from queue import Queue
from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDict, TypeVar, Union from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDict, TypeVar, Union
@ -1065,7 +1064,7 @@ def fixup(data: CAPIData) -> CAPIData: # noqa: C901, CCR001 # Can't be usefully
if not commodity_map: if not commodity_map:
# Lazily populate # Lazily populate
for f in ('commodity.csv', 'rare_commodity.csv'): for f in ('commodity.csv', 'rare_commodity.csv'):
with open(join(config.respath_path, f), 'r') as csvfile: with open(config.respath_path / 'FDevIDs' / f, 'r') as csvfile:
reader = csv.DictReader(csvfile) reader = csv.DictReader(csvfile)
for row in reader: for row in reader:

10
setup.py
View File

@ -144,8 +144,10 @@ if sys.platform == 'darwin':
('plugins', x) for x in PLUGINS ('plugins', x) for x in PLUGINS
], ],
'resources': [ 'resources': [
'commodity.csv', '.gitversion', # Contains git short hash
'rare_commodity.csv', 'ChangeLog.md',
join('FDevIDs', 'commodity.csv'),
join('FDevIDs', 'rare_commodity.csv'),
'snd_good.wav', 'snd_good.wav',
'snd_bad.wav', 'snd_bad.wav',
'modules.p', 'modules.p',
@ -213,8 +215,8 @@ elif sys.platform == 'win32':
'WinSparkle.pdb', # For debugging - don't include in package 'WinSparkle.pdb', # For debugging - don't include in package
'EUROCAPS.TTF', 'EUROCAPS.TTF',
'ChangeLog.md', 'ChangeLog.md',
'commodity.csv', join('FDevIDs', 'commodity.csv'),
'rare_commodity.csv', join('FDevIDs', 'rare_commodity.csv'),
'snd_good.wav', 'snd_good.wav',
'snd_bad.wav', 'snd_bad.wav',
'modules.p', 'modules.p',