amorfo77/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-08-25 15:03:17 +00:00
Code Issues Projects Releases Wiki Activity

Rework index decode and handling old format

Browse Source
This commit is contained in:
Alexander Neumann
2015-10-12 20:53:07 +02:00
parent 356bb62243
commit eb73182fcf
8 changed files with 180 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/repository.go
+8 -14
View File
@@ -579,14 +579,14 @@ func (r *Repository) LoadIndex() error {
// LoadIndex loads the index id from backend and returns it.
func LoadIndex(repo *Repository, id string) (*Index, error) {
idx, err := loadIndex(repo, id, false)
idx, err := LoadIndexWithDecoder(repo, id, DecodeIndex)
if err == nil {
return idx, nil
}
if err == ErrOldIndexFormat {
fmt.Fprintf(os.Stderr, "index %v has old format\n", id)
return loadIndex(repo, id, true)
fmt.Fprintf(os.Stderr, "index %v has old format\n", id[:10])
return LoadIndexWithDecoder(repo, id, DecodeOldIndex)
}
return nil, err
@@ -632,8 +632,9 @@ func (r *Repository) GetDecryptReader(t backend.Type, id string) (io.ReadCloser,
return newDecryptReadCloser(r.key, rd)
}
func loadIndex(repo *Repository, id string, oldFormat bool) (*Index, error) {
debug.Log("loadIndex", "Loading index %v", id[:8])
// LoadIndexWithDecoder loads the index and decodes it with fn.
func LoadIndexWithDecoder(repo *Repository, id string, fn func(io.Reader) (*Index, error)) (*Index, error) {
debug.Log("LoadIndexWithDecoder", "Loading index %v", id[:8])
rd, err := repo.GetDecryptReader(backend.Index, id)
if err != nil {
@@ -641,16 +642,9 @@ func loadIndex(repo *Repository, id string, oldFormat bool) (*Index, error) {
}
defer rd.Close()
var idx *Index
if !oldFormat {
idx, _, err = DecodeIndex(rd)
} else {
idx, _, err = DecodeOldIndex(rd)
}
idx, err := fn(rd)
if err != nil {
debug.Log("loadIndex", "error while decoding index %v: %v", id, err)
debug.Log("LoadIndexWithDecoder", "error while decoding index %v: %v", id, err)
return nil, err
}