From fa10639000065fa93770c1a6437fe8d0df273ba6 Mon Sep 17 00:00:00 2001 From: dev-id Date: Thu, 7 Sep 2017 11:21:06 -0500 Subject: [PATCH] Don't make set files for sets without cards. Don't put them in spoiler.json --- main.py | 8 +++++--- spoilers.py | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 1e479164..557d7ac9 100644 --- a/main.py +++ b/main.py @@ -158,9 +158,11 @@ if __name__ == '__main__': save_masterpieces(masterpieces, setinfo) save_xml(spoilers.pretty_xml('out/' + setinfo['masterpieces']['code'] + '.xml'), 'out/' + setinfo['masterpieces']['code'] + '.xml') combinedjson[setinfo['masterpieces']['code']] = masterpieces - save_setjson(mtgjson, setinfo['code']) - save_xml(spoilers.pretty_xml('out/' + setinfo['code'] + '.xml'), 'out/' + setinfo['code'] + '.xml') - combinedjson[setinfo['code']] = mtgjson + if 'cards' in mtgjson and mtgjson['cards'] and not mtgjson['cards'] == []: + save_setjson(mtgjson, setinfo['code']) + combinedjson[setinfo['code']] = mtgjson + if os.path.isfile('out/' + setinfo['code'] + '.xml'): + save_xml(spoilers.pretty_xml('out/' + setinfo['code'] + '.xml'), 'out/' + setinfo['code'] + '.xml') save_setjson(combinedjson, 'spoiler') spoilers.write_combined_xml(combinedjson, setinfos) save_xml(spoilers.pretty_xml('out/spoiler.xml'), 'out/spoiler.xml') diff --git a/spoilers.py b/spoilers.py index 7d961842..967c6172 100644 --- a/spoilers.py +++ b/spoilers.py @@ -362,6 +362,8 @@ def get_image_urls(mtgjson, isfullspoil, setinfo=False): def write_xml(mtgjson, code, name, releaseDate): + if not 'cards' in mtgjson or not mtgjson['cards'] or mtgjson['cards'] == []: + return if not os.path.isdir('out/'): os.makedirs('out/') cardsxml = open('out/' + code + '.xml', 'w+')