Merge pull request #1639 from calmh/events

Improve event handling a little bit.

cmd/syncthing/summarysvc.go

@@ -66,7 +66,9 @@ func (c *folderSummarySvc) listenForUpdates() {
 			data := ev.Data.(map[string]interface{})
 			folder := data["folder"].(string)
 
-			if ev.Type == events.StateChanged && data["to"].(string) == "idle" && data["from"].(string) == "syncing" {
+			switch ev.Type {
+			case events.StateChanged:
+				if data["to"].(string) == "idle" && data["from"].(string) == "syncing" {
 					// The folder changed to idle from syncing. We should do an
 					// immediate refresh to update the GUI. The send to
 					// c.immediate must be nonblocking so that we can continue
@@ -80,7 +82,9 @@ func (c *folderSummarySvc) listenForUpdates() {
 
 					default:
 					}
-			} else {
+				}
+
+			default:
 				// This folder needs to be refreshed whenever we do the next
 				// refresh.
 

internal/db/truncated.go

@@ -13,15 +13,6 @@ type FileInfoTruncated struct {
 	ActualSize int64
 }
 
-func ToTruncated(file protocol.FileInfo) FileInfoTruncated {
-	t := FileInfoTruncated{
-		FileInfo:   file,
-		ActualSize: file.Size(),
-	}
-	t.FileInfo.Blocks = nil
-	return t
-}
-
 func (f *FileInfoTruncated) UnmarshalXDR(bs []byte) error {
 	err := f.FileInfo.UnmarshalXDR(bs)
 	f.ActualSize = f.FileInfo.Size()

internal/model/rwfolder.go

@@ -478,13 +478,17 @@ func (p *rwFolder) handleDir(file protocol.FileInfo) {
 	events.Default.Log(events.ItemStarted, map[string]interface{}{
 		"folder": p.folder,
 		"item":   file.Name,
-		"details": db.ToTruncated(file),
+		"type":   "dir",
+		"action": "update",
 	})
+
 	defer func() {
 		events.Default.Log(events.ItemFinished, map[string]interface{}{
 			"folder": p.folder,
 			"item":   file.Name,
 			"error":  err,
+			"type":   "dir",
+			"action": "update",
 		})
 	}()
 
@@ -557,13 +561,16 @@ func (p *rwFolder) deleteDir(file protocol.FileInfo) {
 	events.Default.Log(events.ItemStarted, map[string]interface{}{
 		"folder": p.folder,
 		"item":   file.Name,
-		"details": db.ToTruncated(file),
+		"type":   "dir",
+		"action": "delete",
 	})
 	defer func() {
 		events.Default.Log(events.ItemFinished, map[string]interface{}{
 			"folder": p.folder,
 			"item":   file.Name,
 			"error":  err,
+			"type":   "dir",
+			"action": "delete",
 		})
 	}()
 
@@ -592,13 +599,16 @@ func (p *rwFolder) deleteFile(file protocol.FileInfo) {
 	events.Default.Log(events.ItemStarted, map[string]interface{}{
 		"folder": p.folder,
 		"item":   file.Name,
-		"details": db.ToTruncated(file),
+		"type":   "file",
+		"action": "delete",
 	})
 	defer func() {
 		events.Default.Log(events.ItemFinished, map[string]interface{}{
 			"folder": p.folder,
 			"item":   file.Name,
 			"error":  err,
+			"type":   "file",
+			"action": "delete",
 		})
 	}()
 
@@ -631,23 +641,29 @@ func (p *rwFolder) renameFile(source, target protocol.FileInfo) {
 	events.Default.Log(events.ItemStarted, map[string]interface{}{
 		"folder": p.folder,
 		"item":   source.Name,
-		"details": db.ToTruncated(source),
+		"type":   "file",
+		"action": "delete",
 	})
 	events.Default.Log(events.ItemStarted, map[string]interface{}{
 		"folder": p.folder,
 		"item":   target.Name,
-		"details": db.ToTruncated(source),
+		"type":   "file",
+		"action": "update",
 	})
 	defer func() {
 		events.Default.Log(events.ItemFinished, map[string]interface{}{
 			"folder": p.folder,
 			"item":   source.Name,
 			"error":  err,
+			"type":   "file",
+			"action": "delete",
 		})
 		events.Default.Log(events.ItemFinished, map[string]interface{}{
 			"folder": p.folder,
 			"item":   target.Name,
 			"error":  err,
+			"type":   "file",
+			"action": "update",
 		})
 	}()
 
@@ -700,7 +716,8 @@ func (p *rwFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocks
 	events.Default.Log(events.ItemStarted, map[string]interface{}{
 		"folder": p.folder,
 		"item":   file.Name,
-		"details": db.ToTruncated(file),
+		"type":   "file",
+		"action": "update",
 	})
 
 	curFile, ok := p.model.CurrentFolderFile(p.folder, file.Name)
@@ -723,6 +740,8 @@ func (p *rwFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocks
 			"folder": p.folder,
 			"item":   file.Name,
 			"error":  err,
+			"type":   "file",
+			"action": "update",
 		})
 		return
 	}
@@ -994,6 +1013,8 @@ func (p *rwFolder) performFinish(state *sharedPullerState) {
 			"folder": p.folder,
 			"item":   state.file.Name,
 			"error":  err,
+			"type":   "file",
+			"action": "update",
 		})
 	}()
 
@@ -1097,6 +1118,8 @@ func (p *rwFolder) finisherRoutine(in <-chan *sharedPullerState) {
 					"folder": p.folder,
 					"item":   state.file.Name,
 					"error":  state.failed(),
+					"type":   "file",
+					"action": "update",
 				})
 			}
 			p.model.receivedFile(p.folder, state.file.Name)