From f234cb989d89eeafa725391d810743a6f57c67c3 Mon Sep 17 00:00:00 2001
From: Jaisen Mathai <jaisen@jmathai.com>
Date: Wed, 23 Mar 2016 00:20:58 -0700
Subject: [PATCH] gh-93 Update media module to test for string before calling
 string functions

---
 elodie/media/media.py            |   3 +++
 elodie/tests/files/.DS_Store     | Bin 0 -> 6148 bytes
 elodie/tests/media/media_test.py |  15 ++++++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 elodie/tests/files/.DS_Store

diff --git a/elodie/media/media.py b/elodie/media/media.py
index e65ac2a..704255c 100644
--- a/elodie/media/media.py
+++ b/elodie/media/media.py
@@ -295,6 +295,9 @@ class Media(object):
 
     @classmethod
     def get_class_by_file(cls, _file, classes):
+        if not isinstance(_file, basestring) or not os.path.isfile(_file):
+            return None
+
         extension = os.path.splitext(_file)[1][1:].lower()
 
         for i in classes:
diff --git a/elodie/tests/files/.DS_Store b/elodie/tests/files/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/elodie/tests/media/media_test.py b/elodie/tests/media/media_test.py
index 3658b7a..ef7abaf 100644
--- a/elodie/tests/media/media_test.py
+++ b/elodie/tests/media/media_test.py
@@ -43,11 +43,24 @@ def test_get_class_by_file_unsupported():
 
     assert media is None
 
-def test_get_class_by_file_empty():
+def test_get_class_by_file_ds_store():
     media = Media.get_class_by_file(helper.get_file('.DS_Store'),
                                     [Photo, Video, Audio])
     assert media is None
 
+def test_get_class_by_file_invalid_type():
+    media = Media.get_class_by_file(None,
+                                    [Photo, Video, Audio])
+    assert media is None
+
+    media = Media.get_class_by_file(False,
+                                    [Photo, Video, Audio])
+    assert media is None
+
+    media = Media.get_class_by_file(True,
+                                    [Photo, Video, Audio])
+    assert media is None
+
 def is_valid():
     media = Media()