finn/dominiontabs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only single copy of data dir in options for now

Browse Source
This commit is contained in:
Sumpfork 2015-11-30 15:40:20 -08:00
parent ba3245d875
commit cf19cf9b72
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
domdiv/__init__.py
View File

@ -189,7 +189,6 @@ def parse_cardsize(spec, sleeved):
def read_write_card_data(options): def read_write_card_data(options):
data_dir = os.path.join(options.data_path, "card_db", options.language) data_dir = os.path.join(options.data_path, "card_db", options.language)
add_opt(options, 'data_dir', data_dir)
card_db_filepath = os.path.join(data_dir, "cards.json") card_db_filepath = os.path.join(data_dir, "cards.json")
with codecs.open(card_db_filepath, "r", "utf-8") as cardfile: with codecs.open(card_db_filepath, "r", "utf-8") as cardfile:
cards = json.load(cardfile, object_hook=Card.decode_json) cards = json.load(cardfile, object_hook=Card.decode_json)
@ -256,7 +255,8 @@ def filter_sort_cards(cards, options):
if options.special_card_groups: if options.special_card_groups:
# Load the card groups file # Load the card groups file
card_groups_file = os.path.join(options.data_dir, "card_groups.json") data_dir = os.path.join(options.data_path, "card_db", options.language)
card_groups_file = os.path.join(data_dir, "card_groups.json")
with codecs.open(card_groups_file, 'r', 'utf-8') as cardgroup_file: with codecs.open(card_groups_file, 'r', 'utf-8') as cardgroup_file:
card_groups = json.load(cardgroup_file) card_groups = json.load(cardgroup_file)
# pull out any cards which are a subcard, and rename the master card # pull out any cards which are a subcard, and rename the master card