Leahnaya/Magic-Spoiler
1
0
Fork 0
mirror of https://github.com/Cockatrice/Magic-Spoiler.git synced 2026-08-08 04:00:09 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor get_image_urls function to use only setinfo as input.

Browse Source
This commit is contained in:
dev-id 2017-09-02 21:21:29 -05:00
parent c036cefbf7
commit 9693dad628
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.py
View File

@ -127,10 +127,7 @@ if __name__ == '__main__':
manual_cards = []
mtgs = spoilers.correct_cards(
mtgs, manual_cards, card_corrections, delete_cards['delete']) # fix using the fixfiles
if not 'mythicCode' in setinfo:
setinfo['mythicCode'] = setinfo['code']
mtgjson = spoilers.get_image_urls(
mtgs, presets['isfullspoil'], setinfo['code'], setinfo['mythicCode'], setinfo['name'], setinfo['size'], setinfo) # get images
mtgjson = spoilers.get_image_urls(mtgs, presets['isfullspoil'], setinfo) # get images
if presets['scryfallOnly'] or 'scryfallOnly' in setinfo and setinfo['scryfallOnly']:
scryfall = scryfall_scraper.get_scryfall(
'https://api.scryfall.com/cards/search?q=++e:' + setinfo['code'].lower())

10
spoilers.py
View File

@ -302,19 +302,21 @@ def remove_corrected_errors(errorlog=[], card_corrections=[], print_fixed=False)
return errorlog2
def get_image_urls(mtgjson, isfullspoil, code, mythicCode, name, size=269, setinfo=False):
def get_image_urls(mtgjson, isfullspoil, setinfo=False):
if not 'mythicCode' in setinfo:
setinfo['mythicCode'] = setinfo['code']
IMAGES = 'http://magic.wizards.com/en/content/' + \
name.lower().replace(' ', '-') + '-cards'
setinfo['name'].lower().replace(' ', '-') + '-cards'
IMAGES2 = 'http://mythicspoiler.com/newspoilers.html'
IMAGES3 = 'http://magic.wizards.com/en/articles/archive/card-image-gallery/' + \
name.lower().replace('of', '').replace(' ', ' ').replace(' ', '-')
setinfo['name'].lower().replace('of', '').replace(' ', ' ').replace(' ', '-')
text = requests.get(IMAGES).text
text2 = requests.get(IMAGES2).text
text3 = requests.get(IMAGES3).text
wotcpattern = r'<img alt="{}.*?" src="(?P<img>.*?\.png)"'
wotcpattern2 = r'<img src="(?P<img>.*?\.png).*?alt="{}.*?"'
mythicspoilerpattern = r' src="' + mythicCode.lower() + '/cards/{}.*?.jpg">'
mythicspoilerpattern = r' src="' + setinfo['mythicCode'].lower() + '/cards/{}.*?.jpg">'
WOTC = []
for c in mtgjson['cards']:
if 'names' in c: