From e0c4d7c545084c916d510aba29ae52883bdeca63 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Wed, 16 Sep 2020 11:55:35 +0100 Subject: [PATCH] add "test" mode for debugging running with "test" in the arguments will print jellyfin server info, and try to getUsers. --- main.go | 35 ++++++++++++++++++++++++++++++++++- pwreset.go | 6 ++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index c9aead2..51d11c7 100644 --- a/main.go +++ b/main.go @@ -17,6 +17,7 @@ import ( "os/signal" "path/filepath" "runtime" + "strings" "time" "github.com/gin-contrib/pprof" @@ -106,8 +107,33 @@ var ( DATA, CONFIG, HOST *string PORT *int DEBUG *bool + TEST bool ) +func test(app *appContext) { + fmt.Printf("\n\n----\n\n") + settings := map[string]interface{}{ + "server": app.jf.server, + "server version": app.jf.serverInfo.Version, + "server name": app.jf.serverInfo.Name, + "authenticated?": app.jf.authenticated, + "access token": app.jf.accessToken, + "username": app.jf.username, + } + for n, v := range settings { + fmt.Println(n, ":", v) + } + users, status, err := app.jf.getUsers(false) + fmt.Printf("getUsers: code %d err %s maplength %d\n", status, err, len(users)) + fmt.Printf("View output? [y/n]: ") + var choice string + fmt.Scanln(&choice) + if strings.Contains(choice, "y") { + out, err := json.MarshalIndent(users, "", " ") + fmt.Print(string(out), err) + } +} + func start(asDaemon, firstCall bool) { // app encompasses essentially all useful functions. app := new(appContext) @@ -361,6 +387,11 @@ func start(asDaemon, firstCall bool) { } app.validator.init(validatorConf) + if TEST { + test(app) + os.Exit(0) + } + inviteDaemon := NewRepeater(time.Duration(60*time.Second), app) go inviteDaemon.Run() @@ -371,7 +402,6 @@ func start(asDaemon, firstCall bool) { debugMode = false address = "0.0.0.0:8056" } - app.info.Println("Loading routes") if debugMode { gin.SetMode(gin.DebugMode) @@ -475,6 +505,9 @@ func main() { } SOCK = filepath.Join(folder, SOCK) fmt.Println("Socket:", SOCK) + if flagPassed("test") { + TEST = true + } if flagPassed("start") { args := []string{} for i, f := range os.Args { diff --git a/pwreset.go b/pwreset.go index 38ac9d1..670dd6a 100644 --- a/pwreset.go +++ b/pwreset.go @@ -66,11 +66,13 @@ func pwrMonitor(app *appContext, watcher *fsnotify.Watcher) { return } app.storage.loadEmails() - address, ok := app.storage.emails[user["Id"].(string)].(string) - if !ok { + var address string + addr, ok := app.storage.emails[user["Id"].(string)] + if !ok || addr == nil { app.err.Printf("Couldn't find email for user \"%s\". Make sure it's set", pwr.Username) return } + address = addr.(string) msg, err := app.email.constructReset(pwr, app) if err != nil { app.err.Printf("Failed to construct password reset email for %s", pwr.Username)