diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-03 12:13:28 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-03 12:13:28 +0200 |
commit | 0c2ed5408fa3f241bcb71cf34df10edec0971d8d (patch) | |
tree | 67d6f739a4d6d956ab52146e08b8db7a6822ee95 /ui/tunnelspage.go | |
parent | ui: background import configs (diff) | |
download | wireguard-windows-0c2ed5408fa3f241bcb71cf34df10edec0971d8d.tar.xz wireguard-windows-0c2ed5408fa3f241bcb71cf34df10edec0971d8d.zip |
ui: import lowercase extension matching
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/tunnelspage.go')
-rw-r--r-- | ui/tunnelspage.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index a70bf091..c2b390a5 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -190,14 +190,14 @@ func (tp *TunnelsPage) importFiles(paths []string) { ) for _, path := range paths { - switch filepath.Ext(path) { + switch strings.ToLower(filepath.Ext(path)) { case ".conf": textConfig, err := ioutil.ReadFile(path) if err != nil { lastErr = err continue } - unparsedConfigs = append(unparsedConfigs, unparsedConfig{Name: strings.TrimSuffix(filepath.Base(path), ".conf"), Config: string(textConfig)}) + unparsedConfigs = append(unparsedConfigs, unparsedConfig{Name: strings.TrimSuffix(filepath.Base(path), filepath.Ext(path)), Config: string(textConfig)}) case ".zip": // 1 .conf + 1 error .zip edge case? r, err := zip.OpenReader(path) @@ -207,7 +207,7 @@ func (tp *TunnelsPage) importFiles(paths []string) { } for _, f := range r.File { - if filepath.Ext(f.Name) != ".conf" { + if strings.ToLower(filepath.Ext(f.Name)) != ".conf" { continue } @@ -222,7 +222,7 @@ func (tp *TunnelsPage) importFiles(paths []string) { lastErr = err continue } - unparsedConfigs = append(unparsedConfigs, unparsedConfig{Name: strings.TrimSuffix(filepath.Base(f.Name), ".conf"), Config: string(textConfig)}) + unparsedConfigs = append(unparsedConfigs, unparsedConfig{Name: strings.TrimSuffix(filepath.Base(f.Name), filepath.Ext(f.Name)), Config: string(textConfig)}) } r.Close() |