From 2835b35221cb831c4836531204d96e3c5c2d4b13 Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Thu, 23 Sep 2021 12:15:49 +0200 Subject: use repo wrappers for files and recipe --- repo.go | 8 ++++---- testdata/repo_8k_zlib/00000/files | Bin 379 -> 275 bytes testdata/repo_8k_zlib/00000/recipe | Bin 6783 -> 2638 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repo.go b/repo.go index e5a73ec..5746f0f 100644 --- a/repo.go +++ b/repo.go @@ -346,11 +346,11 @@ func (r *Repo) storeFileList(version int, list []File) { dest := filepath.Join(r.path, fmt.Sprintf(versionFmt, version), filesName) delta := slice.Diff(fileList2slice(r.files), fileList2slice(list)) logger.Infof("files delta %s", delta.String()) - storeBasicStruct(dest, utils.NopWriteWrapper, delta) + storeBasicStruct(dest, r.chunkWriteWrapper, delta) } func (r *Repo) loadFileLists(versions []string) { - r.files = slice2fileList(r.loadDeltas(versions, utils.NopReadWrapper, filesName)) + r.files = slice2fileList(r.loadDeltas(versions, r.chunkReadWrapper, filesName)) } func (r *Repo) storageWorker(version int, storeQueue <-chan chunkData, end chan<- bool) { @@ -714,11 +714,11 @@ func (r *Repo) storeRecipe(version int, recipe []Chunk) { dest := filepath.Join(r.path, fmt.Sprintf(versionFmt, version), recipeName) delta := slice.Diff(recipe2slice(r.recipe), recipe2slice(recipe)) logger.Infof("recipe delta %s", delta.String()) - storeBasicStruct(dest, utils.NopWriteWrapper, delta) + storeBasicStruct(dest, r.chunkWriteWrapper, delta) } func (r *Repo) loadRecipes(versions []string) { - recipe := slice2recipe(r.loadDeltas(versions, utils.NopReadWrapper, recipeName)) + recipe := slice2recipe(r.loadDeltas(versions, r.chunkReadWrapper, recipeName)) for _, c := range recipe { if rc, isRepo := c.(RepoChunk); isRepo { rc.SetRepo(r) diff --git a/testdata/repo_8k_zlib/00000/files b/testdata/repo_8k_zlib/00000/files index 56431d4..70ca423 100644 Binary files a/testdata/repo_8k_zlib/00000/files and b/testdata/repo_8k_zlib/00000/files differ diff --git a/testdata/repo_8k_zlib/00000/recipe b/testdata/repo_8k_zlib/00000/recipe index 66bde3d..d8c788b 100644 Binary files a/testdata/repo_8k_zlib/00000/recipe and b/testdata/repo_8k_zlib/00000/recipe differ -- cgit v1.2.3