Fixing existence check for directories. Fixes #16

etianen · Feb 1, 2016 · 027dcdf · leonsmith · Jul 4, 2016 · etianen
1 parent efcaa6b
commit 027dcdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/django_s3_storage/storage.py b/django_s3_storage/storage.py
@@ -259,7 +259,11 @@ def exists(self, name):
         Returns True if a file referenced by the given name already exists in the
         storage system, or False if the name is available for a new file.
         """
-        return self._get_key(name).exists()
+        # We also need to check for directory existence, so we'll list matching
+        # keys and return success if any match.
+        for _ in self.bucket.list(prefix=self._get_key_name(name)):
+            return True
+        return False
 
     def listdir(self, path):
         """

diff --git a/django_s3_storage/tests.py b/django_s3_storage/tests.py
@@ -137,6 +137,9 @@ def testExists(self):
         self.assertTrue(self.storage.exists(self.upload_path))
         self.assertFalse(self.storage.exists(self.generateUploadPath()))
 
+    def testDirExists(self):
+        self.assertTrue(self.storage.exists(""))
+
     def testDelete(self):
         # Make a new file to delete.
         upload_path = self.generateUploadPath()