aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui/tunnelspage.go
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-05-03 12:13:28 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-03 12:13:28 +0200
commit1efa9a18fb489e2557b93d0053e788a273f372ec (patch)
tree67d6f739a4d6d956ab52146e08b8db7a6822ee95 /ui/tunnelspage.go
parentui: background import configs (diff)
downloadwireguard-windows-1efa9a18fb489e2557b93d0053e788a273f372ec.tar.xz
wireguard-windows-1efa9a18fb489e2557b93d0053e788a273f372ec.zip
ui: import lowercase extension matching
Diffstat (limited to 'ui/tunnelspage.go')
-rw-r--r--ui/tunnelspage.go8
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()