Switch the database from LevelDB to SQLite, for greater stability and simpler code. Co-authored-by: Tommy van der Vorst <tommy@pixelspark.nl> Co-authored-by: bt90 <btom1990@googlemail.com>
This commit is contained in:
co-authored by
Tommy van der Vorst
bt90
parent
b1c8f88a44
commit
025905fcdf
@@ -41,7 +41,7 @@ func newExternal(cfg config.FolderConfiguration) Versioner {
|
||||
|
||||
s := external{
|
||||
command: command,
|
||||
filesystem: cfg.Filesystem(nil),
|
||||
filesystem: cfg.Filesystem(),
|
||||
}
|
||||
|
||||
l.Debugf("instantiated %#v", s)
|
||||
|
||||
@@ -41,7 +41,7 @@ func newSimple(cfg config.FolderConfiguration) Versioner {
|
||||
s := simple{
|
||||
keep: keep,
|
||||
cleanoutDays: cleanoutDays,
|
||||
folderFs: cfg.Filesystem(nil),
|
||||
folderFs: cfg.Filesystem(),
|
||||
versionsFs: versionerFsFromFolderCfg(cfg),
|
||||
copyRangeMethod: cfg.CopyRangeMethod.ToFS(),
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ func TestSimpleVersioningVersionCount(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}
|
||||
fs := cfg.Filesystem(nil)
|
||||
fs := cfg.Filesystem()
|
||||
|
||||
v := newSimple(cfg)
|
||||
|
||||
@@ -116,7 +116,7 @@ func TestPathTildes(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}
|
||||
fs := cfg.Filesystem(nil)
|
||||
fs := cfg.Filesystem()
|
||||
v := newSimple(cfg)
|
||||
|
||||
const testPath = "test"
|
||||
|
||||
@@ -44,7 +44,7 @@ func newStaggered(cfg config.FolderConfiguration) Versioner {
|
||||
versionsFs := versionerFsFromFolderCfg(cfg)
|
||||
|
||||
s := &staggered{
|
||||
folderFs: cfg.Filesystem(nil),
|
||||
folderFs: cfg.Filesystem(),
|
||||
versionsFs: versionsFs,
|
||||
interval: [4]interval{
|
||||
{30, 60 * 60}, // first hour -> 30 sec between versions
|
||||
|
||||
@@ -33,7 +33,7 @@ func newTrashcan(cfg config.FolderConfiguration) Versioner {
|
||||
// On error we default to 0, "do not clean out the trash can"
|
||||
|
||||
s := &trashcan{
|
||||
folderFs: cfg.Filesystem(nil),
|
||||
folderFs: cfg.Filesystem(),
|
||||
versionsFs: versionerFsFromFolderCfg(cfg),
|
||||
cleanoutDays: cleanoutDays,
|
||||
copyRangeMethod: cfg.CopyRangeMethod.ToFS(),
|
||||
|
||||
@@ -34,7 +34,7 @@ func TestTrashcanArchiveRestoreSwitcharoo(t *testing.T) {
|
||||
FSPath: tmpDir2,
|
||||
},
|
||||
}
|
||||
folderFs := cfg.Filesystem(nil)
|
||||
folderFs := cfg.Filesystem()
|
||||
|
||||
versionsFs := fs.NewFilesystem(fs.FilesystemTypeBasic, tmpDir2)
|
||||
|
||||
@@ -113,7 +113,7 @@ func TestTrashcanRestoreDeletedFile(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
folderFs := cfg.Filesystem(nil)
|
||||
folderFs := cfg.Filesystem()
|
||||
|
||||
versionsFs := fs.NewFilesystem(fs.FilesystemTypeBasic, tmpDir2)
|
||||
|
||||
@@ -209,7 +209,7 @@ func TestTrashcanCleanOut(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
fs := cfg.Filesystem(nil)
|
||||
fs := cfg.Filesystem()
|
||||
|
||||
v := newTrashcan(cfg)
|
||||
|
||||
|
||||
@@ -259,7 +259,7 @@ func restoreFile(method fs.CopyRangeMethod, src, dst fs.Filesystem, filePath str
|
||||
}
|
||||
|
||||
func versionerFsFromFolderCfg(cfg config.FolderConfiguration) (versionsFs fs.Filesystem) {
|
||||
folderFs := cfg.Filesystem(nil)
|
||||
folderFs := cfg.Filesystem()
|
||||
if cfg.Versioning.FSPath == "" {
|
||||
versionsFs = fs.NewFilesystem(folderFs.Type(), filepath.Join(folderFs.URI(), DefaultPath))
|
||||
} else if cfg.Versioning.FSType == config.FilesystemTypeBasic {
|
||||
|
||||
Reference in New Issue
Block a user