diff options
Diffstat (limited to 'cmd/web')
| -rw-r--r-- | cmd/web/handlers.go | 38 | ||||
| -rw-r--r-- | cmd/web/main.go | 9 |
2 files changed, 26 insertions, 21 deletions
diff --git a/cmd/web/handlers.go b/cmd/web/handlers.go index fca7471..763c980 100644 --- a/cmd/web/handlers.go +++ b/cmd/web/handlers.go @@ -5,9 +5,9 @@ import ( "fmt" "html/template" "net/http" - "net/url" + // "net/url" "os" - "strings" + // "strings" "time" "github.com/gorilla/mux" @@ -50,24 +50,26 @@ func (a *App) HandleInstall(w http.ResponseWriter, r *http.Request) { uri := r.Form.Get("uri") - // Sanity checking on our end before we pass it off - if strings.HasPrefix(uri, "http") { - _, err := url.Parse(uri) - if err != nil { - Logger.Printf("Installer: While parsing url: %s", err) - http.Error(w, fmt.Sprintf("Invalid url: %s", err), 400) - return - } - } else { - fi, err := os.Stat(uri) - if err != nil || !fi.Mode().IsRegular() { - Logger.Printf("Installer: While parsing url/path: %s", err) - http.Error(w, fmt.Sprintf("Invalid uri/path: %s", err), 400) - return + /* + // Sanity checking on our end before we pass it off + if strings.HasPrefix(uri, "http") { + _, err := url.Parse(uri) + if err != nil { + Logger.Printf("Installer: While parsing url: %s", err) + http.Error(w, fmt.Sprintf("Invalid url: %s", err), 400) + return + } + } else { + fi, err := os.Stat(uri) + if err != nil || !fi.Mode().IsRegular() { + Logger.Printf("Installer: While parsing url/path: %s", err) + http.Error(w, fmt.Sprintf("Invalid uri/path: %s", err), 400) + return + } } - } + */ - Logger.Printf("Installer: Sending request for: %s to channel", uri) + Logger.Printf("Installer: Sending request for: %s to downloader", uri) go func() { g, err := a.Library.ExtractSmart(uri) diff --git a/cmd/web/main.go b/cmd/web/main.go index 20c3506..fdefa1b 100644 --- a/cmd/web/main.go +++ b/cmd/web/main.go @@ -30,7 +30,7 @@ var ( func main() { fl := flag.NewFlagSet("steam-export", flag.ExitOnError) debug := fl.Bool("d", false, "Print line numbers in log") - fl.StringVar(&Listen, "l", Listen, "What address do we listen on?") + fl.StringVar(&Listen, "l", Listen, "What address/port do we listen on?") fl.StringVar(&DefaultLib, "L", DefaultLib, "Full path to default library") fl.StringVar(&isLocalCIDR, "t", isLocalCIDR, "Trusted CIDRs for additional controls, seperated by commas") @@ -40,6 +40,7 @@ func main() { localFS := fl.String("fs", "", "If not empty the local path to use instead of the "+ "embedded templates and /static directory.") + noStartBrowser := fl.Bool("nobrowser", false, "If supplied, do not start the browser") fl.Parse(os.Args[1:]) if *debug { @@ -80,8 +81,10 @@ func main() { continue } - // Not using 'localhost' due to the way windows listens by default - startBrowser("http://127.0.0.1" + Listen) + if !*noStartBrowser { + // Not using 'localhost' due to the way windows listens by default + startBrowser("http://127.0.0.1" + Listen) + } err = s.Serve(l) if err != nil { |