mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-23 16:26:11 +00:00
Code Issues Releases Wiki Activity

find: use Str() to format short ids

Browse source
This commit is contained in:
Michael Eischer 2021-05-15 23:08:15 +02:00
parent 38ccddc84f
commit 5a87a0ba0a
1 changed files with 3 additions and 5 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
} }
} }