octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-06-13 22:32:21 +00:00
Code Issues Releases Wiki Activity

layout: prepare use for REST backend

Browse Source
This commit is contained in:
Alexander Neumann 2017-04-11 21:28:31 +02:00
parent 5eaa51eeff
commit 7f3bcdb4cc
3 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/restic/backend/layout_cloud.go
View File

@ -5,6 +5,7 @@ import "restic"
// CloudLayout implements the default layout for cloud storage backends, as
// described in the Design document.
type CloudLayout struct {
URL string
Path string
Join func(...string) string
}
@ -13,7 +14,7 @@ var cloudLayoutPaths = defaultLayoutPaths
// Dirname returns the directory path for a given file type and name.
func (l *CloudLayout) Dirname(h restic.Handle) string {
return l.Join(l.Path, cloudLayoutPaths[h.Type])
return l.URL + l.Join(l.Path, "/", cloudLayoutPaths[h.Type])
}
// Filename returns a path to a file, including its name.
@ -24,18 +25,18 @@ func (l *CloudLayout) Filename(h restic.Handle) string {
name = "config"
}
return l.Join(l.Dirname(h), name)
return l.URL + l.Join(l.Path, "/", cloudLayoutPaths[h.Type], name)
}
// Paths returns all directory names
func (l *CloudLayout) Paths() (dirs []string) {
for _, p := range cloudLayoutPaths {
dirs = append(dirs, l.Join(l.Path, p))
dirs = append(dirs, l.URL+l.Join(l.Path, p))
}
return dirs
}
// Basedir returns the base dir name for files of type t.
func (l *CloudLayout) Basedir(t restic.FileType) string {
return l.Join(l.Path, cloudLayoutPaths[t])
return l.URL + l.Join(l.Path, cloudLayoutPaths[t])
}

5
src/restic/backend/layout_s3.go
View File

@ -5,6 +5,7 @@ import "restic"
// S3Layout implements the old layout used for s3 cloud storage backends, as
// described in the Design document.
type S3Layout struct {
URL string
Path string
Join func(...string) string
}
@ -19,7 +20,7 @@ var s3LayoutPaths = map[restic.FileType]string{
// Dirname returns the directory path for a given file type and name.
func (l *S3Layout) Dirname(h restic.Handle) string {
return l.Join(l.Path, s3LayoutPaths[h.Type])
return l.URL + l.Join(l.Path, "/", s3LayoutPaths[h.Type])
}
// Filename returns a path to a file, including its name.
@ -30,7 +31,7 @@ func (l *S3Layout) Filename(h restic.Handle) string {
name = "config"
}
return l.Join(l.Dirname(h), name)
return l.URL + l.Join(l.Path, "/", s3LayoutPaths[h.Type], name)
}
// Paths returns all directory names

49
src/restic/backend/layout_test.go
View File

@ -2,6 +2,7 @@ package backend
import (
"fmt"
"path"
"path/filepath"
"reflect"
"restic"
@ -146,6 +147,54 @@ func TestCloudLayout(t *testing.T) {
}
}
func TestCloudLayoutURLs(t *testing.T) {
var tests = []struct {
l Layout
h restic.Handle
fn string
}{
{
&CloudLayout{URL: "https://hostname.foo", Path: "", Join: path.Join},
restic.Handle{Type: restic.DataFile, Name: "foobar"},
"https://hostname.foo/data/foobar",
},
{
&CloudLayout{URL: "https://hostname.foo:1234/prefix/repo", Path: "/", Join: path.Join},
restic.Handle{Type: restic.LockFile, Name: "foobar"},
"https://hostname.foo:1234/prefix/repo/locks/foobar",
},
{
&CloudLayout{URL: "https://hostname.foo:1234/prefix/repo", Path: "/", Join: path.Join},
restic.Handle{Type: restic.ConfigFile, Name: "foobar"},
"https://hostname.foo:1234/prefix/repo/config",
},
{
&S3Layout{URL: "https://hostname.foo", Path: "/", Join: path.Join},
restic.Handle{Type: restic.DataFile, Name: "foobar"},
"https://hostname.foo/data/foobar",
},
{
&S3Layout{URL: "https://hostname.foo:1234/prefix/repo", Path: "", Join: path.Join},
restic.Handle{Type: restic.LockFile, Name: "foobar"},
"https://hostname.foo:1234/prefix/repo/lock/foobar",
},
{
&S3Layout{URL: "https://hostname.foo:1234/prefix/repo", Path: "/", Join: path.Join},
restic.Handle{Type: restic.ConfigFile, Name: "foobar"},
"https://hostname.foo:1234/prefix/repo/config",
},
}
for _, test := range tests {
t.Run("cloud", func(t *testing.T) {
res := test.l.Filename(test.h)
if res != test.fn {
t.Fatalf("wrong filename, want %v, got %v", test.fn, res)
}
})
}
}
func TestS3Layout(t *testing.T) {
path, cleanup := TempDir(t)
defer cleanup()