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

Deprecate scanner.Block & File

Browse Source
This commit is contained in:
Jakob Borg
2014-07-12 23:06:48 +02:00
parent 91b35118d9
commit 655acb4cb2
21 changed files with 269 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
files/set.go
View File

@@ -9,12 +9,11 @@ import (
"sync"
"github.com/calmh/syncthing/protocol"
"github.com/calmh/syncthing/scanner"
"github.com/syndtr/goleveldb/leveldb"
)
type fileRecord struct {
File scanner.File
File protocol.FileInfo
Usage int
Global bool
}
@@ -37,7 +36,7 @@ func NewSet(repo string, db *leveldb.DB) *Set {
return &s
}
func (s *Set) Replace(node protocol.NodeID, fs []scanner.File) {
func (s *Set) Replace(node protocol.NodeID, fs []protocol.FileInfo) {
if debug {
l.Debugf("%s Replace(%v, [%d])", s.repo, node, len(fs))
}
@@ -48,7 +47,7 @@ func (s *Set) Replace(node protocol.NodeID, fs []scanner.File) {
}
}
func (s *Set) ReplaceWithDelete(node protocol.NodeID, fs []scanner.File) {
func (s *Set) ReplaceWithDelete(node protocol.NodeID, fs []protocol.FileInfo) {
if debug {
l.Debugf("%s ReplaceWithDelete(%v, [%d])", s.repo, node, len(fs))
}
@@ -59,7 +58,7 @@ func (s *Set) ReplaceWithDelete(node protocol.NodeID, fs []scanner.File) {
}
}
func (s *Set) Update(node protocol.NodeID, fs []scanner.File) {
func (s *Set) Update(node protocol.NodeID, fs []protocol.FileInfo) {
if debug {
l.Debugf("%s Update(%v, [%d])", s.repo, node, len(fs))
}
@@ -91,11 +90,11 @@ func (s *Set) WithGlobal(fn fileIterator) {
ldbWithGlobal(s.db, []byte(s.repo), fn)
}
func (s *Set) Get(node protocol.NodeID, file string) scanner.File {
func (s *Set) Get(node protocol.NodeID, file string) protocol.FileInfo {
return ldbGet(s.db, []byte(s.repo), node[:], []byte(file))
}
func (s *Set) GetGlobal(file string) scanner.File {
func (s *Set) GetGlobal(file string) protocol.FileInfo {
return ldbGetGlobal(s.db, []byte(s.repo), []byte(file))
}