diff --git a/mtgs_scraper.py b/mtgs_scraper.py index 67845157..e21d6001 100644 --- a/mtgs_scraper.py +++ b/mtgs_scraper.py @@ -264,6 +264,8 @@ def scrape_mtgs_images(url='http://www.mtgsalvation.com/spoilers/183-hour-of-dev def list_mtgs_gallery(url=''): + if url == '': + return '' page = requests.get(url) tree = html.fromstring(page.content) cards = [] diff --git a/set_info.yml b/set_info.yml index c3cd5ce8..a21a5274 100644 --- a/set_info.yml +++ b/set_info.yml @@ -15,6 +15,11 @@ # mtgsurl: "http://url_to_mtgsalvation.com/spoilers/page # mtgscardpath "http://url_to_mtgsalvation.com/cards/setpage/" # fullSpoil: false +# noRSS: true #don't check MTGS spoiler newsfeed spoiler.rss for this set +# noBooster: +# mythicCode: +# mythicOnly: +# scryfallOnly: # masterpieces: # # Masterpieces contain code, name, releaseDate as above @@ -30,7 +35,7 @@ # block: "Amonkhet" # size: 199 # releaseDate: "2017-07-14" -# type: "expansion" +# type: "expansion" #can be "expansion", "core", "commander", "masters" - for full list see http://mtgjson.com/documentation.html#sets # mtgsurl: "http://www.mtgsalvation.com/spoilers/183-hour-of-devastation" #looks like http://www.mtgsalvation.com/spoilers/183 automatically redirects to same page # mtgscardpath: "http://www.mtgsalvation.com/cards/hour-of-devastation/" #important: don't forget the trailing slash "/" at the end of the link! # fullSpoil: false @@ -63,3 +68,69 @@ fullSpoil: false # additionalCardNames: [] # mtgsurl: "?" # mtgscardpath: "?" +--- +code: "IMA" +name: "Iconic Masters" +#block: "?" +#size: ? +releaseDate: "2017-11-17" +type: "masters" +mtgsurl: "" +#mtgscardpath: "?" +fullSpoil: false +noRSS: true +--- +code: "UST" +name: "Unstable" +#block: "?" +#size: ? +releaseDate: "2017-12-08" +type: "un" +mtgsurl: "" +#mtgscardpath: "?" +fullSpoil: false +noRSS: true +--- +code: "RIX" +name: "Rivals of Ixalan" +block: "Ixalan" +#size: ? +releaseDate: "2018-01-19" +type: "expansion" +mtgsurl: "" +#mtgscardpath: "?" +fullSpoil: false +noRSS: true +--- +code: "A25" +name: "Masters 25" +#block: "?" +#size: ? +releaseDate: "2018-03-16" +type: "masters" +mtgsurl: "" +#mtgscardpath: "?" +fullSpoil: false +noRSS: true +--- +code: "DOM" +name: "Dominaria" +#block: "?" +#size: ? +releaseDate: "2018-04-27" +type: "expansion" +mtgsurl: "" +#mtgscardpath: "?" +fullSpoil: false +noRSS: true +--- +code: "M19" +name: "Core 2019" +#block: "?" +#size: ? +releaseDate: "2018-07-20" +type: "core" +mtgsurl: "" +#mtgscardpath: "?" +fullSpoil: false +noRSS: true diff --git a/spoilers.py b/spoilers.py index df9f4f76..7d961842 100644 --- a/spoilers.py +++ b/spoilers.py @@ -484,12 +484,15 @@ def write_xml(mtgjson, code, name, releaseDate): cardsxml.write("\n") - print 'XML Stats for ' + code - print 'Total cards: ' + str(count) - if dfccount > 0: - print 'DFC: ' + str(dfccount) - print 'Newest: ' + str(newest) - print 'Runtime: ' + str(datetime.datetime.today().strftime('%H:%M')) + ' (UTC) on ' + str(datetime.date.today()) + if count > 0: + print 'XML Stats for ' + code + print 'Total cards: ' + str(count) + if dfccount > 0: + print 'DFC: ' + str(dfccount) + print 'Newest: ' + str(newest) + print 'Runtime: ' + str(datetime.datetime.today().strftime('%H:%M')) + ' (UTC) on ' + str(datetime.date.today()) + else: + print 'Set ' + code + ' has no spoiled cards.' def write_combined_xml(mtgjson, setinfos): @@ -631,7 +634,7 @@ def write_combined_xml(mtgjson, setinfos): cardsxml.write("\n") cardsxml.write("\n") - + print 'XML COMBINED STATS' print 'Total cards: ' + str(count) if dfccount > 0: