Ian Lewis avatar Ian Lewis committed 43d7909

Added support for a base location for the storage within the bucket. Paths given to methods are normalized to internal S3 paths.

Comments (0)

Files changed (1)

storages/backends/s3boto.py

 import os
+import posixpath
 import mimetypes
 
 try:
                        secret_key=None, acl=DEFAULT_ACL, headers=HEADERS,
                        gzip=IS_GZIPPED, gzip_content_types=GZIP_CONTENT_TYPES,
                        querystring_auth=QUERYSTRING_AUTH, querystring_expire=QUERYSTRING_EXPIRE,
-                       custom_domain=CUSTOM_DOMAIN, secure_urls=SECURE_URLS):
+                       custom_domain=CUSTOM_DOMAIN, secure_urls=SECURE_URLS,
+                       location=LOCATION):
         self.acl = acl
         self.headers = headers
         self.gzip = gzip
         self.querystring_expire = querystring_expire
         self.custom_domain = custom_domain
         self.secure_urls = secure_urls
+        self.location = location or ''
+        self.location = self.location.lstrip('/')
         
         if not access_key and not secret_key:
              access_key, secret_key = self._get_access_keys()
         # Useful for windows' paths
         return os.path.normpath(name).replace('\\', '/')
 
+    def _normalize_name(self, name):
+        return posixpath.join(self.location, name).lstrip('/')
+
     def _compress_content(self, content):
         """Gzip a given string."""
         zbuf = StringIO()
         return content
         
     def _open(self, name, mode='rb'):
-        name = self._clean_name(name)
-        return S3BotoStorageFile(name, mode, self)
+        name = self._normalize_name(self._clean_name(name))
+        f = S3BotoStorageFile(name, mode, self)
+        if not f.key:
+            raise IOError('File does not exist: %s' % name)
+        return f
     
     def _save(self, name, content):
-        name = self._clean_name(name)
+        cleaned_name = self._clean_name(name)
+        name = self._normalize_name(cleaned_name)
         headers = self.headers
         content_type = mimetypes.guess_type(name)[0] or Key.DefaultContentType            
 
             'Content-Type': content_type,
         })
         
-        content.name = name
+        content.name = cleaned_name
         k = self.bucket.get_key(name)
         if not k:
             k = self.bucket.new_key(name)
         k.set_contents_from_file(content, headers=headers, policy=self.acl)
-        return name
+        return cleaned_name
     
     def delete(self, name):
-        name = self._clean_name(name)
+        name = self._normalize_name(self._clean_name(name))
         self.bucket.delete_key(name)
     
     def exists(self, name):
-        name = self._clean_name(name)
+        name = self._normalize_name(self._clean_name(name))
         k = self.bucket.new_key(name)
         return k.exists()
     
     def listdir(self, name):
+        name = self._normalize_name(self._clean_name(name))
         dirlist = self.bucket.list(name)
         files = []
         dirs = set()
         return list(dirs),files
 
     def size(self, name):
-        name = self._clean_name(name)
+        name = self._normalize_name(self._clean_name(name))
         return self.bucket.get_key(name).size
     
     def url(self, name):
-        name = self._clean_name(name)
+        name = self._normalize_name(self._clean_name(name))
         if self.custom_domain:
             return "%s://%s/%s" % ('https' if self.secure_urls else 'http', self.custom_domain, name)
         else:
 class S3BotoStorageFile(File):
     def __init__(self, name, mode, storage):
         self._storage = storage
-        self.name = name
+        self.name = name[len(self._storage.location):].lstrip('/')
         self._mode = mode
         self.key = storage.bucket.get_key(name)
         self._is_dirty = False
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.