Skip to content

Fix reading presets dir on Windows #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
esimkowitz merged 7 commits into from
Nov 19, 2024
Merged

Fix reading presets dir on Windows #1322

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2b5060
Fix copyfiles for docsite
esimkowitz Nov 19, 2024
89d82af
Simplify docsite build
esimkowitz Nov 19, 2024
1af9f74
fix copyfiles
esimkowitz Nov 19, 2024
45e6fc0
Fix preset file DirFS read on Windows
esimkowitz Nov 19, 2024
bb3b9b4
Merge branch 'main' into evan/fix-presets-windows
esimkowitz Nov 19, 2024
ea21ef7
Fix more robustly
esimkowitz Nov 19, 2024
3a775ea
remove comment and log
esimkowitz Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/wconfig/settingsconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ func readConfigHelper(fileName string, barr []byte, readErr error) (waveobj.Meta

func readConfigFileFS(fsys fs.FS, logPrefix string, fileName string) (waveobj.MetaMapType, []ConfigError) {
barr, readErr := fs.ReadFile(fsys, fileName)
if readErr != nil && strings.Contains(readErr.Error(), "invalid argument") {
// If we get an `invalid argument` error, we may be using the wrong path separator for the given FS interface. Try switching the separator.
barr, readErr = fs.ReadFile(fsys, filepath.ToSlash(fileName))
}
return readConfigHelper(logPrefix+fileName, barr, readErr)
}

Expand Down