Move pokemon_has_media back to helpers, with an explicit config param

It is needed by the flavor page controller.

Updates #117

splinext/pokedex/controllers/pokedex.py

@@ -1211,7 +1211,7 @@ def sprite_exists(directory):
             # n.b. calling dict.setdefault always evaluates the default
             if directory not in c.sprites:
                 c.sprites[directory] = pokedex_helpers.pokemon_has_media(
-                    c.form, directory, extension)
+                    c.form, directory, extension, config)
             return c.sprites[directory]
         c.sprite_exists = sprite_exists
 

splinext/pokedex/helpers.py

@@ -10,7 +10,9 @@
 import re
 from itertools import groupby, chain, repeat
 from operator import attrgetter
+import os
 import os.path
+import warnings
 
 from pylons import url
 
@@ -181,6 +183,26 @@ def filename_from_name(name):
     name = re.sub(u'[\'.()]', u'', name)
     return name
 
+def pokemon_has_media(pokemon_form, prefix, ext, config, use_form=True):
+    """Determine whether a file exists in the specified directory for the
+    specified Pokémon form.
+    """
+    # TODO share this somewhere
+    media_dir = config.get('spline-pokedex.media_directory', None)
+    if not media_dir:
+        warnings.warn(
+            "No media_directory found; "
+            "you may want to clone pokedex-media.git")
+        return False
+
+    if use_form:
+        kwargs = dict(form=pokemon_form)
+    else:
+        kwargs = dict()
+
+    return os.path.exists(os.path.join(media_dir,
+        pokemon_media_path(pokemon_form.species, prefix, ext, **kwargs)))
+
 def pokemon_media_path(pokemon_species, prefix, ext, form=None):
     """Returns a path to a Pokémon media file.
 

splinext/pokedex/templates/pokedex/lib.mako

@@ -1,5 +1,4 @@
 <%! from splinext.pokedex import i18n, db %>\
-<%! import os, warnings %>\
 
 #### Images and links
 
@@ -64,24 +63,7 @@
 
 
 <%def name="pokemon_has_media(pokemon_form, prefix, ext, use_form=True)"><%
-    """Determine whether a file exists in the specified directory for the
-    specified Pokémon form.
-    """
-    # TODO share this somewhere
-    media_dir = config.get('spline-pokedex.media_directory', None)
-    if not media_dir:
-        warnings.warn(
-            "No media_directory found; "
-            "you may want to clone pokedex-media.git")
-        return False
-
-    if use_form:
-        kwargs = dict(form=pokemon_form)
-    else:
-        kwargs = dict()
-
-    return os.path.exists(os.path.join(media_dir,
-        h.pokedex.pokemon_media_path(pokemon_form.species, prefix, ext, **kwargs)))
+    return h.pokedex.pokemon_has_media(pokemon_form, prefix, ext, config, use_form=use_form)
 %></%def>
 
 <%def name="species_image(pokemon_species, prefix='main-sprites/black-white', **attr)"><%