Add watch option #1548
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -196,6 +196,8 @@ var ( | |
| "wrapscroll!", | ||
| "findlen", | ||
| "period", | ||
| "watch", | ||
| "nowatch", | ||
|
Collaborator
There was a problem hiding this comment. This is a |
||
| "scrolloff", | ||
| "tabstop", | ||
| "errorfmt", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import ( | |
| "unicode" | ||
| "unicode/utf8" | ||
|
|
||
| "github.com/fsnotify/fsnotify" | ||
| "github.com/gdamore/tcell/v2" | ||
| ) | ||
|
|
||
|
|
@@ -602,6 +603,55 @@ func (e *setExpr) eval(app *app, args []string) { | |
| app.ticker.Stop() | ||
| app.ticker = time.NewTicker(time.Duration(gOpts.period) * time.Second) | ||
| } | ||
| case "watch": | ||
| if e.val != "" { | ||
| app.ui.echoerrf("watch: unexpected value: %s", e.val) | ||
| return | ||
| } | ||
|
|
||
| if app.watcher != nil { | ||
| break | ||
| } | ||
|
|
||
| watcher, err := fsnotify.NewWatcher() | ||
|
Collaborator
There was a problem hiding this comment. I think the code for creating a new watcher should be moved into a separate function, which you'll probably want to do after implementing |
||
| if err != nil { | ||
| app.ui.echoerrf("watch: new watcher: %s", err) | ||
| return | ||
| } | ||
| app.watcher = watcher | ||
| app.watcherEvents = watcher.Events | ||
| app.watcherErrors = watcher.Errors | ||
| gOpts.watch = true | ||
|
|
||
| for _, d := range app.nav.dirs { | ||
| if err := watcher.Add(d.path); err != nil { | ||
| app.ui.echoerrf("watch: watcher add: %s", err) | ||
| return | ||
| } | ||
| } | ||
| if len(app.nav.dirs) > 0 { | ||
| curr, err := app.nav.currFile() | ||
| if err == nil { | ||
| if curr.IsDir() { | ||
| if err := watcher.Add(curr.path); err != nil { | ||
| app.ui.echoerrf("watch: watcher add: %s", err) | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } | ||
| case "nowatch": | ||
| if e.val != "" { | ||
| app.ui.echoerrf("nowatch: unexpected value: %s", e.val) | ||
| return | ||
| } | ||
| gOpts.watch = false | ||
| if app.watcher != nil { | ||
| app.watcher.Close() | ||
| app.watcher = nil | ||
| app.watcherEvents = nil | ||
| app.watcherErrors = nil | ||
| } | ||
| case "preview": | ||
| if e.val == "" || e.val == "true" { | ||
| if len(gOpts.ratios) < 2 { | ||
|
|
@@ -1161,6 +1211,41 @@ func onSelect(app *app) { | |
| if cmd, ok := gOpts.cmds["on-select"]; ok { | ||
| cmd.eval(app, nil) | ||
| } | ||
| if watcher := app.watcher; watcher != nil { | ||
|
Collaborator
There was a problem hiding this comment. If I understand correctly, this entire block of code determines the desired set of paths to watch and then applies it to the watcher. I think it would be better to extract this into a separate function, which can be called during |
||
| dirsSet := map[string]struct{}{} | ||
|
Collaborator
There was a problem hiding this comment. Using |
||
| for _, d := range app.nav.dirs { | ||
| dirsSet[d.path] = struct{}{} | ||
| } | ||
| if len(app.nav.dirs) > 0 { | ||
| curr, err := app.nav.currFile() | ||
| if err == nil { | ||
| if curr.IsDir() { | ||
| dirsSet[curr.path] = struct{}{} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for _, dPath := range watcher.WatchList() { | ||
| if _, ok := dirsSet[dPath]; ok { | ||
| delete(dirsSet, dPath) | ||
| continue | ||
| } | ||
|
Comment on lines
+1229
to
+1232
Collaborator
There was a problem hiding this comment. I think this part might not be needed since adding a watch that already exists is a no-op anyway according to the documentation. Though I don't mind too much either way, I also couldn't find a method to simply specify the exact set the paths to watch. |
||
|
|
||
| if err := watcher.Remove(dPath); err != nil { | ||
| app.ui.echoerrf("watcher remove: %s", err) | ||
| app.ui.draw(app.nav) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| for d := range dirsSet { | ||
| if err := watcher.Add(d); err != nil { | ||
| app.ui.echoerrf("watcher add: %s", err) | ||
| app.ui.draw(app.nav) | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func splitKeys(s string) (keys []string) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the documentation it is better to use
Event.Hasinstead of direct comparison for checking event types, as it's possible for a single event to have multiple flags set.