Make the builder happier with Windows environments #1356
Merged
Conversation
This file contains 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
There's two main issues with Windows environments: * Slashes * Windows still notifies about some directories we've ignored, therefore we need to filter them too It's not super pretty, but it does work.
anoadragon453
approved these changes
Jul 3, 2018
uhoreg
reviewed
Jul 3, 2018
| @@ -99,6 +99,7 @@ func makeWalker(base string, w *fsnotify.Watcher) filepath.WalkFunc { | |||
| } | |||
|
|
|||
| // skip a few things that we know don't form part of the spec | |||
| rel = strings.Replace(rel, "\\", "/", -1) // normalize slashes (thanks to windows) | |||
There was a problem hiding this comment.
should this be rel = filepath.ToSlash instead? (https://golang.org/pkg/path/filepath/#ToSlash )
| @@ -125,6 +126,14 @@ func filter(e fsnotify.Event) bool { | |||
| return false | |||
| } | |||
|
|
|||
| // Forcefully ignore directories we don't care about (Windows, at least, tries to notify about some directories) | |||
| filePath := strings.Replace(e.Name, "\\", "/", -1) // normalize slashes (thanks to windows) | |||
| @@ -149,6 +158,10 @@ func serve(w http.ResponseWriter, req *http.Request) { | |||
| } | |||
| b, ok = m.bytes[file] | |||
|
|
|||
| if !ok { | |||
| b, ok = m.bytes[strings.Replace(file, "/", "\\", -1)] // Attempt a Windows lookup | |||
There was a problem hiding this comment.
should this be ...filepath.FromSlash(file)... instead (probably in the original b, ok = m.bytes... line)?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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's two main issues with Windows environments:
It's not super pretty, but it does work.