jobs: Import log files as they are when they are already compressed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 0d94f89f72fb85efed8f29759d84033324a0ffd4..f5fd608b80232eba008eb164c81cd5d0c597fbce 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -1042,7 +1042,14 @@ class Job(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                await self.backend.make_parent_directory(path)
 
                # Open the destination path
-               with gzip.open(path, "wb", compresslevel=9) as f:
+               f = open(path, "wb")
+
+               # If the upload was not compressed already, compress it
+               if not upload.extension == "gz":
+                       f = gzip.GzipFile(fileobj=f, compresslevel=9)
+
+               # Copy the payload
+               with f:
                        await upload.copyinto(f)
 
                # Store everything in the database

diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py
index 07de87159cddb8a4ea8201dc2a816d2e6406d239..7e827f4a62ff31e87126dd7f5f3a15c94111ce17 100644 (file)
--- a/src/buildservice/uploads.py
+++ b/src/buildservice/uploads.py
@@ -140,6 +140,14 @@ class Upload(database.Base, database.BackendMixin):
 
        filename = Column(Text, nullable=False)
 
+       # Extension
+
+       @property
+       def extension(self):
+               filename, ext = os.path.splitext(self.filename)
+
+               return ext.removeprefix(".")
+
        # Path
 
        path = Column(Text, nullable=False)