fix #104, prepend default_storage.location to upload_path then strip it back out before passing to S3Boto3Storage

Author: aaron

s3file/forms.py

@@ -14,9 +14,13 @@ class S3FileInputMixin:
     """FileInput that uses JavaScript to directly upload to Amazon S3."""
 
     needs_multipart_form = False
-    upload_path = getattr(
-        settings, 'S3FILE_UPLOAD_PATH', pathlib.PurePosixPath('tmp', 's3file')
-    )
+    try: 
+        upload_path = pathlib.PurePosixPath(
+            default_storage.location, getattr(settings, 'S3FILE_UPLOAD_PATH')
+        )
+    except AttributeError:
+        upload_path = pathlib.PurePosixPath(default_storage.location, 'tmp', 's3file')
+
     expires = settings.SESSION_COOKIE_AGE
 
     @property

s3file/middleware.py

@@ -23,6 +23,7 @@ def __call__(self, request):
     def get_files_from_storage(paths):
         """Return S3 file where the name does not include the path."""
         for path in paths:
+            path = path.lstrip(default_storage.location + '/')
             try:
                 f = default_storage.open(path)
                 f.name = os.path.basename(path)