perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add repoPath and repoID as parameters to versioner factory (fixes #531)

Browse Source
This commit is contained in:
Jakob Borg
2014-08-17 07:52:26 +02:00
parent 668b429615
commit d20df12168
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
model/puller.go
View File

@@ -113,7 +113,7 @@ func newPuller(repoCfg config.RepositoryConfiguration, model *Model, slots int,
if !ok {
l.Fatalf("Requested versioning type %q that does not exist", repoCfg.Versioning.Type)
}
p.versioner = factory(repoCfg.Versioning.Params)
p.versioner = factory(repoCfg.ID, repoCfg.Directory, repoCfg.Versioning.Params)
}
if slots > 0 {
@@ -632,7 +632,7 @@ func (p *puller) handleEmptyBlock(b bqBlock) {
if debug {
l.Debugln("pull: deleting with versioner")
}
if err := p.versioner.Archive(p.repoCfg.Directory, of.filepath); err == nil {
if err := p.versioner.Archive(of.filepath); err == nil {
p.model.updateLocal(p.repoCfg.ID, f)
} else if debug {
l.Debugln("pull: error:", err)
@@ -762,7 +762,7 @@ func (p *puller) closeFile(f protocol.FileInfo) {
osutil.ShowFile(of.temp)
if p.versioner != nil {
err := p.versioner.Archive(p.repoCfg.Directory, of.filepath)
err := p.versioner.Archive(of.filepath)
if err != nil {
if debug {
l.Debugf("pull: error: %q / %q: %v", p.repoCfg.ID, f.Name, err)