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

make expansions / expansions_dividers options work when using read_yaml

Browse Source
This commit is contained in:
Paul Molodowitch 2013-12-14 15:51:42 -08:00
parent 23caf3cd15
commit 4dd70b0ca0
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dominion_tabs.py
View File

@ -618,25 +618,23 @@ class DominionTabs:
cards = yaml.load(cardfile) cards = yaml.load(cardfile)
else: else:
cards = self.read_card_defs(os.path.join(self.filedir,"dominion_cards.txt")) cards = self.read_card_defs(os.path.join(self.filedir,"dominion_cards.txt"))
if self.options.expansions:
self.options.expansions = [o.lower() for o in self.options.expansions]
cards=[c for c in cards if c.cardset in self.options.expansions]
self.read_card_extras(os.path.join(self.filedir,"dominion_card_extras.txt"),cards)
if options.expansion_dividers:
cardnamesByExpansion = {}
for c in cards:
cardnamesByExpansion.setdefault(c.cardset,[]).append(c.name.strip())
for exp,names in cardnamesByExpansion.iteritems():
c = Card(exp, exp, ("Expansion",), None, ' | '.join(sorted(names)))
cards.append(c)
#print '%d cards read' % len(cards)
sets = {}
types = {}
for c in cards: for c in cards:
sets[c.cardset] = sets.get(c.cardset,0) + 1
types[c.types] = types.get(c.types,0) + 1
c.description = re.sub('----+','\n',c.description) c.description = re.sub('----+','\n',c.description)
c.description = re.sub('\n\s*\n','\n',c.description) c.description = re.sub('\n\s*\n','\n',c.description)
self.read_card_extras(os.path.join(self.filedir,"dominion_card_extras.txt"),cards)
if self.options.expansions:
self.options.expansions = [o.lower() for o in self.options.expansions]
cards=[c for c in cards if c.cardset in self.options.expansions]
if options.expansion_dividers:
cardnamesByExpansion = {}
for c in cards:
cardnamesByExpansion.setdefault(c.cardset,[]).append(c.name.strip())
for exp,names in cardnamesByExpansion.iteritems():
c = Card(exp, exp, ("Expansion",), None, ' | '.join(sorted(names)))
cards.append(c)
if options.write_yaml: if options.write_yaml:
import yaml import yaml
out = yaml.dump(cards) out = yaml.dump(cards)