windows embed paths #1829
Merged
windows embed paths #1829
Conversation
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
Merged
chappjc
commented
Aug 29, 2022
| @@ -46,7 +46,8 @@ func newTemplates(folder, lang string, embedded bool) *templates { | |||
| t.addErr = fmt.Errorf("no translation dictionary found for lang %q", lang) | |||
| return t | |||
| } | |||
| if embedded { | |||
| if embedded { // slashes even on Windows, see embed pkg docs | |||
| t.folder = filepath.ToSlash(t.folder) | |||
There was a problem hiding this comment.
Should be redundant with the changes in buildTemplates
chappjc
commented
Aug 29, 2022
| @@ -60,6 +61,9 @@ func newTemplates(folder, lang string, embedded bool) *templates { | |||
|
|
|||
| // filepath constructs the template path from the template ID. | |||
| func (t *templates) filepath(name string) string { | |||
| if t.embedded { // slashes even on Windows, see embed pkg docs | |||
| return t.folder + "/" + name + ".tmpl" | |||
There was a problem hiding this comment.
The general advice would be to use path.Join for embedded paths, instead of filepath.Join, but this is a very simple operation and path.Join is overcomplex for the job in this case.
buck54321
approved these changes
Aug 29, 2022
|
Just tested on Windows 11 and it was alright there too. |
|
One more review would be good. Ideally, another linux, plus a mac. Wanna double check everything this time so 0.5.1 is workable on all platforms. |
c45dfb1 to
459a19c
Compare
This fixes the embedded file server on Windows. The embed and fs packages user forward slashes as the path separator, even on Windows, so we should not use filepath.Join when accessing files in an embed.FS or fs.FS. Also set Content-Length for embedded file responses.
459a19c to
6e390c1
Compare
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.
v0.5.0 on Windows is broken when using embedded files because as per the
embedpkg docs:So doing
filepath.Join, which is usually "the right thing", fails on Windows. Surprising to say the least. golang/go#45230 golang/go#44305 https://pkg.go.dev/io/fs#ValidPathFor an immediate patch.