monorail
/
Scrython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored code to be more DRY, and removed private protection from checkForKey.

This commit is contained in:
2018-03-03 16:37:24 -05:00
parent 50e9d35064
commit 4d45c17e06
2 changed files with 70 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
scrython/cards/cards_object.py
View File

@ -102,243 +102,210 @@ class CardsObject(object):
if self.scryfallJson['object'] == 'error': if self.scryfallJson['object'] == 'error':
raise Exception(self.scryfallJson['details']) raise Exception(self.scryfallJson['details'])
def __checkForKey(self, key): def _checkForKey(self, key):
try: try:
return self.scryfallJson[key] return self.scryfallJson[key]
except KeyError: except Exception:
return None raise KeyError('This card has no key \'{}\''.format(key))
def _checkForTupleKey(self, parent, num, key):
try:
return self.scryfallJson[parent][num][key]
except Exception:
raise KeyError('This tuple has no key \'{}\''.format(key))
def object(self): def object(self):
if self.__checkForKey('object') is None: self._checkForKey('object')
raise KeyError("This card has no key \'object\'")
return self.scryfallJson['object'] return self.scryfallJson['object']
def id(self): def id(self):
if self.__checkForKey('id') is None: self._checkForKey('id')
raise KeyError("This card has no key \'id\'")
return self.scryfallJson['id'] return self.scryfallJson['id']
def multiverse_ids(self): def multiverse_ids(self):
if self.__checkForKey('multiverse_ids') is None: self._checkForKey('multiverse_ids')
raise KeyError("This card has no key \'multiverse_ids\'")
return self.scryfallJson['multiverse_ids'] return self.scryfallJson['multiverse_ids']
def mtgo_id(self): def mtgo_id(self):
if self.__checkForKey('mtgo_id') is None: self._checkForKey('mtgo_id')
raise KeyError("This card has no key \'mtgo_id\'")
return self.scryfallJson['mtgo_id'] return self.scryfallJson['mtgo_id']
def mtgo_foil_id(self): def mtgo_foil_id(self):
if self.__checkForKey('mtgo_foil_id') is None: self._checkForKey('mtgo_foil_id')
raise KeyError("This card has no key \'mtgo_foil_id\'")
return self.scryfallJson['mtgo_foil_id'] return self.scryfallJson['mtgo_foil_id']
def name(self): def name(self):
if self.__checkForKey('name') is None: self._checkForKey('name')
raise KeyError("This card has no key \'name\'")
return self.scryfallJson['name'] return self.scryfallJson['name']
def uri(self): def uri(self):
if self.__checkForKey('uri') is None: self._checkForKey('uri')
raise KeyError("This card has no key \'uri\'")
return self.scryfallJson['uri'] return self.scryfallJson['uri']
def scryfall_uri(self): def scryfall_uri(self):
if self.__checkForKey('scryfall_uri') is None: self._checkForKey('scryfall_uri')
raise KeyError("This card has no key \'scryfall_uri\'")
return self.scryfallJson['scryfall_uri'] return self.scryfallJson['scryfall_uri']
def layout(self): def layout(self):
if self.__checkForKey('layout') is None: self._checkForKey('layout')
raise KeyError("This card has no key \'layout\'")
return self.scryfallJson['layout'] return self.scryfallJson['layout']
def highres_image(self): def highres_image(self):
if self.__checkForKey('highres_image') is None: self._checkForKey('highres_image')
raise KeyError("This card has no key \'highres_image\'")
return self.scryfallJson['highres_image'] return self.scryfallJson['highres_image']
def image_uris(self): def image_uris(self):
if self.__checkForKey('image_uris') is None: self._checkForKey('image_uris')
raise KeyError("This card has no key \'image_uris\'")
return self.scryfallJson['image_uris'] return self.scryfallJson['image_uris']
def cmc(self): def cmc(self):
if self.__checkForKey('cmc') is None: self._checkForKey('cmc')
raise KeyError("This card has no key \'cmc\'")
return self.scryfallJson['cmc'] return self.scryfallJson['cmc']
def type_line(self): def type_line(self):
if self.__checkForKey('type_line') is None: self._checkForKey('type_line')
raise KeyError("This card has no key \'type_line\'")
return self.scryfallJson['type_line'] return self.scryfallJson['type_line']
def oracle_text(self): def oracle_text(self):
if self.__checkForKey('oracle_text') is None: self._checkForKey('oracle_text')
raise KeyError("This card has no key \'oracle_text\'")
return self.scryfallJson['oracle_text'] return self.scryfallJson['oracle_text']
def mana_cost(self): def mana_cost(self):
if self.__checkForKey('mana_cost') is None: self._checkForKey('mana_cost')
raise KeyError("This card has no key \'mana_cost\'")
return self.scryfallJson['mana_cost'] return self.scryfallJson['mana_cost']
def colors(self): def colors(self):
if self.__checkForKey('colors') is None: self._checkForKey('colors')
raise KeyError("This card has no key \'colors\'")
return self.scryfallJson['colors'] return self.scryfallJson['colors']
def color_identity(self): def color_identity(self):
if self.__checkForKey('color_identity') is None: self._checkForKey('color_identity')
raise KeyError("This card has no key \'color_identity\'")
return self.scryfallJson['color_identity'] return self.scryfallJson['color_identity']
def legalities(self): def legalities(self):
if self.__checkForKey('legalities') is None: self._checkForKey('legalities')
raise KeyError("This card has no key \'legalities\'")
return self.scryfallJson['legalities'] return self.scryfallJson['legalities']
def reserved(self): def reserved(self):
if self.__checkForKey('reserved') is None: self._checkForKey('reserved')
raise KeyError("This card has no key \'reserved\'")
return self.scryfallJson['reserved'] return self.scryfallJson['reserved']
def reprint(self): def reprint(self):
if self.__checkForKey('reprint') is None: self._checkForKey('reprint')
raise KeyError("This card has no key \'reprint\'")
return self.scryfallJson['reprint'] return self.scryfallJson['reprint']
def set_code(self): def set_code(self):
if self.__checkForKey('set') is None: self._checkForKey('set')
raise KeyError("This card has no key \'set\'")
return self.scryfallJson['set'] return self.scryfallJson['set']
def set_name(self): def set_name(self):
if self.__checkForKey('set_name') is None: self._checkForKey('set_name')
raise KeyError("This card has no key \'set_name\'")
return self.scryfallJson['set_name'] return self.scryfallJson['set_name']
def set_uri(self): def set_uri(self):
if self.__checkForKey('set_uri') is None: self._checkForKey('set_uri')
raise KeyError("This card has no key \'set_uri\'")
return self.scryfallJson['set_uri'] return self.scryfallJson['set_uri']
def set_search_uri(self): def set_search_uri(self):
if self.__checkForKey('set_search_uri') is None: self._checkForKey('set_search_uri')
raise KeyError("This card has no key \'set_search_uri\'")
return self.scryfallJson['set_search_uri'] return self.scryfallJson['set_search_uri']
def scryfall_set_uri(self): def scryfall_set_uri(self):
if self.__checkForKey('scryfall_set_uri') is None: self._checkForKey('scryfall_set_uri')
raise KeyError("This card has no key \'scryfall_set_uri\'")
return self.scryfallJson['scryfall_set_uri'] return self.scryfallJson['scryfall_set_uri']
def rulings_uri(self): def rulings_uri(self):
if self.__checkForKey('rulings_uri') is None: self._checkForKey('rulings_uri')
raise KeyError("This card has no key \'rulings_uri\'")
return self.scryfallJson['rulings_uri'] return self.scryfallJson['rulings_uri']
def prints_search_uri(self): def prints_search_uri(self):
if self.__checkForKey('prints_search_uri') is None: self._checkForKey('prints_search_uri')
raise KeyError("This card has no key \'prints_search_uri\'")
return self.scryfallJson['prints_search_uri'] return self.scryfallJson['prints_search_uri']
def collector_number(self): def collector_number(self):
if self.__checkForKey('collector_number') is None: self._checkForKey('collector_number')
raise KeyError("This card has no key \'collector_number\'")
return self.scryfallJson['collector_number'] return self.scryfallJson['collector_number']
def digital(self): def digital(self):
if self.__checkForKey('digital') is None: self._checkForKey('digital')
raise KeyError("This card has no key \'digital\'")
return self.scryfallJson['digital'] return self.scryfallJson['digital']
def rarity(self): def rarity(self):
if self.__checkForKey('rarity') is None: self._checkForKey('rarity')
raise KeyError("This card has no key \'rarity\'")
return self.scryfallJson['rarity'] return self.scryfallJson['rarity']
def illustration_id(self): def illustration_id(self):
if self.__checkForKey('illustration_id') is None: self._checkForKey('illustration_id')
raise KeyError("This card has no key \'illustration_id\'")
return self.scryfallJson['illustration_id'] return self.scryfallJson['illustration_id']
def artist(self): def artist(self):
if self.__checkForKey('artist') is None: self._checkForKey('artist')
raise KeyError("This card has no key \'artist\'")
return self.scryfallJson['artist'] return self.scryfallJson['artist']
def frame(self): def frame(self):
if self.__checkForKey('frame') is None: self._checkForKey('frame')
raise KeyError("This card has no key \'frame\'")
return self.scryfallJson['frame'] return self.scryfallJson['frame']
def full_art(self): def full_art(self):
if self.__checkForKey('') is None: self._checkForKey('')
raise KeyError("This card has no key \'full_art\'")
return self.scryfallJson['full_art'] return self.scryfallJson['full_art']
def border_color(self): def border_color(self):
if self.__checkForKey('border_color') is None: self._checkForKey('border_color')
raise KeyError("This card has no key \'border_color\'")
return self.scryfallJson['border_color'] return self.scryfallJson['border_color']
def timeshifted(self): def timeshifted(self):
if self.__checkForKey('timeshifted') is None: self._checkForKey('timeshifted')
raise KeyError("This card has no key \'timeshifted\'")
return self.scryfallJson['timeshifted'] return self.scryfallJson['timeshifted']
def colorshifted(self): def colorshifted(self):
if self.__checkForKey('colorshifted') is None: self._checkForKey('colorshifted')
raise KeyError("This card has no key \'colorshifted\'")
return self.scryfallJson['colorshifted'] return self.scryfallJson['colorshifted']
def futureshifted(self): def futureshifted(self):
if self.__checkForKey('futureshifted') is None: self._checkForKey('futureshifted')
raise KeyError("This card has no key \'futureshifted\'")
return self.scryfallJson['futureshifted'] return self.scryfallJson['futureshifted']
def edhrec_rank(self): def edhrec_rank(self):
if self.__checkForKey('edhrec_rank') is None: self._checkForKey('edhrec_rank')
raise KeyError("This card has no key \'edhrec_rank\'")
return self.scryfallJson['edhrec_rank'] return self.scryfallJson['edhrec_rank']
@ -347,91 +314,76 @@ class CardsObject(object):
if mode not in modes: if mode not in modes:
raise KeyError("{} is not a key.".format(mode)) raise KeyError("{} is not a key.".format(mode))
if self.__checkForKey(mode) is None: self._checkForKey(mode)
raise KeyError("This card has no currency key {}".format(mode))
return self.scryfallJson[mode] return self.scryfallJson[mode]
def related_uris(self): def related_uris(self):
if self.__checkForKey('related_uris') is None: self._checkForKey('related_uris')
raise KeyError("This card has no key \'related_uris\'")
return self.scryfallJson['related_uris'] return self.scryfallJson['related_uris']
def purchase_uris(self): def purchase_uris(self):
if self.__checkForKey('purchase_uris') is None: self._checkForKey('purchase_uris')
raise KeyError("This card has no key \'purchase_uris\'")
return self.scryfallJson['purchase_uris'] return self.scryfallJson['purchase_uris']
def life_modifier(self): def life_modifier(self):
if self.__checkForKey('life_modifier') is None: self._checkForKey('life_modifier')
raise KeyError("This card has no key \'life_modifier\'")
return self.scryfallJson['life_modifier'] return self.scryfallJson['life_modifier']
def hand_modifier(self): def hand_modifier(self):
if self.__checkForKey('hand_modifier') is None: self._checkForKey('hand_modifier')
raise KeyError("This card has no key \'hand_modifier\'")
return self.scryfallJson['hand_modifier'] return self.scryfallJson['hand_modifier']
def color_indicator(self): def color_indicator(self):
if self.__checkForKey('color_indicator') is None: self._checkForKey('color_indicator')
raise KeyError("This card has no key \'color_indicator\'")
return self.scryfallJson['color_indicator'] return self.scryfallJson['color_indicator']
def all_parts(self): def all_parts(self):
if self.__checkForKey('all_parts') is None: self._checkForKey('all_parts')
raise KeyError("This card has no key \'all_parts\'")
return self.scryfallJson['all_parts'] return self.scryfallJson['all_parts']
def card_faces(self): def card_faces(self):
if self.__checkForKey('card_faces') is None: self._checkForKey('card_faces')
raise KeyError("This card has no key \'card_faces\'")
return self.scryfallJson['card_faces'] return self.scryfallJson['card_faces']
def watermark(self): def watermark(self):
if self.__checkForKey('watermark') is None: self._checkForKey('watermark')
raise KeyError("This card has no key \'watermark\'")
return self.scryfallJson['watermark'] return self.scryfallJson['watermark']
def story_spotlight_number(self): def story_spotlight_number(self):
if self.__checkForKey('story_spotlight_number') is None: self._checkForKey('story_spotlight_number')
raise KeyError("This card has no key \'story_spotlight_number\'")
return self.scryfallJson['story_spotlight_number'] return self.scryfallJson['story_spotlight_number']
def story_spotlight_uri(self): def story_spotlight_uri(self):
if self.__checkForKey('story_spotlight_uri') is None: self._checkForKey('story_spotlight_uri')
raise KeyError("This card has no key \'story_spotlight_uri\'")
return self.scryfallJson['story_spotlight_uri'] return self.scryfallJson['story_spotlight_uri']
def power(self): def power(self):
if self.__checkForKey('power') is None: self._checkForKey('power')
raise KeyError("This card has no key \'power\'")
return self.scryfallJson['power'] return self.scryfallJson['power']
def toughness(self): def toughness(self):
if self.__checkForKey('toughness') is None: self._checkForKey('toughness')
raise KeyError("This card has no key \'toughness\'")
return self.scryfallJson['toughness'] return self.scryfallJson['toughness']
def loyalty(self): def loyalty(self):
if self.__checkForKey('loyalty') is None: self._checkForKey('loyalty')
raise KeyError("This card has no key \'loyalty\'")
return self.scryfallJson['loyalty'] return self.scryfallJson['loyalty']
def flavor_text(self): def flavor_text(self):
if self.__checkForKey('flavor_text') is None: self._checkForKey('flavor_text')
raise KeyError("This card has no key \'flavor_text\'")
return self.scryfallJson['flavor_text'] return self.scryfallJson['flavor_text']

33
scrython/cards/search.py
View File

@ -47,57 +47,38 @@ class Search(CardsObject):
super(Search, self).__init__(self.url) super(Search, self).__init__(self.url)
def __checkForKey(self, key):
try:
return self.scryfallJson[key]
except KeyError:
return None
def __checkForTupleKey(self, parent, num, key):
try:
return self.scryfallJson[parent][num][key]
except KeyError:
return None
def object(self): def object(self):
if self.__checkForKey('object') is None: super(Search, self)._checkForKey('object')
raise KeyError('This object has no key \'object\'')
return self.scryfallJson['object'] return self.scryfallJson['object']
def total_cards(self): def total_cards(self):
if self.__checkForKey('total_cards') is None: super(Search, self)._checkForKey('total_cards')
raise KeyError('This object has no key \'total_cards\'')
return self.scryfallJson['total_cards'] return self.scryfallJson['total_cards']
def data(self): def data(self):
if self.__checkForKey('data') is None: super(Search, self)._checkForKey('data')
raise KeyError('This object has no key \'data\'')
return self.scryfallJson['data'] return self.scryfallJson['data']
def next_page(self): def next_page(self):
if self.__checkForKey('next_page') is None: super(Search, self)._checkForKey('next_page')
raise KeyError('This object has no key \'next_page\'')
return self.scryfallJson['next_page'] return self.scryfallJson['next_page']
def warnings(self): def warnings(self):
if self.__checkForKey('warnings') is None: super(Search, self)._checkForKey('warnings')
raise KeyError('This object has no key \'warnings\'')
return self.scryfallJson['warnings'] return self.scryfallJson['warnings']
def data_length(self): def data_length(self):
if self.__checkForKey('data') is None: super(Search, self)._checkForKey('data')
raise KeyError('This object has no key \'data\'')
return len(self.scryfallJson['data']) return len(self.scryfallJson['data'])
def data_tuple(self, num): def data_tuple(self, num):
if self.__checkForKey('data') is None: super(Search, self)._checkForKey('data')
raise KeyError('This object has no key \'data\'')
return self.scryfallJson['data'][num] return self.scryfallJson['data'][num]