# HG changeset patch
# User Tero Marttila <terom@paivola.fi>
# Date 1410733366 -10800
# Node ID 0f2a918eb90abfd7c46cba4365b4299d8c3f8f78
# Parent  51908b0cc3a15ae87d0648fd1cf4d5719424c493
pngtile.application: introduce IMAGE_TYPES, and split off image file validation into get_image(), and rename lookup_path() to handle dirs as well

diff -r 51908b0cc3a1 -r 0f2a918eb90a pngtile/application.py
--- a/pngtile/application.py	Mon Sep 15 00:49:30 2014 +0300
+++ b/pngtile/application.py	Mon Sep 15 01:22:46 2014 +0300
@@ -6,6 +6,10 @@
 import os.path
 
 class BaseApplication (object):
+    IMAGE_TYPES = (
+        'png',
+    )
+
     def __init__ (self, image_root):
         if not os.path.isdir(image_root) :
             raise Exception("Given image_root does not exist: {image_root}".format(image_root=image_root))
@@ -14,11 +18,11 @@
 
         self.image_cache = { }
 
-    def lookup_image (self, url):
+    def lookup_path (self, url):
         """
             Lookup image by request path.
 
-            Returns image_name, image_path.
+            Returns name, path.
         """
 
         if not os.path.isdir(self.image_root):
@@ -37,12 +41,6 @@
         if not os.path.exists(path):
             raise exceptions.NotFound(name)
 
-        if os.path.isdir(path):
-            raise exceptions.BadRequest("Is a directory: {name}".format(name=name))
-
-        if not path.endswith('.png'):
-            raise exceptions.BadRequest("Not a PNG image: {name}".format(name=name))
-
         return name, path
 
     def get_image (self, url):
@@ -50,7 +48,15 @@
             Return Image object.
         """
 
-        name, path = self.lookup_image(url)
+        name, path = self.lookup_path(url)
+
+        if os.path.isdir(path):
+            raise exceptions.BadRequest("Is a directory: {name}".format(name=name))
+
+        basename, file_type = path.rsplit('.', 1)
+
+        if file_type not in self.IMAGE_TYPES:
+            raise exceptions.BadRequest("Not a supported image: {name}: {type}".format(name=name, type=file_type))
 
         # get Image object
         image = self.image_cache.get(path)