Change event to access old and new path on events

watcher.go

@@ -62,7 +62,8 @@ func (e Op) String() string {
 // directory and the type of event that's occurred and the full path of the file.
 type Event struct {
 	Op
-	Path string
+	Path    string
+	OldPath string
 	os.FileInfo
 }
 
@@ -547,14 +548,14 @@ func (w *Watcher) pollEvents(files map[string]os.FileInfo, evt chan Event,
 			select {
 			case <-cancel:
 				return
-			case evt <- Event{Write, path, info}:
+			case evt <- Event{Write, path, path, info}:
 			}
 		}
 		if oldInfo.Mode() != info.Mode() {
 			select {
 			case <-cancel:
 				return
-			case evt <- Event{Chmod, path, info}:
+			case evt <- Event{Chmod, path, path, info}:
 			}
 		}
 	}
@@ -565,7 +566,8 @@ func (w *Watcher) pollEvents(files map[string]os.FileInfo, evt chan Event,
 			if sameFile(info1, info2) {
 				e := Event{
 					Op:       Move,
-					Path:     fmt.Sprintf("%s -> %s", path1, path2),
+					Path:     path2,
+					OldPath:  path1,
 					FileInfo: info1,
 				}
 				// If they are from the same directory, it's a rename
@@ -591,14 +593,14 @@ func (w *Watcher) pollEvents(files map[string]os.FileInfo, evt chan Event,
 		select {
 		case <-cancel:
 			return
-		case evt <- Event{Create, path, info}:
+		case evt <- Event{Create, path, "", info}:
 		}
 	}
 	for path, info := range removes {
 		select {
 		case <-cancel:
 			return
-		case evt <- Event{Remove, path, info}:
+		case evt <- Event{Remove, "", path, info}:
 		}
 	}
 }