fixup! feat(handler): add multi-part gzip handler.

qkaiser · qkaiser · commit 47b2fac63dbf · 2024-01-04T15:57:32.000+01:00
diff --git a/tests/integration/compression/gzip/__input__/multi-volume-split-then-gzip.tar b/tests/integration/compression/gzip/__input__/multi-volume-split-then-gzip.tar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85481ea8c4c48236a25304d337d0b3f10900aac26194d15bba913bec90d18c3a
+oid sha256:7a329453dfdaf817fa1ff384227575bedc18a5d8ca6c014132dc77ac6849be2d
 size 10240
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7decfa608a7decfc2ab1600ee52707caff556bd911dd6d8613baa43ac38b618
-size 49
+oid sha256:ef248dcb11bd9196aeff4f075ec6f10dd44f46d66c4d827a0a07f3b1ede03af6
+size 35
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa_extract/one.txt.aa b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa_extract/one.txt.aa
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b2dadf5e5ed42b7e146a8eb24f3cba3593b579198a4d06e343c87c31454181e
-size 49
+oid sha256:3813261d2ae514bc31593c166c53391312d07507a5c952b9d7b059a809ec747a
+size 38
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab_extract/one.txt.ab b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab_extract/one.txt.ab
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97aa0d8b4b0aedef85fb1c6b902da2ea3dcf57ea94045e396b6dac68d796ffe8
+oid sha256:7f0d4cd80a4203aef29742919f572c9624660864bdb8bd87eb2050575829f386
 size 38
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac_extract/one.txt.ac b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac_extract/one.txt.ac
diff --git a/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz_extract/one.txt b/tests/integration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz_extract/one.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7705c86fc28729ea1f35b4453760a85b5b4e100e64b346d3dd13b9dd9da8f6f
+size 21
diff --git a/unblob/handlers/compression/gzip.py b/unblob/handlers/compression/gzip.py
@@ -174,11 +174,7 @@ def calculate_multifile(self, file: Path) -> Optional[MultiFile]:
         if file != paths[0]:
             return None
 
-        valid_gzips = sum([self.is_valid_gzip(path) for path in paths])
-
-        # the presence of multiple valid gzips with the same stem would mean each volume
-        # is independently compressed.
-        if valid_gzips == 1:
+        if self.is_valid_gzip(file):
             files_size = sum(path.stat().st_size for path in paths)
             logger.debug(
                 "Multi-volume files", paths=paths, files_size=files_size, _verbosity=2

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:b7705c86fc28729ea1f35b4453760a85b5b4e100e64b346d3dd13b9dd9da8f6f`
	`3`	`+size 21`