devilry 6.3.2__tar.gz → 6.3.4__tar.gz

{devilry-6.3.2 → devilry-6.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: devilry
-Version: 6.3.2
+Version: 6.3.4
 Summary: A system for handling electronic deliveries. See https://github.com/devilry/devilry-django.
 Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth, Åsmund J. Rosendahl
 Author-email: Espen Angell Kristiansen <post@appresso.no>

devilry-6.3.4/devilry/__init__.py

@@ -0,0 +1 @@
+__version__ = '6.3.4'

{devilry-6.3.2 → devilry-6.3.4}/devilry/devilry_admin/tasks.py

@@ -27,7 +27,7 @@ class AssignmentCompressAction(AbstractBaseBatchAction, AssignmentBatchMixin):
 
         # Create name for the actual archive
         from django.utils import timezone
-        archive_name = '{}.{}.{}.{}.zip'.format(
+        archive_name = '{}.{}.{}.{}'.format(
             assignment.subject.short_name,
             assignment.period.short_name,
             assignment.short_name,

{devilry-6.3.2 → devilry-6.3.4}/devilry/devilry_compressionutil/models.py

@@ -1,4 +1,5 @@
 # Django imports
+import logging
 import typing
 from wsgiref.util import FileWrapper
 from django import http
@@ -18,6 +19,8 @@ from devilry.devilry_compressionutil import backend_registry
 if typing.TYPE_CHECKING:
     from devilry.devilry_compressionutil.backends.backends_base import BaseArchiveBackend
 
+logger = logging.getLogger(__name__)
+
 
 class GenericMeta(models.Model):
     """
@@ -177,13 +180,36 @@ class CompressedArchiveMeta(GenericMeta):
 
     def make_download_httpresponse(self) -> HttpResponseBase:
         archive_backend = self.get_archive_backend()
-        filewrapper = FileWrapper(archive_backend.open_read_binary())
-        response = http.StreamingHttpResponse(
-            filewrapper, content_type=archive_backend.get_content_type())
-        response['content-disposition'] = 'attachment; filename={}'.format(
-            archive_backend.archive_name.encode('ascii', 'replace').decode()
+        archive_name = archive_backend.archive_name
+
+        class LoggingFileWrapper(FileWrapper):
+            def __next__(self):
+                logger.debug("Archive %s: Reading chunk %d (blksize=%s)", archive_name, self._devilry_chunk_number, self.blksize)
+                self._devilry_chunk_number += 1
+                return super().__next__()
+
+            def __iter__(self):
+                self._devilry_chunk_number = 0
+                return super().__iter__()
+
+        class LoggingStreamingHttpResponse(http.StreamingHttpResponse):
+            def __iter__(self):
+                chunk_number = 0
+                for chunk in super().__iter__():
+                    logger.debug("Archive %s: Writing chunk %d", archive_name, chunk_number)
+                    chunk_number += 1
+                    yield chunk
+
+
+        logger.debug("Archive %s: initializing", archive_name)
+        filewrapper = LoggingFileWrapper(archive_backend.open_read_binary())
+        response = LoggingStreamingHttpResponse(filewrapper, content_type=archive_backend.get_content_type())
+        response["content-disposition"] = "attachment; filename={}".format(
+            archive_name.encode("ascii", "replace").decode()
         )
-        response['content-length'] = str(archive_backend.archive_size())
+        logger.debug("Archive %s: getting archive size", archive_name)
+        response["content-length"] = str(archive_backend.archive_size())
+        logger.debug("Archive %s: returning response", archive_name)
         return response
 
 

{devilry-6.3.2 → devilry-6.3.4}/devilry/devilry_dataporten_allauth/callback.py

@@ -36,7 +36,7 @@ class DevilryOAuth2CallbackView(OAuth2View):
                 self.adapter.provider_id,
                 error=error)
         app = self.adapter.get_provider().app
-        client = self.get_client(request, app)
+        client = self.adapter.get_client(request, app)
         try:
             access_token = client.get_access_token(request.GET['code'])
             token = self.adapter.parse_token(access_token)

{devilry-6.3.2 → devilry-6.3.4}/devilry/devilry_examiner/tasks.py

@@ -31,7 +31,7 @@ class AssignmentCompressAction(AbstractBaseBatchAction, AssignmentBatchMixin):
 
         # Create name for the actual archive
         from django.utils import timezone
-        archive_name = '{}.{}.{}.{}.zip'.format(
+        archive_name = '{}.{}.{}.{}'.format(
             assignment.subject.short_name,
             assignment.period.short_name,
             assignment.short_name,

{devilry-6.3.2 → devilry-6.3.4}/devilry/project/develop/settings/base.py

@@ -136,3 +136,8 @@ LOGGING = create_logging_config(
     request_loglevel="DEBUG",
     storages_loglevel="WARNING",  # Set to DEBUG to debug S3 stuff
 )
+# LOGGING["loggers"]["devilry.devilry_compressionutil.models"] = {
+#     'handlers': ['stderr'],
+#     'level': "DEBUG",
+#     'propagate': False
+# }

{devilry-6.3.2 → devilry-6.3.4}/pyproject.toml

@@ -102,7 +102,42 @@ exclude = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "6.3.2"
+version = "6.3.4"
 version_files = ["devilry/__init__.py:__version__"]
 tag_format = "$version"
 update_changelog_on_bump = true
+
+
+[tool.black]
+line-length = 120
+
+[tool.isort]
+profile = "black"
+line_length = 120
+
+
+[tool.basedpyright]
+typeCheckingMode = "standard"
+# typeCheckingMode = "basic"
+
+reportMissingImports = true
+reportMissingTypeStubs = false
+reportMissingTypeArgument = false
+reportAny = false
+reportImplicitOverride = false
+reportUnknownParameterType = false
+reportUnknownArgumentType = false
+reportUnknownVariableType = false
+reportUnknownMemberType = false
+reportMissingParameterType = false
+reportUnusedCallResult = false
+reportOperatorIssue = "warning"
+reportDeprecated = "warning"
+reportImplicitStringConcatenation = false
+reportIndexIssue = "warning"
+reportInvalidCast = "warning"
+reportAttributeAccessIssue = "warning"
+reportIncompatibleVariableOverride = "warning"
+
+pythonVersion = "3.10"
+pythonPlatform = "Linux"

devilry-6.3.2/devilry/__init__.py

@@ -1 +0,0 @@
-__version__ = '6.3.2'