define name of gob registered structs

also store uncompressed delta for now and add wrapper parameter

3 files changed, 7 insertions, 7 deletions

diff --git a/repo.go b/repo.go
index 7bcd355..7f9cf3a 100644
--- a/repo.go
+++ b/repo.go
@@ -51,9 +51,9 @@ import (
 
 func init() {
 	// register chunk structs for encoding/decoding using gob
-	gob.Register(&StoredChunk{})
-	gob.Register(&TempChunk{})
-	gob.Register(&DeltaChunk{})
+	gob.RegisterName("*dna-backup.StoredChunk", &StoredChunk{})
+	gob.RegisterName("*dna-backup.TempChunk", &TempChunk{})
+	gob.RegisterName("*dna-backup.DeltaChunk", &DeltaChunk{})
 }
 
 type FingerprintMap map[uint64]*ChunkId
@@ -297,11 +297,11 @@ func loadBasicStruct(path string, wrapper utils.ReadWrapper, obj interface{}) {
 	}
 }
 
-func (r *Repo) loadDeltas(versions []string, name string) (ret slice.Slice) {
+func (r *Repo) loadDeltas(versions []string, wrapper utils.ReadWrapper, name string) (ret slice.Slice) {
 	for _, v := range versions {
 		path := filepath.Join(v, name)
 		var delta slice.Delta
-		loadBasicStruct(path, utils.ZlibReader, &delta)
+		loadBasicStruct(path, wrapper, &delta)
 		ret = slice.Patch(ret, delta)
 	}
 	return
@@ -681,11 +681,11 @@ func slice2recipe(s slice.Slice) (ret []Chunk) {
 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))
-	storeBasicStruct(dest, utils.ZlibWriter, delta)
+	storeBasicStruct(dest, utils.NopWriteWrapper, delta)
 }
 
 func (r *Repo) loadRecipes(versions []string) {
-	recipe := slice2recipe(r.loadDeltas(versions, recipeName))
+	recipe := slice2recipe(r.loadDeltas(versions, utils.NopReadWrapper, recipeName))
 	for _, c := range recipe {
 		if rc, isRepo := c.(RepoChunk); isRepo {
 			rc.SetRepo(r)
diff --git a/testdata/repo_8k/00000/recipe b/testdata/repo_8k/00000/recipe
index 8e91b3b..66bde3d 100644
--- a/testdata/repo_8k/00000/recipe
+++ b/testdata/repo_8k/00000/recipe
diff --git a/testdata/repo_8k_zlib/00000/recipe b/testdata/repo_8k_zlib/00000/recipe
index 8e91b3b..66bde3d 100644
--- a/testdata/repo_8k_zlib/00000/recipe
+++ b/testdata/repo_8k_zlib/00000/recipe