AIR/wireguird
1
0
Fork 0
mirror of https://github.com/UnnoTed/wireguird synced 2024-11-24 10:35:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from tgbv/feat-33

Browse Source 
feature: Allow parsing of zip archives to read multiple config files at once
This commit is contained in:
UnnoTed 2023-09-25 13:48:44 -03:00 committed by GitHub
commit b0a00140da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gui/tunnels.go
View File

@ -346,19 +346,21 @@ func (t *Tunnels) Create() error {
btnAddTunnel.Connect("clicked", func() { btnAddTunnel.Connect("clicked", func() {
err := func() error { err := func() error {
log.Print("btn add tunnel") log.Print("btn add tunnel")
dialog, err := gtk.FileChooserNativeDialogNew("Wireguird - Choose tunnel files (*.conf)", window, gtk.FILE_CHOOSER_ACTION_OPEN, "OK", "Cancel") dialog, err := gtk.FileChooserNativeDialogNew("Wireguird - Choose tunnel files (*.conf, *.zip)", window, gtk.FILE_CHOOSER_ACTION_OPEN, "OK", "Cancel")
if err != nil { if err != nil {
return err return err
} }
defer dialog.Destroy() defer dialog.Destroy()
// filter *.conf files // filter *.conf and *.zip files
filter, err := gtk.FileFilterNew() filter, err := gtk.FileFilterNew()
if err != nil { if err != nil {
return err return err
} }
filter.AddPattern("*.conf") filter.AddPattern("*.conf")
filter.SetName("*.conf") filter.AddPattern("*.zip")
filter.SetName("*.conf / *.zip")
dialog.AddFilter(filter) dialog.AddFilter(filter)
dialog.SetSelectMultiple(true) dialog.SetSelectMultiple(true)
@ -369,6 +371,15 @@ func (t *Tunnels) Create() error {
return err return err
} }
for _, fname := range list { for _, fname := range list {
// if file is zip archive
if strings.HasSuffix(fname, ".zip") {
err := parseZipArchive(fname)
if err != nil {
return err
}
continue
}
data, err := ioutil.ReadFile(fname) data, err := ioutil.ReadFile(fname)
if err != nil { if err != nil {
return err return err
@ -1148,3 +1159,34 @@ func wlog(t string, text string) error {
return nil return nil
} }
func parseZipArchive(target string) error {
rc, err := zip.OpenReader(target)
if err != nil {
return err
}
defer rc.Close()
for _, f := range rc.File {
// parse only .conf files from zip archive
if !f.FileInfo().IsDir() && strings.HasSuffix(f.FileInfo().Name(), ".conf") {
fr, err := f.Open()
if err != nil {
return err
}
defer fr.Close()
data, err := ioutil.ReadAll(fr)
if err != nil {
return err
}
err = ioutil.WriteFile(filepath.Join(TunnelsPath, f.FileInfo().Name()), data, 666)
if err != nil {
return err
}
}
}
return nil
}