accrete 0.0.58__py3-none-any.whl → 0.0.60__py3-none-any.whl

accrete/contrib/ui/filter.py

@@ -158,7 +158,9 @@ class Filter:
             'PositiveSmallIntegerField': self.int_param,
             'DateTimeField': self.date_time_param,
             'DateField': self.date_param,
-            'ForeignKey': self.foreign_key_param
+            'ForeignKey': self.foreign_key_param,
+            'FileField': self.file_param,
+            'ImageField': self.file_param
         }
 
     def parse_choices(self, choices):
@@ -269,6 +271,9 @@ class Filter:
             return self.null_param(key, value)
         return ''
 
+    def file_param(self, key, value):
+        return self.null_param(key, value)
+
     def null_param(self, key, value):
         options = self.parse_choices([
             ('true', _('True')),

accrete/middleware.py

@@ -82,10 +82,12 @@ class HtmxRedirectMiddleware(MiddlewareMixin):
     @staticmethod
     def process_response(request, response):
         is_htmx = request.headers.get('HX-Request', 'false') == 'true'
-        is_redirect = isinstance(
-            response, (HttpResponseRedirect, HttpResponsePermanentRedirect)
-        )
-        if is_htmx and is_redirect:
-            response['HX-Redirect'] = response['Location']
+        if not is_htmx:
+            return response
+        is_redirect = isinstance(response, HttpResponseRedirect)
+        is_permanent_redirect = isinstance(response, HttpResponsePermanentRedirect)
+        if is_redirect or is_permanent_redirect:
             response.status_code = 200
+            header = 'HX-Location' if is_redirect else 'HX-Redirect'
+            response[header] = response['Location']
         return response

accrete/storage.py

@@ -0,0 +1,37 @@
+import os
+from urllib.parse import urljoin
+from django.core.files.storage import FileSystemStorage
+from django.utils.encoding import filepath_to_uri
+from django.utils.deconstruct import deconstructible
+from django.conf import settings
+from accrete.tenant import get_tenant
+
+
+@deconstructible(path="django.core.files.storage.FileSystemStorage")
+class TenantFileSystemStorage(FileSystemStorage):
+
+    @property
+    def base_location(self):
+        tenant = get_tenant()
+        base_dir = f'{settings.MEDIA_ROOT}/{tenant.id}'
+        os.makedirs(os.path.dirname(base_dir), exist_ok=True)
+        return base_dir
+
+    @property
+    def location(self):
+        return os.path.abspath(self.base_location)
+
+    @property
+    def base_url(self):
+        if self._base_url is not None and not self._base_url.endswith("/"):
+            self._base_url += "/"
+        res = self._value_or_setting(self._base_url, f'{settings.MEDIA_URL.strip("/")}/{get_tenant().id}')
+        return res
+
+    def url(self, name):
+        if self.base_url is None:
+            raise ValueError("This file is not accessible via a URL.")
+        url = filepath_to_uri(name)
+        if url is not None:
+            url = url.lstrip("/")
+        return urljoin(f'/{self.base_url}/', url)

accrete/urls.py

@@ -0,0 +1,8 @@
+from django.urls import path, include
+from django.conf import settings
+from accrete.views import get_tenant_file
+
+
+urlpatterns = [
+    path(f'{settings.MEDIA_URL.strip("/")}/<int:tenant_id>/<path:filepath>', get_tenant_file)
+]

accrete/views.py

@@ -1,31 +1,15 @@
+import os
 from functools import wraps
+from django.http import HttpResponse, HttpResponseNotFound
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import login_required
 from django.core.exceptions import ImproperlyConfigured
 from django.shortcuts import redirect
 from django.conf import settings
+from accrete.tenant import get_tenant
 from . import config
 
 
-def tenant_required(
-        redirect_field_name: str = None,
-        login_url: str = None
-):
-    def decorator(f):
-        @wraps(f)
-        @login_required(
-            redirect_field_name=redirect_field_name,
-            login_url=login_url
-        )
-        def _wrapped_view(request, *args, **kwargs):
-            tenant = request.tenant
-            if not tenant:
-                return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
-            return f(request, *args, **kwargs)
-        return _wrapped_view
-    return decorator
-
-
 class TenantRequiredMixin(LoginRequiredMixin):
 
     tenant_missing_url = None
@@ -80,3 +64,34 @@ class TenantRequiredMixin(LoginRequiredMixin):
                 f"{cls_name}.get_member_not_authorized_url()."
             )
         return url
+
+
+def tenant_required(
+        redirect_field_name: str = None,
+        login_url: str = None
+):
+    def decorator(f):
+        @wraps(f)
+        @login_required(
+            redirect_field_name=redirect_field_name,
+            login_url=login_url
+        )
+        def _wrapped_view(request, *args, **kwargs):
+            tenant = request.tenant
+            if not tenant:
+                return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
+            return f(request, *args, **kwargs)
+        return _wrapped_view
+    return decorator
+
+
+@tenant_required()
+def get_tenant_file(request, tenant_id, filepath):
+    tenant = get_tenant()
+    if tenant.id != tenant_id:
+        return HttpResponseNotFound()
+    filepath = f'{settings.MEDIA_ROOT}/{tenant_id}/{filepath}'
+    if not os.path.exists(filepath):
+        return HttpResponseNotFound()
+    with open(filepath, 'rb') as f:
+        return HttpResponse(f)

{accrete-0.0.58.dist-info → accrete-0.0.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accrete
-Version: 0.0.58
+Version: 0.0.60
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.58.dist-info → accrete-0.0.60.dist-info}/RECORD

@@ -5,11 +5,13 @@ accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
 accrete/managers.py,sha256=CaIJLeBry4NYIXaVUrdUjp7zx4sEWgv-1-ssI1m-EOs,1156
-accrete/middleware.py,sha256=bUsvhdVdUlbqB-Hd5Y5w6WL8rO8It1VSGA5EZaEPA3o,3266
+accrete/middleware.py,sha256=IABs2pAV-kXjp3n5_Wsc7reXGjU5FhmCbvFB8cC4ZRM,3422
 accrete/models.py,sha256=grvRNXg0ZYAJU3KAIX-svuZXeXlfqP4qEJ00nlbV594,5145
+accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
-accrete/views.py,sha256=9-sgCFe_CyG-wllAcIOLujyueiq66C-zg0U7Uf5Y2wU,2954
+accrete/urls.py,sha256=goDFR-yhOlLLy7AMi9pmh2aBkxdtZtwXNg6mwI2zPhU,227
+accrete/views.py,sha256=fFvga5kniVYCV5J7PIYKPNK4EWAXX3I1eEw22y0A1_E,3432
 accrete/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/sequence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/sequence/admin.py,sha256=mTjab5cVklRUIQcSrsUo-_JgtXEsSdcFj_gfWhlStS4,273
@@ -37,7 +39,7 @@ accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,6
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
 accrete/contrib/ui/context.py,sha256=tb4x_G4VsIa1LKIWl-CvLVtEd_DCbrClA-0Wmnne9bc,8363
 accrete/contrib/ui/elements.py,sha256=0F5q0-XLdAWQjdYLMQt6RXqz4xPD_ECrhs0kcBfYkvo,1856
-accrete/contrib/ui/filter.py,sha256=L7sBpmk454kaSZIQXe9hNj1Xbna8hJ2P-YTvmM7T5FE,12243
+accrete/contrib/ui/filter.py,sha256=UAIkUNKu2nVQLafwZlkQu4PDfOPyFM61e_mE7OWRhYs,12410
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=TUBlz_CGs9InTZoxM78GSnucA73I8knoh_obt12RUHM,186
 accrete/contrib/ui/views.py,sha256=WpBKMsxFFG8eG4IN7TW_TPE6i3OFF7gnLDTK7JMKti8,191
@@ -220,7 +222,7 @@ accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
 accrete/utils/forms.py,sha256=Lll-DvAhKZDw72XeuCtb4wxQEJNFp7lQWh_Z1GyH3Zk,3049
 accrete/utils/http.py,sha256=mAtQRgADv7zu1_j7A-EKVyb-oqa5a21i4Gd0QfjzGV0,3540
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.58.dist-info/METADATA,sha256=uI3yeGaVRRZWlYA_BK6VrLY9dZpkpELDU4qRh5Xwxcs,4892
-accrete-0.0.58.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.58.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.58.dist-info/RECORD,,
+accrete-0.0.60.dist-info/METADATA,sha256=EmTPYxeLQvtOr0nPLX-AcCzbzJViET1tufDFhgqPfak,4892
+accrete-0.0.60.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.60.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.60.dist-info/RECORD,,