octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 11:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show folder scan progress in -verbose, hide local index updates

Browse Source
This commit is contained in:
Jakob Borg 2015-08-27 21:37:41 +02:00
parent bc016e360e
commit b3d7c622c3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/syncthing/verbose.go
View File

@ -60,7 +60,7 @@ func (s *verboseSvc) WaitForStart() {
func (s *verboseSvc) formatEvent(ev events.Event) string { func (s *verboseSvc) formatEvent(ev events.Event) string {
switch ev.Type { switch ev.Type {
case events.Ping, events.DownloadProgress: case events.Ping, events.DownloadProgress, events.LocalIndexUpdated:
// Skip // Skip
return "" return ""
@ -86,9 +86,6 @@ func (s *verboseSvc) formatEvent(ev events.Event) string {
case events.RemoteIndexUpdated: case events.RemoteIndexUpdated:
data := ev.Data.(map[string]interface{}) data := ev.Data.(map[string]interface{})
return fmt.Sprintf("Device %v sent an index update for %q with %d items", data["device"], data["folder"], data["items"]) return fmt.Sprintf("Device %v sent an index update for %q with %d items", data["device"], data["folder"], data["items"])
case events.LocalIndexUpdated:
data := ev.Data.(map[string]interface{})
return fmt.Sprintf("Updated index for folder %q with %v items", data["folder"], data["items"])
case events.DeviceRejected: case events.DeviceRejected:
data := ev.Data.(map[string]interface{}) data := ev.Data.(map[string]interface{})
@ -123,6 +120,12 @@ func (s *verboseSvc) formatEvent(ev events.Event) string {
delete(sum, "ignorePatterns") delete(sum, "ignorePatterns")
delete(sum, "stateChanged") delete(sum, "stateChanged")
return fmt.Sprintf("Summary for folder %q is %v", data["folder"], data["summary"]) return fmt.Sprintf("Summary for folder %q is %v", data["folder"], data["summary"])
case events.FolderScanProgress:
data := ev.Data.(map[string]interface{})
folder := data["folder"].(string)
current := data["current"].(int64)
total := data["total"].(int64)
return fmt.Sprintf("Scanning folder %q, %d%% done", folder, 100*current/total)
case events.DevicePaused: case events.DevicePaused:
data := ev.Data.(map[string]string) data := ev.Data.(map[string]string)