Improve bucket name configuration handling

Refactor bucket name retrieval logic for clarity and maintainability.

Author: awais786

smart_storages/s3_backend.py

@@ -14,21 +14,25 @@ class BaseSpecialS3Storage(S3Boto3Storage):
     def __init__(self, **kwargs):
         # Start with sane defaults
         options = {"querystring_auth": True}
-
-        # Load from STORAGES if configured
+        bucket_name = None
+        
+        # 1. Try STORAGES dict
         if hasattr(settings, "STORAGES") and self.storage_key:
             storage_conf = settings.STORAGES.get(self.storage_key, {})
             options.update(storage_conf.get("OPTIONS", {}))
+            bucket_name = options.get("bucket_name", None)
 
-        # Fallback: if bucket not set, look for setting variable
-        if "bucket_name" not in options:
-            # Allow storage_key to be either "import_export"
+        # 2. Fallback to storage_key setting if bucket_name is None
+        if bucket_name is None and self.storage_key:
             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
+        # 3. Final fallback to AWS_STORAGE_BUCKET_NAME if still None
+        if bucket_name is None:
+            bucket_name = getattr(settings, "AWS_STORAGE_BUCKET_NAME", None)
+
+        options["bucket_name"] = bucket_name
+
+        # 4. Override with any kwargs
         options.update(kwargs)
 
         super().__init__(**options)