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

Reduce dir depth for trees and data by one

This commit is contained in:
Alexander Neumann 2014-12-01 00:52:12 +01:00
parent bd4a5ca687
commit 4b6c7f1584
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/local.go
View File

@ -167,14 +167,14 @@ func (b *Local) dirname(t Type, id ID) string {
case Data:
n = dataPath
if id != nil {
n = filepath.Join(dataPath, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%02x", id[1]))
n = filepath.Join(dataPath, fmt.Sprintf("%02x", id[0]))
}
case Snapshot:
n = snapshotPath
case Tree:
n = treePath
if id != nil {
n = filepath.Join(treePath, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%02x", id[1]))
n = filepath.Join(treePath, fmt.Sprintf("%02x", id[0]))
}
case Map:
n = mapPath
@ -289,7 +289,7 @@ func (b *Local) List(t Type) (IDs, error) {
// TODO: use os.Open() and d.Readdirnames() instead of Glob()
var pattern string
if t == Data || t == Tree {
pattern = filepath.Join(b.dirname(t, nil), "*", "*", "*")
pattern = filepath.Join(b.dirname(t, nil), "*", "*")
} else {
pattern = filepath.Join(b.dirname(t, nil), "*")
}

22
backend/sftp.go
View File

@ -275,14 +275,14 @@ func (r *SFTP) dirname(t Type, id ID) string {
case Data:
n = dataPath
if id != nil {
n = filepath.Join(dataPath, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%02x", id[1]))
n = filepath.Join(dataPath, fmt.Sprintf("%02x", id[0]))
}
case Snapshot:
n = snapshotPath
case Tree:
n = treePath
if id != nil {
n = filepath.Join(treePath, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%02x", id[1]))
n = filepath.Join(treePath, fmt.Sprintf("%02x", id[0]))
}
case Map:
n = mapPath
@ -408,23 +408,15 @@ func (r *SFTP) List(t Type) (IDs, error) {
return nil, err
}
for _, dir1 := range list1 {
// read second level
list2, err := r.c.ReadDir(filepath.Join(basedir, dir1.Name()))
// read files
for _, dir := range list1 {
entries, err := r.c.ReadDir(filepath.Join(basedir, dir.Name()))
if err != nil {
return nil, err
}
// read files
for _, dir2 := range list2 {
entries, err := r.c.ReadDir(filepath.Join(basedir, dir1.Name(), dir2.Name()))
if err != nil {
return nil, err
}
for _, entry := range entries {
list = append(list, entry)
}
for _, entry := range entries {
list = append(list, entry)
}
}
} else {