idk/sam-forwarder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the webview UI

Browse Source
This commit is contained in:
idk
2019-08-20 17:14:34 -04:00
parent 2643598a6e
commit 0131d84eb5
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -36,7 +36,7 @@ fix-debian:
find ./debian -type f -exec sed -i 's|eyedeekay@safe-mail.net|hankhill19580@gmail.com|g' {} \;
try:
cd etc/samcatd/ && ../../bin/samcatd -f tunnels.ini
cd etc/samcatd/ && ../../bin/samcatd-webview -f tunnels.ini
test: test-keys test-ntcp test-ssu test-config test-manager

2
go.mod
View File

@ -16,7 +16,7 @@ require (
github.com/kr/pty v1.1.8 // indirect
github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26
github.com/zserge/lorca v0.1.8
github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb
github.com/zserge/webview v0.0.0-20180509070823-016c6ffd99f3
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect

10
manager/nostatic.go
View File

@ -21,7 +21,8 @@ func (s *SAMManager) RunUI() {
if err != nil {
log.Println(err.Error())
}
go view.Run()
//go
view.Run()
}
func (s *SAMManager) Serve() bool {
@ -34,11 +35,12 @@ func (s *SAMManager) Serve() bool {
if s.UseWebUI() == true {
go s.handlerMux.ListenAndServe()
if view, err = LaunchUI(s); err != nil {
log.Println(err.Error())
log.Println("UI Error:", err.Error())
return false
} else {
go view.Run()
return Exit()
//go
view.Run()
return true //Exit()
}
} else {
return Exit()

2
manager/static.go
View File

@ -34,7 +34,7 @@ func (s *SAMManager) Serve() bool {
go s.handlerMux.ListenAndServe()
if view, err = LaunchUI(s); err != nil {
log.Println(err.Error())
return false
return Exit()
} else {
return Exit()
}