lib/memfs: add method to stop the Watch

The StopWatch method stop watching for update, from calling Watch.

2 files changed, 21 insertions, 6 deletions

diff --git a/lib/memfs/dirwatcher_test.go b/lib/memfs/dirwatcher_test.go
index a62f6001..84ac33ce 100644
--- a/lib/memfs/dirwatcher_test.go
+++ b/lib/memfs/dirwatcher_test.go
@@ -74,8 +74,7 @@ func TestDirWatcher_renameDirectory(t *testing.T) {
 	<-dw.C
 	<-dw.C
 
-	// Wait for all watcher finished.
-	time.Sleep(400 * time.Millisecond)
+	dw.Stop()
 
 	var expDirs = []string{
 		"/newsubdir",
diff --git a/lib/memfs/memfs.go b/lib/memfs/memfs.go
index 12b2d5d9..461faa4d 100644
--- a/lib/memfs/memfs.go
+++ b/lib/memfs/memfs.go
@@ -393,6 +393,17 @@ func (mfs *MemFS) Search(words []string, snippetLen int) (results []SearchResult
 }
 
 //
+// StopWatch stop watching for update, from calling Watch.
+//
+func (mfs *MemFS) StopWatch() {
+	if mfs.dw == nil {
+		return
+	}
+	mfs.dw.Stop()
+	mfs.dw = nil
+}
+
+//
 // Update the node content and information in memory based on new file
 // information.
 // This method only check if the node name is equal with file name, but it's
@@ -420,27 +431,32 @@ func (mfs *MemFS) Update(node *Node, newInfo os.FileInfo) {
 // directory.
 // The MemFS will update the tree and node content automatically if the file
 // get deleted or updated.
-// The returned channel nsq is ready to be consumed.
+// The returned DirWatcher is ready to use.
+// To stop watching for update call the StopWatch.
 //
 func (mfs *MemFS) Watch(d time.Duration) (dw *DirWatcher, err error) {
 	var (
 		logp = "Watch"
 	)
 
-	dw = &DirWatcher{
+	if mfs.dw != nil {
+		return mfs.dw, nil
+	}
+
+	mfs.dw = &DirWatcher{
 		fs:      mfs,
 		Delay:   d,
 		Options: *mfs.Opts,
 	}
 
-	err = dw.Start()
+	err = mfs.dw.Start()
 	if err != nil {
 		// There should be no error here, since we already check and
 		// filled the required fields for DirWatcher.
 		return nil, fmt.Errorf("%s: %w", logp, err)
 	}
 
-	return dw, nil
+	return mfs.dw, nil
 }
 
 func (mfs *MemFS) createRoot() error {