mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3402 from MichaelEischer/misc-fixes 

Various small code cleanups
This commit is contained in:
rawtaz 2021-05-24 11:30:31 +02:00 committed by GitHub
parent 2daf033156 cf92c58460
commit fdbd65485e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/restic/cmd_find.go
View File

@ -40,8 +40,6 @@ Exit status is 0 if the command was successful, and non-zero if there was any er
}, },
} }
const shortStr = 8 // Length of short IDs: 4 bytes as hex strings
// FindOptions bundles all options for the find command. // FindOptions bundles all options for the find command.
type FindOptions struct { type FindOptions struct {
Oldest string Oldest string
@ -386,12 +384,12 @@ func (f *Finder) findIDs(ctx context.Context, sn *restic.Snapshot) error {
idStr := id.String() idStr := id.String()
if _, ok := f.blobIDs[idStr]; !ok { if _, ok := f.blobIDs[idStr]; !ok {
// Look for short ID form // Look for short ID form
if _, ok := f.blobIDs[idStr[:shortStr]]; !ok { if _, ok := f.blobIDs[id.Str()]; !ok {
continue continue
} }
// Replace the short ID with the long one // Replace the short ID with the long one
f.blobIDs[idStr] = struct{}{} f.blobIDs[idStr] = struct{}{}
delete(f.blobIDs, idStr[:shortStr]) delete(f.blobIDs, id.Str())
} }
f.out.PrintObject("blob", idStr, nodepath, parentTreeID.String(), sn) f.out.PrintObject("blob", idStr, nodepath, parentTreeID.String(), sn)
} }
@ -423,7 +421,7 @@ func (f *Finder) packsToBlobs(ctx context.Context, packs []string) error {
idStr := id.String() idStr := id.String()
if _, ok := packIDs[idStr]; !ok { if _, ok := packIDs[idStr]; !ok {
// Look for short ID form // Look for short ID form
if _, ok := packIDs[idStr[:shortStr]]; !ok { if _, ok := packIDs[id.Str()]; !ok {
return nil return nil
} }
} }

2
internal/backend/azure/config.go
View File

@ -16,7 +16,7 @@ type Config struct {
Container string Container string
Prefix string Prefix string
Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 20)"` Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 5)"`
} }
// NewConfig returns a new Config with the default values filled in. // NewConfig returns a new Config with the default values filled in.

2
internal/backend/gs/config.go
View File

@ -16,7 +16,7 @@ type Config struct {
Bucket string Bucket string
Prefix string Prefix string
Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 20)"` Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 5)"`
} }
// NewConfig returns a new Config with the default values filled in. // NewConfig returns a new Config with the default values filled in.

5
internal/restic/readerat.go
View File

@ -35,10 +35,9 @@ func ReadAt(ctx context.Context, be Backend, h Handle, offset int64, p []byte) (
return ierr return ierr
}) })
if err != nil { if err != nil {
return 0, err return 0, errors.Wrapf(err, "ReadFull(%v)", h)
} }
debug.Log("ReadAt(%v) ReadFull returned %v bytes", h, n) debug.Log("ReadAt(%v) ReadFull returned %v bytes", h, n)
return n, nil
return n, errors.Wrapf(err, "ReadFull(%v)", h)
} }