mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-14 01:04:14 +00:00
Merge branch 'v0.6'
* v0.6: Open GUI on startup
This commit is contained in:
commit
192117dc11
20
main.go
20
main.go
@ -187,16 +187,26 @@ func main() {
|
|||||||
|
|
||||||
// GUI
|
// GUI
|
||||||
if cfg.Options.GUIEnabled && cfg.Options.GUIAddress != "" {
|
if cfg.Options.GUIEnabled && cfg.Options.GUIAddress != "" {
|
||||||
host, port, err := net.SplitHostPort(cfg.Options.GUIAddress)
|
addr, err := net.ResolveTCPAddr("tcp", cfg.Options.GUIAddress)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
warnf("Cannot start GUI on %q: %v", cfg.Options.GUIAddress, err)
|
warnf("Cannot start GUI on %q: %v", cfg.Options.GUIAddress, err)
|
||||||
} else {
|
} else {
|
||||||
if len(host) > 0 {
|
var hostOpen, hostShow string
|
||||||
infof("Starting web GUI on http://%s", cfg.Options.GUIAddress)
|
switch {
|
||||||
} else {
|
case addr.IP == nil:
|
||||||
infof("Starting web GUI on port %s", port)
|
hostOpen = "localhost"
|
||||||
|
hostShow = "0.0.0.0"
|
||||||
|
case addr.IP.IsUnspecified():
|
||||||
|
hostOpen = "localhost"
|
||||||
|
hostShow = addr.IP.String()
|
||||||
|
default:
|
||||||
|
hostOpen = addr.IP.String()
|
||||||
|
hostShow = hostOpen
|
||||||
}
|
}
|
||||||
|
|
||||||
|
infof("Starting web GUI on http://%s:%d/", hostShow, addr.Port)
|
||||||
startGUI(cfg.Options.GUIAddress, m)
|
startGUI(cfg.Options.GUIAddress, m)
|
||||||
|
openURL(fmt.Sprintf("http://%s:%d", hostOpen, addr.Port))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
34
openurl.go
Normal file
34
openurl.go
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2011 Google Inc.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os/exec"
|
||||||
|
"runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
func openURL(url string) error {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
return exec.Command("cmd.exe", "/C", "start "+url).Run()
|
||||||
|
}
|
||||||
|
|
||||||
|
if runtime.GOOS == "darwin" {
|
||||||
|
return exec.Command("open", url).Run()
|
||||||
|
}
|
||||||
|
|
||||||
|
return exec.Command("xdg-open", url).Run()
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user