Browse Source

Generate events on scanning updates

Jakob Borg 11 years ago
parent
commit
ee005fbc8e
2 changed files with 14 additions and 6 deletions
  1. 14 0
      model/model.go
  2. 0 6
      scanner/walk.go

+ 14 - 0
model/model.go

@@ -764,6 +764,13 @@ func (m *Model) ScanRepo(repo string) error {
 	batchSize := 100
 	batch := make([]protocol.FileInfo, 0, 00)
 	for f := range fchan {
+		events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
+			"repo":     repo,
+			"name":     f.Name,
+			"modified": time.Unix(f.Modified, 0),
+			"flags":    fmt.Sprintf("0%o", f.Flags),
+			"size":     f.Size(),
+		})
 		if len(batch) == batchSize {
 			fs.Update(protocol.LocalNodeID, batch)
 			batch = batch[:0]
@@ -787,6 +794,13 @@ func (m *Model) ScanRepo(repo string) error {
 				f.Flags |= protocol.FlagDeleted
 				f.Version = lamport.Default.Tick(f.Version)
 				f.LocalVersion = 0
+				events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
+					"repo":     repo,
+					"name":     f.Name,
+					"modified": time.Unix(f.Modified, 0),
+					"flags":    fmt.Sprintf("0%o", f.Flags),
+					"size":     f.Size(),
+				})
 				batch = append(batch, f)
 			}
 		}

+ 0 - 6
scanner/walk.go

@@ -167,9 +167,6 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo, ign map[string][
 				cf := w.CurrentFiler.CurrentFile(rn)
 				permUnchanged := w.IgnorePerms || !protocol.HasPermissionBits(cf.Flags) || PermsEqual(cf.Flags, uint32(info.Mode()))
 				if !protocol.IsDeleted(cf.Flags) && protocol.IsDirectory(cf.Flags) && permUnchanged {
-					if debug {
-						l.Debugln("unchanged:", cf)
-					}
 					return nil
 				}
 			}
@@ -198,9 +195,6 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo, ign map[string][
 				cf := w.CurrentFiler.CurrentFile(rn)
 				permUnchanged := w.IgnorePerms || !protocol.HasPermissionBits(cf.Flags) || PermsEqual(cf.Flags, uint32(info.Mode()))
 				if !protocol.IsDeleted(cf.Flags) && cf.Modified == info.ModTime().Unix() && permUnchanged {
-					if debug {
-						l.Debugln("unchanged:", cf)
-					}
 					return nil
 				}