djgentelella 0.5.6__py3-none-any.whl → 0.5.7__py3-none-any.whl

djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.5.6'
+__version__ = '0.5.7'
 
 if __name__ == '__main__':
     print(__version__)

djgentelella/chunked_upload/constants.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 
 class http_status:

djgentelella/chunked_upload/utils.py

@@ -0,0 +1,47 @@
+"""
+Utility functions for chunked upload management.
+"""
+from django.utils import timezone
+
+from djgentelella.chunked_upload.constants import UPLOADING, COMPLETE
+from djgentelella.models import ChunkedUpload
+from djgentelella.settings import EXPIRATION_DELTA
+
+
+def get_expired_uploads():
+    """
+    Get queryset of chunked uploads that have expired.
+
+    Returns:
+        QuerySet: ChunkedUpload objects that have expired.
+    """
+    return ChunkedUpload.objects.filter(
+        created_on__lt=(timezone.now() - EXPIRATION_DELTA)
+    )
+
+
+def delete_expired_uploads(exclude_ids=None):
+    """
+    Delete chunked uploads that have already expired.
+
+    Args:
+        exclude_ids: Optional list of upload IDs to exclude from deletion.
+
+    Returns:
+        dict: A dictionary with 'complete' and 'uploading' keys containing
+              the count of deleted uploads for each status.
+    """
+    count = {UPLOADING: 0, COMPLETE: 0}
+    qs = get_expired_uploads()
+
+    if exclude_ids:
+        qs = qs.exclude(id__in=exclude_ids)
+
+    for chunked_upload in qs:
+        count[chunked_upload.status] += 1
+        chunked_upload.delete()
+
+    return {
+        'complete': count[COMPLETE],
+        'uploading': count[UPLOADING],
+    }

djgentelella/management/commands/delete_expired_uploads.py

@@ -1,48 +1,58 @@
-from optparse import make_option
-
-from chunked_upload.constants import UPLOADING, COMPLETE
-from chunked_upload.models import ChunkedUpload
-from chunked_upload.settings import EXPIRATION_DELTA
 from django.core.management.base import BaseCommand
-from django.utils import timezone
-from django.utils.translation import ugettext as _
 
-prompt_msg = _(u'Do you want to delete {obj}?')
+from djgentelella.chunked_upload.constants import UPLOADING, COMPLETE
+from djgentelella.chunked_upload.utils import get_expired_uploads, delete_expired_uploads
 
 
 class Command(BaseCommand):
-    # Has to be a ChunkedUpload subclass
-    model = ChunkedUpload
-
     help = 'Deletes chunked uploads that have already expired.'
 
-    option_list = BaseCommand.option_list + (
-        make_option('--interactive',
-                    action='store_true',
-                    dest='interactive',
-                    default=False,
-                    help='Prompt confirmation before each deletion.'),
-    )
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--interactive',
+            action='store_true',
+            dest='interactive',
+            default=False,
+            help='Prompt confirmation before each deletion.',
+        )
 
     def handle(self, *args, **options):
         interactive = options.get('interactive')
 
+        if interactive:
+            result = self._handle_interactive()
+        else:
+            result = delete_expired_uploads()
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"{result['complete']} complete uploads were deleted."
+            )
+        )
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"{result['uploading']} incomplete uploads were deleted."
+            )
+        )
+
+    def _handle_interactive(self):
+        """Handle interactive deletion with user confirmation."""
         count = {UPLOADING: 0, COMPLETE: 0}
-        qs = self.model.objects.all()
-        qs = qs.filter(created_on__lt=(timezone.now() - EXPIRATION_DELTA))
+        exclude_ids = []
 
-        for chunked_upload in qs:
-            if interactive:
-                prompt = prompt_msg.format(obj=chunked_upload) + u' (y/n): '
+        for chunked_upload in get_expired_uploads():
+            prompt = f'Do you want to delete {chunked_upload}? (y/n): '
+            answer = input(prompt).lower()
+            while answer not in ('y', 'n'):
                 answer = input(prompt).lower()
-                while answer not in ('y', 'n'):
-                    answer = input(prompt).lower()
-                if answer == 'n':
-                    continue
 
-            count[chunked_upload.status] += 1
-            # Deleting objects individually to call delete method explicitly
-            chunked_upload.delete()
+            if answer == 'n':
+                exclude_ids.append(chunked_upload.id)
+            else:
+                count[chunked_upload.status] += 1
+                chunked_upload.delete()
 
-        print('%i complete uploads were deleted.' % count[COMPLETE])
-        print('%i incomplete uploads were deleted.' % count[UPLOADING])
+        return {
+            'complete': count[COMPLETE],
+            'uploading': count[UPLOADING],
+        }

djgentelella/migrations/0018_alter_chunkedupload_status.py

@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='chunkedupload',
             name='status',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Subiendo'), (2, 'Completo')], default=1),
+            field=models.PositiveSmallIntegerField(choices=[(1, 'Uploading'), (2, 'Complete')], default=1),
         ),
     ]