From de92516d52ac200513a09beaa683605124eca0e1 Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Sat, 20 Mar 2021 18:00:01 +0000
Subject: [PATCH] add updates section to setup

---
 %home%hrfee%projects%go%jfa-go%config.go.swp | Bin 16384 -> 0 bytes
 html/setup.html                              |  14 ++++
 lang.go                                      |   1 +
 lang/setup/en-us.json                        |   7 ++
 main.go                                      |  64 +++++++++++--------
 setup.go                                     |   1 +
 ts/setup.ts                                  |   9 ++-
 7 files changed, 67 insertions(+), 29 deletions(-)
 delete mode 100644 %home%hrfee%projects%go%jfa-go%config.go.swp

diff --git a/%home%hrfee%projects%go%jfa-go%config.go.swp b/%home%hrfee%projects%go%jfa-go%config.go.swp
deleted file mode 100644
index a076896fae166de364fbaebec69a983338b47b46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
G4*MS(fb04I

diff --git a/html/setup.html b/html/setup.html
index dbd68d2..2f98d69 100644
--- a/html/setup.html
+++ b/html/setup.html
@@ -82,6 +82,20 @@
                             <span class="mt-half">{{ .lang.General.pathToKeyFile }}</span>
                             <input type="text" class="input ~neutral !normal mt-half mb-1" id="advanced-tls_key">
                         </label>
+                        <span class="heading">{{ .lang.Updates.title }}</span>
+                        <p class="content" id="updates-description"></p>
+                        <label class="row switch pb-1">
+                            <input type="checkbox" id="updates-enabled" checked><span>{{ .lang.Strings.enabled }}</span>
+                        </label>
+                        <label class="label">
+                            <span>{{ .lang.Updates.updateChannel }}</span>
+                            <div class="select ~neutral !normal mt-half mb-1">
+                                <select id="updates-channel">
+                                    <option value="stable">{{ .lang.Updates.stable }}</option>
+                                    <option value="unstable">{{ .lang.Updates.unstable }}</option>
+                                </select>
+                            </div>
+                        </label>
                     </div>
                     <div class="col">
                         <label class="label">
diff --git a/lang.go b/lang.go
index 5d3e5c2..2de11f3 100644
--- a/lang.go
+++ b/lang.go
@@ -94,6 +94,7 @@ type setupLang struct {
 	StartPage          langSection `json:"startPage"`
 	EndPage            langSection `json:"endPage"`
 	General            langSection `json:"general"`
+	Updates            langSection `json:"updates"`
 	Language           langSection `json:"language"`
 	Login              langSection `json:"login"`
 	JellyfinEmby       langSection `json:"jellyfinEmby"`
diff --git a/lang/setup/en-us.json b/lang/setup/en-us.json
index 248d862..90d0b6f 100644
--- a/lang/setup/en-us.json
+++ b/lang/setup/en-us.json
@@ -48,6 +48,13 @@
         "pathToCertificate": "Path to certificate",
         "pathToKeyFile": "Path to key file"
     },
+    "updates": {
+        "title": "Updates",
+        "description": "Enable to be notified when new updates are available. jfa-go will check {n} every 30 minutes. No IPs or personally identifiable information are collected.",
+        "updateChannel": "Update Channel",
+        "stable": "Stable",
+        "unstable": "Unstable"
+    },
     "login": {
         "title": "Login",
         "description": "To access the admin page, you need to login with a method below:",
diff --git a/main.go b/main.go
index 95bc52f..db8ae7e 100644
--- a/main.go
+++ b/main.go
@@ -152,7 +152,8 @@ func start(asDaemon, firstCall bool) {
 		set default config and data paths
 		data: Contains invites.json, emails.json, user_profile.json, etc.
 		config: config.ini. Usually in data, but can be changed via -config.
-		localFS is jfa-go's internal data. On external builds, the directory is named "data" and placed next to the executable.
+		localFS: jfa-go's internal data. On internal builds, this is contained within the binary.
+				 On external builds, the directory is named "data" and placed next to the executable.
 	*/
 	userConfigDir, _ := os.UserConfigDir()
 	app.dataPath = filepath.Join(userConfigDir, "jfa-go")
@@ -164,7 +165,7 @@ func start(asDaemon, firstCall bool) {
 	}
 
 	app.info = NewLogger(os.Stdout, "[INFO] ", log.Ltime, color.FgHiWhite)
-	app.err = NewLogger(os.Stdout, "[ERROR] ", log.Ltime|log.Lshortfile, color.FgRed)
+	app.err = NewLogger(os.Stdout, "[ERROR] ", log.Ltime, color.FgRed)
 
 	if firstCall {
 		DATA = flag.String("data", app.dataPath, "alternate path to data directory.")
@@ -200,8 +201,7 @@ func start(asDaemon, firstCall bool) {
 		app.dataPath = *DATA
 	}
 
-	// env variables are necessary because syscall.Exec for self-restarts doesn't doesn't work with arguments for some reason.
-
+	// Previously used for self-restarts but leaving them here as they might be useful.
 	if v := os.Getenv("JFA_CONFIGPATH"); v != "" {
 		app.configPath = v
 	}
@@ -254,6 +254,7 @@ func start(asDaemon, firstCall bool) {
 		app.debug = emptyLogger(false)
 	}
 
+	// Starts listener to receive commands over a unix socket. Use with 'jfa-go start/stop'
 	if asDaemon {
 		go func() {
 			socket := SOCK
@@ -384,6 +385,7 @@ func start(asDaemon, firstCall bool) {
 
 		}
 
+		// Read config-base for settings on web.
 		app.configBasePath = "config-base.json"
 		configBase, _ := fs.ReadFile(localFS, app.configBasePath)
 		json.Unmarshal(configBase, &app.configBase)
@@ -392,6 +394,7 @@ func start(asDaemon, firstCall bool) {
 			"Jellyfin (Dark)": "dark-theme",
 			"Default (Light)": "light-theme",
 		}
+		// For move from Bootstrap to a17t
 		if app.config.Section("ui").Key("theme").String() == "Bootstrap (Light)" {
 			app.config.Section("ui").Key("theme").SetValue("Default (Light)")
 		}
@@ -403,18 +406,8 @@ func start(asDaemon, firstCall bool) {
 			app.err.Fatal(err)
 		}
 		os.Setenv("JFA_SECRET", secret)
-		app.jellyfinLogin = true
-		if val, _ := app.config.Section("ui").Key("jellyfin_login").Bool(); !val {
-			app.jellyfinLogin = false
-			user := User{}
-			user.UserID = shortuuid.New()
-			user.Username = app.config.Section("ui").Key("username").String()
-			user.Password = app.config.Section("ui").Key("password").String()
-			app.users = append(app.users, user)
-		} else {
-			app.debug.Println("Using Jellyfin for authentication")
-		}
 
+		// Initialize jellyfin/emby connection
 		server := app.config.Section("jellyfin").Key("server").String()
 		cacheTimeout := int(app.config.Section("jellyfin").Key("cache_timeout").MustUint(30))
 		stringServerType := app.config.Section("jellyfin").Key("type").String()
@@ -444,7 +437,8 @@ func start(asDaemon, firstCall bool) {
 			app.err.Fatalf("Failed to authenticate with Jellyfin @ %s: Code %d", server, status)
 		}
 		app.info.Printf("Authenticated with %s", server)
-		// from 10.7.0, jellyfin may hyphenate user IDs. This checks if the version is equal or higher.
+		/* A couple of unstable Jellyfin 10.7.0 releases decided to hyphenate user IDs.
+		This checks if the version is equal or higher. */
 		checkVersion := func(version string) int {
 			numberStrings := strings.Split(version, ".")
 			n := 0
@@ -498,27 +492,40 @@ func start(asDaemon, firstCall bool) {
 			}
 		}
 
+		// Auth (manual user/pass or jellyfin)
+		app.jellyfinLogin = true
+		if jfLogin, _ := app.config.Section("ui").Key("jellyfin_login").Bool(); !jfLogin {
+			app.jellyfinLogin = false
+			user := User{}
+			user.UserID = shortuuid.New()
+			user.Username = app.config.Section("ui").Key("username").String()
+			user.Password = app.config.Section("ui").Key("password").String()
+			app.users = append(app.users, user)
+		} else {
+			app.debug.Println("Using Jellyfin for authentication")
+			app.authJf, _ = mediabrowser.NewServer(serverType, server, "jfa-go", app.version, "auth", "auth", timeoutHandler, cacheTimeout)
+		}
+
 		// Since email depends on language, the email reload in loadConfig won't work first time.
 		app.email = NewEmailer(app)
-
-		app.authJf, _ = mediabrowser.NewServer(serverType, server, "jfa-go", app.version, "auth", "auth", timeoutHandler, cacheTimeout)
-
 		app.loadStrftime()
 
-		validatorConf := ValidatorConf{
-			"length":    app.config.Section("password_validation").Key("min_length").MustInt(0),
-			"uppercase": app.config.Section("password_validation").Key("upper").MustInt(0),
-			"lowercase": app.config.Section("password_validation").Key("lower").MustInt(0),
-			"number":    app.config.Section("password_validation").Key("number").MustInt(0),
-			"special":   app.config.Section("password_validation").Key("special").MustInt(0),
-		}
+		var validatorConf ValidatorConf
+
 		if !app.config.Section("password_validation").Key("enabled").MustBool(false) {
-			for key := range validatorConf {
-				validatorConf[key] = 0
+			validatorConf = ValidatorConf{}
+		} else {
+			validatorConf = ValidatorConf{
+				"length":    app.config.Section("password_validation").Key("min_length").MustInt(0),
+				"uppercase": app.config.Section("password_validation").Key("upper").MustInt(0),
+				"lowercase": app.config.Section("password_validation").Key("lower").MustInt(0),
+				"number":    app.config.Section("password_validation").Key("number").MustInt(0),
+				"special":   app.config.Section("password_validation").Key("special").MustInt(0),
 			}
 		}
 		app.validator.init(validatorConf)
 
+		// Test mode for testing connection to Jellyfin, accessed with 'jfa-go test'
 		if TEST {
 			test(app)
 			os.Exit(0)
@@ -546,6 +553,7 @@ func start(asDaemon, firstCall bool) {
 			app.info.Fatalf("Failed to load language files: %+v\n", err)
 		}
 	}
+
 	cssHeader = app.loadCSSHeader()
 	// workaround for potentially broken windows mime types
 	mime.AddExtensionType(".js", "application/javascript")
diff --git a/setup.go b/setup.go
index 1e29bc6..b4e9142 100644
--- a/setup.go
+++ b/setup.go
@@ -89,6 +89,7 @@ func (st *Storage) loadLangSetup(filesystems ...fs.FS) error {
 		if fname != "en-us.json" {
 			patchLang(&english.Strings, &lang.Strings)
 			patchLang(&english.StartPage, &lang.StartPage)
+			patchLang(&english.Updates, &lang.Updates)
 			patchLang(&english.EndPage, &lang.EndPage)
 			patchLang(&english.Language, &lang.Language)
 			patchLang(&english.Login, &lang.Login)
diff --git a/ts/setup.ts b/ts/setup.ts
index 306b3f4..9932717 100644
--- a/ts/setup.ts
+++ b/ts/setup.ts
@@ -173,7 +173,9 @@ class Select {
         if (depends) {
             document.addEventListener(`settings-${section}-${depends}`, (event: boolEvent) => {
                 let el = this._el as HTMLElement;
-                if (el.parentElement.tagName == "LABEL") { el = el.parentElement; }
+                while (el.tagName != "LABEL") {
+                    el = el.parentElement;
+                }
                 if (event.detail !== dependsTrue) {
                     el.classList.add("unfocused");
                 } else {
@@ -202,6 +204,7 @@ window.lang = new lang(window.langFile as LangFile);
 html("language-description", window.lang.var("language", "description", `<a href="https://weblate.hrfee.pw">Weblate</a>`));
 html("email-description", window.lang.var("email", "description", `<a href="https://mailgun.com">Mailgun</a>`));
 html("email-dateformat-notice", window.lang.var("email", "dateFormatNotice", `<a href="https://strftime.ninja/">strftime.ninja</a>`));
+html("updates-description", window.lang.var("updates", "description", `<a href="https://builds.hrfee.dev/view/hrfee/jfa-go">buildrone</a>`));
 
 const settings = {
     "jellyfin": {
@@ -212,6 +215,10 @@ const settings = {
         "password": new Input(get("jellyfin-password")),
         "substitute_jellyfin_strings": new Input(get("jellyfin-substitute_jellyfin_strings"))
     },
+    "updates": {
+        "enabled": new Checkbox(get("updates-enabled"), "", false, "updates", "enabled"),
+        "channel": new Select(get("updates-channel"), "enabled", true, "updates")
+    },
     "ui": {
         "host": new Input(get("ui-host")),
         "port": new Input(get("ui-port")),