django-pfx 1.4.dev160__tar.gz → 1.4.dev164__tar.gz

{django_pfx-1.4.dev160 → django_pfx-1.4.dev164}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev160
+Version: 1.4.dev164
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev160 → django_pfx-1.4.dev164}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev160
+Version: 1.4.dev164
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev160 → django_pfx-1.4.dev164}/pfx/pfxcore/models/ordered_model_mixin.py

@@ -41,11 +41,13 @@ class OrderedModelMixin(models.Model):
 
     @property
     def _order_max(self):
-        return self._order_qs.aggregate(Max('seq'))['seq__max']
+        return self._order_qs.exclude(
+            pk=self.pk).aggregate(Max('seq'))['seq__max']
 
     @property
     def _order_min(self):
-        return self._order_qs.aggregate(Min('seq'))['seq__min']
+        return self._order_qs.exclude(
+            pk=self.pk).aggregate(Min('seq'))['seq__min']
 
     @property
     def _order_default(self):

{django_pfx-1.4.dev160 → django_pfx-1.4.dev164}/pfx/pfxcore/storage/local_storage.py

@@ -24,7 +24,13 @@ class LocalStorage:
         relative_path = Path(*key_list[:-1])
         dirname = Path(settings.STORAGE_LOCAL_ROOT, relative_path)
         dirname.mkdir(parents=True, exist_ok=True)
-        ext = ''.join(filename.partition('.')[-2:])
+        suffixes = Path(filename).suffixes
+        if not suffixes:
+            ext = ''
+        elif suffixes[-1] in ['gz', 'bz2'] and len(suffixes) > 1:
+            ext = ''.join(suffixes[-2:])
+        else:
+            ext = suffixes[-1]
         hashname = f'{hashlib.sha1(file).hexdigest()}{ext}'
         final_key = str(Path(relative_path, hashname))
         with open(Path(dirname, hashname), 'wb') as f: