mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-01-24 06:18:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

renamed ObjectID.UIString to String

Browse Source
This commit is contained in:
Jarek Kowalski
2016-09-07 18:25:12 -07:00
parent c2ebbf539c
commit 00afa2dff6
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kopia/command_backup.go
View File

@@ -114,8 +114,8 @@ func runBackupCommand(context *kingpin.ParseContext) error {
return fmt.Errorf("cannot save manifest: %v", err)
}
log.Printf("Root: %v", manifest.RootObjectID.UIString())
log.Printf("Hash Cache: %v", manifest.HashCacheID.UIString())
log.Printf("Root: %v", manifest.RootObjectID.String())
log.Printf("Hash Cache: %v", manifest.HashCacheID.String())
log.Printf("Key: %v", handleID)
b, _ := json.MarshalIndent(&manifest, "", " ")

2
cmd/kopia/command_ls.go
View File

@@ -73,7 +73,7 @@ func listDirectory(prefix string, entries fs.Entries, longFormat bool) {
} else if objectID.TextContent != "" {
oid = "<inline text content>"
} else {
oid = objectID.UIString()
oid = objectID.String()
}
info = fmt.Sprintf(
"%v %9d %v %-"+maxNameLenString+"s %v",

8
fs/repofs/upload_test.go
View File

@@ -102,11 +102,11 @@ func TestUpload(t *testing.T) {
log.Printf("--------------------------")
if !objectIDsEqual(r2.ObjectID, r1.ObjectID) {
t.Errorf("expected r1.ObjectID==r2.ObjectID, got %v and %v", r1.ObjectID.UIString(), r2.ObjectID.UIString())
t.Errorf("expected r1.ObjectID==r2.ObjectID, got %v and %v", r1.ObjectID.String(), r2.ObjectID.String())
}
if !objectIDsEqual(r2.ManifestID, r1.ManifestID) {
t.Errorf("expected r2.ManifestID==r1.ManifestID, got %v and %v", r2.ManifestID.UIString(), r1.ManifestID.UIString())
t.Errorf("expected r2.ManifestID==r1.ManifestID, got %v and %v", r2.ManifestID.String(), r1.ManifestID.String())
}
if r1.Stats.CachedFiles+r1.Stats.CachedDirectories != 0 {
@@ -127,11 +127,11 @@ func TestUpload(t *testing.T) {
}
if objectIDsEqual(r2.ObjectID, r3.ObjectID) {
t.Errorf("expected r3.ObjectID!=r2.ObjectID, got %v", r3.ObjectID.UIString())
t.Errorf("expected r3.ObjectID!=r2.ObjectID, got %v", r3.ObjectID.String())
}
if objectIDsEqual(r2.ManifestID, r3.ManifestID) {
t.Errorf("expected r3.ManifestID!=r2.ManifestID, got %v", r3.ManifestID.UIString())
t.Errorf("expected r3.ManifestID!=r2.ManifestID, got %v", r3.ManifestID.String())
}
if r3.Stats.NonCachedFiles != 1 && r3.Stats.NonCachedDirectories != 3 {

8
repo/objectid.go
View File

@@ -51,7 +51,7 @@ type ObjectID struct {
// MarshalJSON emits ObjectID in standard string format.
func (oid *ObjectID) MarshalJSON() ([]byte, error) {
s := oid.UIString()
s := oid.String()
return json.Marshal(&s)
}
@@ -88,10 +88,10 @@ type HasObjectID interface {
inlineContentEncoding = base64.RawURLEncoding
)
// UIString returns string representation of ObjectID that is suitable for displaying in the UI.
// String returns string representation of ObjectID that is suitable for displaying in the UI.
//
// Note that the object ID name often contains its encryption key, which is sensitive and can be quite long (~100 characters long).
func (oid *ObjectID) UIString() string {
func (oid *ObjectID) String() string {
if oid.StorageBlock != "" {
var encryptionSuffix string
@@ -115,7 +115,7 @@ func (oid *ObjectID) UIString() string {
}
if oid.Section != nil {
return fmt.Sprintf("S%v,%v,%v", oid.Section.Start, oid.Section.Length, oid.Section.Base.UIString())
return fmt.Sprintf("S%v,%v,%v", oid.Section.Start, oid.Section.Length, oid.Section.Base.String())
}
return "B"

2
repo/objectid_test.go
View File

@@ -68,7 +68,7 @@ func TestParseObjectIDEncryptionInfo(t *testing.T) {
t.Errorf("invalid encryption key for %v: %x, expected: %x", c.objectID, actual, c.expected)
}
uiString := objectID.UIString()
uiString := objectID.String()
if uiString != c.objectID {
t.Errorf("invalid object ID string: %v: expected: %v", uiString, c.objectID)
}

10
repo/repository_test.go
View File

@@ -84,14 +84,14 @@ func TestWriters(t *testing.T) {
result, err := writer.Result(false)
if err != nil {
t.Errorf("error getting writer results for %v, expected: %v", c.data, c.objectID.UIString())
t.Errorf("error getting writer results for %v, expected: %v", c.data, c.objectID.String())
continue
}
repo.Flush()
if !objectIDsEqual(result, c.objectID) {
t.Errorf("incorrect result for %v, expected: %v got: %v %#v", c.data, c.objectID.UIString(), result.UIString(), result.BinaryContent)
t.Errorf("incorrect result for %v, expected: %v got: %v %#v", c.data, c.objectID.String(), result.String(), result.BinaryContent)
}
if c.objectID.StorageBlock == "" {
@@ -132,7 +132,7 @@ func verifyIndirectBlock(t *testing.T, r *Repository, oid ObjectID) {
rd, err := r.Open(direct)
if err != nil {
t.Errorf("unable to open %v: %v", oid.UIString(), err)
t.Errorf("unable to open %v: %v", oid.String(), err)
return
}
defer rd.Close()
@@ -210,7 +210,7 @@ func TestHMAC(t *testing.T) {
w := repo.NewWriter()
w.Write(content)
result, err := w.Result(false)
if result.UIString() != "D697eaf0aca3a3aea3a75164746ffaa79" {
if result.String() != "D697eaf0aca3a3aea3a75164746ffaa79" {
t.Errorf("unexpected result: %v err: %v", result, err)
}
}
@@ -475,7 +475,7 @@ func TestFormats(t *testing.T) {
t.Errorf("error: %v", err)
}
if !objectIDsEqual(oid, v) {
t.Errorf("invalid oid for #%v %v/%v:\ngot:\n%#v\nexpected:\n%#v", caseIndex, c.format.ObjectFormat, k, oid.UIString(), v.UIString())
t.Errorf("invalid oid for #%v %v/%v:\ngot:\n%#v\nexpected:\n%#v", caseIndex, c.format.ObjectFormat, k, oid.String(), v.String())
}
rc, err := repo.Open(oid)