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

lib/model: Refactor out folder and folderscan types, simplify somewhat

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3007
This commit is contained in:
Lars K.W. Gohlke
2016-04-26 14:01:46 +00:00
committed by Jakob Borg
parent 2467678bd4
commit 236f121c4e
7 changed files with 446 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/model/folderstate.go
View File

@@ -38,7 +38,7 @@ func (s folderState) String() string {
}
type stateTracker struct {
folder string
folderID string
mut sync.Mutex
current folderState
@@ -61,7 +61,7 @@ func (s *stateTracker) setState(newState folderState) {
*/
eventData := map[string]interface{}{
"folder": s.folder,
"folder": s.folderID,
"to": newState.String(),
"from": s.current.String(),
}
@@ -92,7 +92,7 @@ func (s *stateTracker) setError(err error) {
s.mut.Lock()
if s.current != FolderError || s.err.Error() != err.Error() {
eventData := map[string]interface{}{
"folder": s.folder,
"folder": s.folderID,
"to": FolderError.String(),
"from": s.current.String(),
"error": err.Error(),
@@ -116,7 +116,7 @@ func (s *stateTracker) clearError() {
s.mut.Lock()
if s.current == FolderError {
eventData := map[string]interface{}{
"folder": s.folder,
"folder": s.folderID,
"to": FolderIdle.String(),
"from": s.current.String(),
}