From 454f264c311f9c8cb618db1e9615a1f85bc478e5 Mon Sep 17 00:00:00 2001
From: Jeff Lindsay <progrium@gmail.com>
Date: Fri, 3 Apr 2020 16:25:40 -0500
Subject: [PATCH 1/2] made watcher work against afero.Fs abstraction and added
 SetFileSystem()

Signed-off-by: Jeff Lindsay <progrium@gmail.com>
---
 watcher.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/watcher.go b/watcher.go
index 4da4dfe..3c0fd78 100644
--- a/watcher.go
+++ b/watcher.go
@@ -3,13 +3,14 @@ package watcher
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/spf13/afero"
 )
 
 var (
@@ -129,6 +130,7 @@ type Watcher struct {
 	ops          map[Op]struct{}        // Op filtering.
 	ignoreHidden bool                   // ignore hidden files or not.
 	maxEvents    int                    // max sent events per cycle
+	fs           afero.Fs               // filesystem to use
 }
 
 // New creates a new Watcher.
@@ -147,9 +149,16 @@ func New() *Watcher {
 		files:   make(map[string]os.FileInfo),
 		ignored: make(map[string]struct{}),
 		names:   make(map[string]bool),
+		fs:      afero.NewOsFs(),
 	}
 }
 
+// SetFileSystem lets you specify an alternative FS to work against.
+// The default is afero's OsFs which maps to the system FS.
+func (w *Watcher) SetFileSystem(fs afero.Fs) {
+	w.fs = fs
+}
+
 // SetMaxEvents controls the maximum amount of events that are sent on
 // the Event channel per watching cycle. If max events is less than 1, there is
 // no limit, which is the default.
@@ -227,7 +236,7 @@ func (w *Watcher) list(name string) (map[string]os.FileInfo, error) {
 	fileList := make(map[string]os.FileInfo)
 
 	// Make sure name exists.
-	stat, err := os.Stat(name)
+	stat, err := w.fs.Stat(name)
 	if err != nil {
 		return nil, err
 	}
@@ -240,7 +249,7 @@ func (w *Watcher) list(name string) (map[string]os.FileInfo, error) {
 	}
 
 	// It's a directory.
-	fInfoList, err := ioutil.ReadDir(name)
+	fInfoList, err := afero.ReadDir(w.fs, name)
 	if err != nil {
 		return nil, err
 	}
@@ -303,7 +312,7 @@ func (w *Watcher) AddRecursive(name string) (err error) {
 func (w *Watcher) listRecursive(name string) (map[string]os.FileInfo, error) {
 	fileList := make(map[string]os.FileInfo)
 
-	return fileList, filepath.Walk(name, func(path string, info os.FileInfo, err error) error {
+	return fileList, afero.Walk(w.fs, name, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}

From 88c0f931de38c1f8442b6d6fbbe2ce61c5c62c2e Mon Sep 17 00:00:00 2001
From: Jeff Lindsay <progrium@gmail.com>
Date: Fri, 3 Apr 2020 16:46:42 -0500
Subject: [PATCH 2/2] replacing filepath.Abs with filepath.Clean since using
 afero.Fs means no meaningful working directory

Signed-off-by: Jeff Lindsay <progrium@gmail.com>
---
 watcher.go | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/watcher.go b/watcher.go
index 3c0fd78..88294ab 100644
--- a/watcher.go
+++ b/watcher.go
@@ -199,10 +199,7 @@ func (w *Watcher) Add(name string) (err error) {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
-	name, err = filepath.Abs(name)
-	if err != nil {
-		return err
-	}
+	name = filepath.Clean(name)
 
 	// If name is on the ignored list or if hidden files are
 	// ignored and name is a hidden file or directory, simply return.
@@ -290,10 +287,7 @@ func (w *Watcher) AddRecursive(name string) (err error) {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
-	name, err = filepath.Abs(name)
-	if err != nil {
-		return err
-	}
+	name = filepath.Clean(name)
 
 	fileList, err := w.listRecursive(name)
 	if err != nil {
@@ -353,10 +347,7 @@ func (w *Watcher) Remove(name string) (err error) {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
-	name, err = filepath.Abs(name)
-	if err != nil {
-		return err
-	}
+	name = filepath.Clean(name)
 
 	// Remove the name from w's names list.
 	delete(w.names, name)
@@ -389,10 +380,7 @@ func (w *Watcher) RemoveRecursive(name string) (err error) {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
-	name, err = filepath.Abs(name)
-	if err != nil {
-		return err
-	}
+	name = filepath.Clean(name)
 
 	// Remove the name from w's names list.
 	delete(w.names, name)
@@ -422,10 +410,7 @@ func (w *Watcher) RemoveRecursive(name string) (err error) {
 // For files that are already added, Ignore removes them.
 func (w *Watcher) Ignore(paths ...string) (err error) {
 	for _, path := range paths {
-		path, err = filepath.Abs(path)
-		if err != nil {
-			return err
-		}
+		path = filepath.Clean(path)
 		// Remove any of the paths that were already added.
 		if err := w.RemoveRecursive(path); err != nil {
 			return err