vocker 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

vocker/repo/io.py

@@ -236,6 +236,15 @@ class RepoTransfer:
             req = self.make_manifest_link_request(digest, destination, dict(open_file_once=_open))
             self.dedup.run_batch([req])
 
+        if not reader.parser.eof:
+            # We skipped the download because we found cached content, so we need to feed the
+            # remaining cached content into the parser.
+            with destination.open("rb") as file:
+                file.seek(reader.input_position)
+                while block := file.read(65536):
+                    _feed(block)
+            _feed(None)
+
         return digest, reader.out_verified_data
 
     @staticmethod
@@ -664,6 +673,10 @@ class ManifestNodeReader:
 
         self.out_verified_data = ManifestNode.from_cbor_decoded(hf, cbor2.loads(bytes(q2)))
 
+    @property
+    def input_position(self) -> int:
+        return self.parser.position + len(self.parser.queue)
+
     @classmethod
     def from_bytes(cls, data):
         (self := cls()).parser.feed(data).feed(None)

vocker/system.py

@@ -169,15 +169,15 @@ class UpdatingLocalRepository:
         def p(suffix):
             return path.with_name(path.name + suffix)
 
-        # compress contents directly to zstandard
-        with self.open(p(".zst"), "wb") as f1, cx.open_compressor(f1, "zst") as f:
+        # compress contents directly to xz
+        with self.open(p(".xz"), "wb") as f1, cx.open_compressor(f1, "xz") as f:
             yield f
 
-        # compress to xz as well
-        with self.open(p(".zst"), "rb") as fr1, cx.open_decompressor(fr1, "zst") as fr, self.open(
-            p(".xz"), "wb"
-        ) as fw1, cx.open_compressor(fw1, "xz") as fw:
-            shutil.copyfileobj(fr, fw)
+        # # compress to zst as well
+        # with self.open(p(".xz"), "rb") as fr1, cx.open_decompressor(fr1, "xz") as fr, self.open(
+        #     p(".zst"), "wb"
+        # ) as fw1, cx.open_compressor(fw1, "zst") as fw:
+        #     shutil.copyfileobj(fr, fw)
 
     def iterdir(self, path: PurePath):
         raise NotImplementedError("not needed yet")
@@ -579,7 +579,7 @@ class System:
                 with u.open(archive_path / "h.bin", "wb") as f:
                     rio.HashesWriter(f).write_all(h for h in archive_digests)
 
-                archive_size = u.get_path_for_open(archive_path / "a.zst", "wb").stat().st_size
+                archive_size = u.get_path_for_open(archive_path / "a.xz", "wb").stat().st_size
 
                 shard_path = u.id_to_path("shard", (shard_id := u.allocate_id("shard")))
                 with u.open_for_write_multi_compressed(shard_path / "p") as f:
@@ -608,7 +608,7 @@ class System:
             with u.open_for_write_multi_compressed(img_path / "u") as f:
                 rio.cbor_dump({"image_type": image_type.value}, f)
 
-            with u.open(img_path / "u.zst", "rb") as f1, cx.open_decompressor(f1, "zst") as f:
+            with u.open(img_path / "u.xz", "rb") as f1, cx.open_decompressor(f1, "xz") as f:
                 hasher = hf()
                 while b := f.read(65536):
                     hasher.update(b)

{vocker-0.3.0.dist-info → vocker-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vocker
-Version: 0.3.0
+Version: 0.3.2
 Summary: Docker-like manager for virtualenvs
 Author-email: Eduard Christian Dumitrescu <eduard.c.dumitrescu@gmail.com>
 License: General Public License v3

{vocker-0.3.0.dist-info → vocker-0.3.2.dist-info}/RECORD

@@ -7,13 +7,13 @@ vocker/image.py,sha256=lewNLLiXnd_N1CSs4gnYFEj-d5RkIBiPQiN8hNL2fIs,28181
 vocker/integer_to_path.py,sha256=5ghlupk9VLzXLtcfwnVEVFxtBxyT8A_ooV8-2EAnoFw,1433
 vocker/multihash.py,sha256=-VhksUBam6N01fICtTg_TJrJcEIHJrYVKzkD1B_bdfI,8760
 vocker/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vocker/system.py,sha256=v3ONv335EqDdCzne--ybTZPdHgUZ_kRKhzCALXjrcFw,25728
+vocker/system.py,sha256=fX3By0_MqC705T1IdmkxAY4FM6VaY8x6FdegB6a8-dM,25727
 vocker/util.py,sha256=1Escs1FSrzrTy3Rzhn9r41K75KTt9VjQV91iT3P_FyI,3275
 vocker/util_models.py,sha256=2bN5eousF92oH7BAv1ZFoyh6iqNAnJ_niiclp2_RaHI,395
 vocker/repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vocker/repo/compression.py,sha256=l2g1e6SaugpqORbg3zwRM1zwlEXedbYOihm5nDpCejU,6442
-vocker/repo/io.py,sha256=Juzt7vHjfd-H36tWpdYZNh7ucf-h0bC7_WwZ46liNx0,25614
-vocker-0.3.0.dist-info/METADATA,sha256=a7Qhq98kbIQe8sQfef7xl5S3dXZUN54Hx0snel0MTW4,3835
-vocker-0.3.0.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-vocker-0.3.0.dist-info/top_level.txt,sha256=5x7g7T2L44UKODxVZ4vmWjxDnnruxaZ5yloYi0wLoUg,7
-vocker-0.3.0.dist-info/RECORD,,
+vocker/repo/io.py,sha256=tcv87DqGqmLAJ7Y0QHTzdQxjH7owwLfhZrNKDACFL_k,26116
+vocker-0.3.2.dist-info/METADATA,sha256=aqR8I2BiQiImrx-2pUmO_hpFtUJg6R6yj4F5zma_Qmk,3835
+vocker-0.3.2.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+vocker-0.3.2.dist-info/top_level.txt,sha256=5x7g7T2L44UKODxVZ4vmWjxDnnruxaZ5yloYi0wLoUg,7
+vocker-0.3.2.dist-info/RECORD,,