feat

Author: awais786

smart_storages/__init__.py

@@ -1,2 +1,3 @@
 from .s3_backend import BaseSpecialS3Storage
-__all__ = ["BaseSpecialS3Storage"]
+
+__all__ = ["BaseSpecialS3Storage"]

smart_storages/s3_backend.py

@@ -9,20 +9,26 @@ class BaseSpecialS3Storage(S3Boto3Storage):
     Uses the bucket defined by a Django setting key.
     """
 
-    setting_name = None  # subclasses must define this
+    storage_key = None  # e.g. "import_export" or "COURSE_IMPORT_EXPORT_BUCKET"
 
     def __init__(self, **kwargs):
-        # Explicitly resolve bucket name from Django settings or fallback
-        if self.setting_name and hasattr(settings, self.setting_name):
-            bucket_name = getattr(settings, self.setting_name)
-        else:
-            bucket_name = getattr(settings, "AWS_STORAGE_BUCKET_NAME", None)
-        # Merge default options with user-supplied ones
-        options = {
-            "bucket_name": bucket_name,
-            "custom_domain": None,
-            "querystring_auth": True,
-            **kwargs,  # allow overrides
-        }
+        # Start with sane defaults
+        options = {"querystring_auth": True}
+
+        # Load from STORAGES if configured
+        if hasattr(settings, "STORAGES") and self.storage_key:
+            storage_conf = settings.STORAGES.get(self.storage_key, {})
+            options.update(storage_conf.get("OPTIONS", {}))
+
+        # Fallback: if bucket not set, look for setting variable
+        if "bucket_name" not in options:
+            # Allow storage_key to be either "import_export"
+            bucket_name = getattr(settings, self.storage_key, None)
+            if not bucket_name:
+                bucket_name = getattr(settings, "AWS_STORAGE_BUCKET_NAME", None)
+            options["bucket_name"] = bucket_name
+
+        #  Finally, user kwargs override everything
+        options.update(kwargs)
 
         super().__init__(**options)

tests/test_storages.py

@@ -5,11 +5,11 @@
 
 
 class ImportExportS3Storage(BaseSpecialS3Storage):
-    setting_name = "COURSE_IMPORT_EXPORT_BUCKET"
+    storage_key = "COURSE_IMPORT_EXPORT_BUCKET"
 
 
 class AnalyticsS3Storage(BaseSpecialS3Storage):
-    setting_name = "ANALYTICS_BUCKET"
+    storage_key = "ANALYTICS_BUCKET"
 
 
 class TestSpecialStorages(TestCase):
@@ -28,7 +28,7 @@ def test_base_storage_uses_default_bucket(self):
     def test_custom_bucket_is_used(self):
         """
         The class should pick up its bucket name from the setting defined
-        in `setting_name`.
+        in `storage_key`.
         """
         storage = ImportExportS3Storage()
         self.assertEqual(storage.bucket_name, "import-export-bucket")