content type issue

Author: mostafa6765

django_petra/__init__.py

@@ -1,5 +1,5 @@
 __title__ = 'Django Petra'
-__version__ = '0.0.5'
+__version__ = '0.0.6'
 __author__ = 'Mostafa'
 
 # Version synonym

django_petra/filesystem/__init__.py

@@ -0,0 +1,3 @@
+"""
+This module contains the Storage class, which is used to interact with the filesystem.
+"""

django_petra/filesystem/storage.py

@@ -98,6 +98,12 @@ def move(self, source, destination):
             self.local_storage.move(source, destination)
         elif self.disk == 's3':
             self.s3_storage.move(source, destination)
+    
+    def content_type(self, path):
+        if self.disk == 'local':
+            return self.local_storage.content_type(path)
+        elif self.disk == 's3':
+            return self.s3_storage.content_type(path)
 
 # Create an instance of the Storage class
-storage = Storage()
+storage = Storage()

django_petra/filesystem/the_disks/__init__.py

@@ -0,0 +1,3 @@
+"""
+This module contains the implementation of the storage for the filesystem.
+"""

django_petra/filesystem/the_disks/local.py

@@ -1,6 +1,8 @@
 import os
-from django_petra.path import base_path
 import shutil
+import mimetypes
+
+from django_petra.path import base_path
 
 class LocalStorage:
     def __init__(self):
@@ -9,15 +11,19 @@ def __init__(self):
     def get_full_path(self, path):
         return os.path.join(self.base_path, 'storage', 'public', path)
 
-    def put(self, path, contents):
+    def put(self, path, file):
         full_path = self.get_full_path(path)
+        file_content = file.read()
         os.makedirs(os.path.dirname(full_path), exist_ok=True)
-        with open(full_path, 'w') as file:
-            file.write(contents)
+        
+        # Check if contents is bytes or string
+        mode = 'wb' if isinstance(file_content, bytes) else 'w'
+        with open(full_path, mode) as file:
+            file.write(file_content)
 
     def get(self, path):
         full_path = self.get_full_path(path)
-        with open(full_path, 'r') as file:
+        with open(full_path, 'rb') as file:
             return file.read()
 
     def delete(self, path):
@@ -27,9 +33,9 @@ def delete(self, path):
         except FileNotFoundError as e:
             print(f"Error deleting local file: {e}")
 
-    def update(self, path, contents):
+    def update(self, path, file):
         self.delete(path)
-        self.put(path, contents)
+        self.put(path, file)
 
     def exists(self, path):
         full_path = self.get_full_path(path)
@@ -93,3 +99,9 @@ def move(self, source, destination):
             shutil.move(full_source_path, full_destination_path)
         except Exception as e:
             print(f"Error moving local file: {e}")
+
+    def content_type(self, path):
+        content_type, _ = mimetypes.guess_type(path)
+        if not content_type:
+            content_type = 'application/octet-stream'
+        return content_type

django_petra/filesystem/the_disks/s3.py

@@ -1,4 +1,5 @@
 import boto3
+import mimetypes
 from botocore.exceptions import ClientError
 from django_petra.env import get_env
 
@@ -18,16 +19,23 @@ def __init__(self):
             region_name=aws_region
         )
 
-    def put(self, path, contents):
+    def put(self, path, file):
         try:
-            self.s3_client.put_object(Body=contents, Bucket=self.s3_bucket, Key=path)
+            file_content = file.read()
+            content_type, _ = mimetypes.guess_type(file.name)
+            self.s3_client.put_object(
+                Body=file_content,
+                Bucket=self.s3_bucket,
+                Key=path, 
+                ContentType=content_type
+            )
         except ClientError as e:
             print(f"Error putting object to S3: {e}")
 
     def get(self, path):
         try:
             response = self.s3_client.get_object(Bucket=self.s3_bucket, Key=path)
-            return response['Body'].read().decode('utf-8')
+            return response['Body'].read()
         except ClientError as e:
             print(f"Error getting object from S3: {e}")
 
@@ -37,9 +45,9 @@ def delete(self, path):
         except ClientError as e:
             print(f"Error deleting object from S3: {e}")
 
-    def update(self, path, contents):
+    def update(self, path, file):
         self.delete(path)
-        self.put(path, contents)
+        self.put(path, file)
 
     def exists(self, path):
         try:
@@ -99,3 +107,9 @@ def copy(self, source, destination):
     def move(self, source, destination):
         self.copy(source, destination)
         self.delete(source)
+
+    def content_type(self, path):
+        content_type, _ = mimetypes.guess_type(path)
+        if not content_type:
+            content_type = 'application/octet-stream'
+        return content_type