added support for shiny gifs

Author: phi-line

Diff for: globals.py

@@ -3,8 +3,10 @@ class Globals():
     COLOR = 0xe74c3c #color for embed (red)
 
     IMG_URL = 'https://veekun.com/dex/media/pokemon/main-sprites/x-y/'
+    S_IMG_URL = 'https://veekun.com/dex/media/pokemon/main-sprites/x-y/shiny/'
     # GIF_URL = 'http://www.pkparaiso.com/imagenes/xy/sprites/animados/'
     GIF_URL = 'http://www.pokestadium.com/sprites/xy/'
+    S_GIF_URL = 'http://www.pokestadium.com/sprites/xy/shiny/'
     DEX_URL = 'http://cdn.bulbagarden.net/upload/thumb/3/36/479Rotom-Pok%C3%A9dex.png/160px-479Rotom-Pok%C3%A9dex.png'
 
 

Diff for: pokedex.py

@@ -30,16 +30,19 @@ async def dex(self, ctx, *args):
         from pokedex import Pokedex as this
         pkmn_id = 0; pkmn_name = ''; pkmn_genus = ''; pkmn_url = ''; pkmn_desc = '';
         random_args = ['-r', '-rand', '-random']
-        papi = PokeAPI()
+        shiny = False
+
         if not self.lock:
-            #pokemon number given
+            papi = PokeAPI()
             if args and len(args) >= 1:
                 t = args[0]
                 if type(t) == str and t.startswith('-'):
                     if t in random_args:
                         p = pkmn()
                         p.initialize()
                         t = p.pkmn_id
+                if '-s' in args[1:] or '-shiny' in args[1:]:
+                    shiny = True
                 if type(t) == int or type(t) == str:
                     self.lock = True
                     if type(t) == str:
@@ -67,16 +70,17 @@ async def dex(self, ctx, *args):
                     pkmn_type = {i['type']['name'] for i in pt}
                     print("Displaying Pokemon {0} #{1}".format(pkmn_name, pkmn_id))
 
-                    if '-s' not in args[1:] and '-shiny' not in args[1:]:
-                        try:
-                            s = str(pkmn_name)
-                            trans = str.maketrans('', '', punctuation)
-                            filename = ''.join((g.GIF_URL, s.translate(trans), '.gif'))
-                            a = urlopen(filename)
-                        except HTTPError:
-                            filename = ''.join((g.IMG_URL, str(pkmn_id), '.png'))
-                    else: filename = ''.join((g.IMG_URL, 'shiny/' ,str(pkmn_id), '.png'))
-
+                    # if '-s' not in args[1:] and '-shiny' not in args[1:]:
+                    #     try:
+                    #         s = str(pkmn_name)
+                    #         trans = str.maketrans('', '', punctuation)
+                    #         filename = ''.join((g.GIF_URL, s.translate(trans), '.gif'))
+                    #         a = urlopen(filename)
+                    #     except HTTPError:
+                    #         filename = ''.join((g.IMG_URL, str(pkmn_id), '.png'))
+                    # else: filename = ''.join((g.IMG_URL, 'shiny/' ,str(pkmn_id), '.png'))
+
+                    filename = self.get_thumbnail(pkmn_id, pkmn_name, shiny=shiny)
                     type_emojis = '  '.join({g.TYPE_DICT[t] for t in pkmn_type if t in g.TYPE_DICT})
                     title = "{0} #{1} {2}".format(pkmn_name.capitalize(), pkmn_id, type_emojis)
                     sub_title = "the {0} Pokémon".format(pkmn_genus)
@@ -97,6 +101,23 @@ async def dex(self, ctx, *args):
             print("The dex is currently in use")
         return
 
+    @staticmethod
+    def get_thumbnail(id, name, shiny=False):
+        filename = ''
+        try:
+            s = str(name)
+            trans = str.maketrans('', '', punctuation)
+            if not shiny:
+                filename =   ''.join((g.GIF_URL, s.translate(trans), '.gif'))
+            else: filename = ''.join((g.S_GIF_URL, s.translate(trans), '.gif'))
+            a = urlopen(filename)
+        except HTTPError:
+            if not shiny:
+                filename =   ''.join((g.IMG_URL, str(id), '.png'))
+            else: filename = ''.join((g.S_IMG_URL, str(id), '.png'))
+        finally:
+            return filename
+
     @staticmethod
     def std_embed(title='', url='', thumbnail_url='', sub_title='', value='', color=g.COLOR):
         pass