Move all migrations to separate file

Also fixed some inconsistent uses of snake case.

config.go

@@ -151,53 +151,3 @@ func (app *appContext) loadConfig() error {
 
 	return nil
 }
-
-func (app *appContext) migrateEmailConfig() {
-	tempConfig, _ := ini.Load(app.configPath)
-	fmt.Println(warning("Part of your email configuration will be migrated to the new \"messages\" section.\nA backup will be made."))
-	err := tempConfig.SaveTo(app.configPath + "_" + commit + ".bak")
-	if err != nil {
-		app.err.Fatalf("Failed to backup config: %v", err)
-		return
-	}
-	for _, setting := range []string{"use_24h", "date_format", "message"} {
-		if val := app.config.Section("email").Key(setting).Value(); val != "" {
-			tempConfig.Section("email").Key(setting).SetValue("")
-			tempConfig.Section("messages").Key(setting).SetValue(val)
-		}
-	}
-	if app.config.Section("messages").Key("enabled").MustBool(false) || app.config.Section("telegram").Key("enabled").MustBool(false) {
-		tempConfig.Section("messages").Key("enabled").SetValue("true")
-	}
-	err = tempConfig.SaveTo(app.configPath)
-	if err != nil {
-		app.err.Fatalf("Failed to save config: %v", err)
-		return
-	}
-	app.loadConfig()
-}
-
-func (app *appContext) migrateEmailStorage() error {
-	var emails map[string]interface{}
-	err := loadJSON(app.storage.emails_path, &emails)
-	if err != nil {
-		return err
-	}
-	newEmails := map[string]EmailAddress{}
-	for jfID, addr := range emails {
-		newEmails[jfID] = EmailAddress{
-			Addr:    addr.(string),
-			Contact: true,
-		}
-	}
-	err = storeJSON(app.storage.emails_path+".bak", emails)
-	if err != nil {
-		return err
-	}
-	err = storeJSON(app.storage.emails_path, newEmails)
-	if err != nil {
-		return err
-	}
-	app.info.Println("Migrated to new email format. A backup has also been made.")
-	return nil
-}

html/admin.html

@@ -5,10 +5,10 @@
         <script>
             window.URLBase = "{{ .urlBase }}";
             window.notificationsEnabled = {{ .notifications }};
-            window.emailEnabled = {{ .email_enabled }};
+            window.emailEnabled = {{ .emailEnabled }};
-            window.telegramEnabled = {{ .telegram_enabled }};
+            window.telegramEnabled = {{ .telegramEnabled }};
-            window.discordEnabled = {{ .discord_enabled }};
+            window.discordEnabled = {{ .discordEnabled }};
-            window.matrixEnabled = {{ .matrix_enabled }};
+            window.matrixEnabled = {{ .matrixEnabled }};
             window.ombiEnabled = {{ .ombiEnabled }};
             window.usernameEnabled = {{ .username }};
             window.langFile = JSON.parse({{ .language }});

invdaemon.go

@@ -42,7 +42,7 @@ func (rt *inviteDaemon) run() {
 	}
 }
 
-func (rt *inviteDaemon) shutdown() {
+func (rt *inviteDaemon) Shutdown() {
 	rt.Stopped = true
 	rt.ShutdownChannel <- "Down"
 	<-rt.ShutdownChannel

main.go

@@ -209,11 +209,6 @@ func start(asDaemon, firstCall bool) {
 		app.err.Fatalf("Failed to load config file \"%s\": %v", app.configPath, err)
 	}
 
-	// Some message settings have been moved from "email" to "messages", this will switch them.
-	if app.config.Section("email").Key("use_24h").Value() != "" {
-		app.migrateEmailConfig()
-	}
-
 	app.version = app.config.Section("jellyfin").Key("version").String()
 	// read from config...
 	debugMode = app.config.Section("ui").Key("debug").MustBool(false)
@@ -325,7 +320,7 @@ func start(asDaemon, firstCall bool) {
 		app.storage.emails_path = app.config.Section("files").Key("emails").String()
 		if err := app.storage.loadEmails(); err != nil {
 			app.err.Printf("Failed to load Emails: %v", err)
-			err := app.migrateEmailStorage()
+			err := migrateEmailStorage(app)
 			if err != nil {
 				app.err.Printf("Failed to migrate Email storage: %v", err)
 			}
@@ -361,23 +356,6 @@ func start(asDaemon, firstCall bool) {
 
 		app.storage.profiles_path = app.config.Section("files").Key("user_profiles").String()
 		app.storage.loadProfiles()
-		// Migrate from pre-0.2.0 user templates to profiles
-		if !(app.storage.policy.BlockedTags == nil && app.storage.configuration.GroupedFolders == nil && len(app.storage.displayprefs) == 0) {
-			app.info.Println("Migrating user template files to new profile format")
-			app.storage.migrateToProfile()
-			for _, path := range [3]string{app.storage.policy_path, app.storage.configuration_path, app.storage.displayprefs_path} {
-				if _, err := os.Stat(path); !os.IsNotExist(err) {
-					dir, fname := filepath.Split(path)
-					newFname := strings.Replace(fname, ".json", ".old.json", 1)
-					err := os.Rename(path, filepath.Join(dir, newFname))
-					if err != nil {
-						app.err.Fatalf("Failed to rename %s: %s", fname, err)
-					}
-				}
-			}
-			app.info.Println("In case of a problem, your original files have been renamed to <file>.old.json")
-			app.storage.storeProfiles()
-		}
 
 		if app.config.Section("ombi").Key("enabled").MustBool(false) {
 			app.storage.ombi_path = app.config.Section("files").Key("ombi_template").String()
@@ -396,17 +374,6 @@ func start(asDaemon, firstCall bool) {
 		configBase, _ := fs.ReadFile(localFS, app.configBasePath)
 		json.Unmarshal(configBase, &app.configBase)
 
-		themes := map[string]string{
-			"Jellyfin (Dark)": "dark-theme",
-			"Default (Light)": "light-theme",
-		}
-		// For move from Bootstrap to a17t (0.2.5)
-		if app.config.Section("ui").Key("theme").String() == "Bootstrap (Light)" {
-			app.config.Section("ui").Key("theme").SetValue("Default (Light)")
-		}
-		if val, ok := themes[app.config.Section("ui").Key("theme").String()]; ok {
-			app.cssClass = val
-		}
 		secret, err := generateSecret(16)
 		if err != nil {
 			app.err.Fatal(err)
@@ -446,76 +413,8 @@ func start(asDaemon, firstCall bool) {
 			app.err.Fatalf("Failed to authenticate with Jellyfin @ %s (%d): %v", server, status, err)
 		}
 		app.info.Printf("Authenticated with %s", server)
-		// /* 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
-		// 	for _, s := range numberStrings {
-		// 		num, err := strconv.Atoi(s)
-		// 		if err == nil {
-		// 			n += num
-		// 		}
-		// 	}
-		// 	return n
-		// }
-		// if serverType == mediabrowser.JellyfinServer && checkVersion(app.jf.ServerInfo.Version) >= checkVersion("10.7.0") {
-		// 	// Get users to check if server uses hyphenated userIDs
-		// 	app.jf.GetUsers(false)
 
-		// 	noHyphens := true
+		runMigrations(app)
-		// 	for id := range app.storage.emails {
-		// 		if strings.Contains(id, "-") {
-		// 			noHyphens = false
-		// 			break
-		// 		}
-		// 	}
-		// 	if noHyphens == app.jf.Hyphens {
-		// 		var newEmails map[string]interface{}
-		// 		var newUsers map[string]time.Time
-		// 		var status, status2 int
-		// 		var err, err2 error
-		// 		if app.jf.Hyphens {
-		// 			app.info.Println(info("Your build of Jellyfin appears to hypenate user IDs. Your emails.json/users.json file will be modified to match."))
-		// 			time.Sleep(time.Second * time.Duration(3))
-		// 			newEmails, status, err = app.hyphenateEmailStorage(app.storage.emails)
-		// 			newUsers, status2, err2 = app.hyphenateUserStorage(app.storage.users)
-		// 		} else {
-		// 			app.info.Println(info("Your emails.json/users.json file uses hyphens, but the Jellyfin server no longer does. It will be modified."))
-		// 			time.Sleep(time.Second * time.Duration(3))
-		// 			newEmails, status, err = app.deHyphenateEmailStorage(app.storage.emails)
-		// 			newUsers, status2, err2 = app.deHyphenateUserStorage(app.storage.users)
-		// 		}
-		// 		if status != 200 || err != nil {
-		// 			app.err.Printf("Failed to get users from Jellyfin (%d): %v", status, err)
-		// 			app.err.Fatalf("Couldn't upgrade emails.json")
-		// 		}
-		// 		if status2 != 200 || err2 != nil {
-		// 			app.err.Printf("Failed to get users from Jellyfin (%d): %v", status, err)
-		// 			app.err.Fatalf("Couldn't upgrade users.json")
-		// 		}
-		// 		emailBakFile := app.storage.emails_path + ".bak"
-		// 		usersBakFile := app.storage.users_path + ".bak"
-		// 		err = storeJSON(emailBakFile, app.storage.emails)
-		// 		err2 = storeJSON(usersBakFile, app.storage.users)
-		// 		if err != nil {
-		// 			app.err.Fatalf("couldn't store emails.json backup: %v", err)
-		// 		}
-		// 		if err2 != nil {
-		// 			app.err.Fatalf("couldn't store users.json backup: %v", err)
-		// 		}
-		// 		app.storage.emails = newEmails
-		// 		app.storage.users = newUsers
-		// 		err = app.storage.storeEmails()
-		// 		err2 = app.storage.storeUsers()
-		// 		if err != nil {
-		// 			app.err.Fatalf("couldn't store emails.json: %v", err)
-		// 		}
-		// 		if err2 != nil {
-		// 			app.err.Fatalf("couldn't store users.json: %v", err)
-		// 		}
-		// 	}
-		// }
 
 		// Auth (manual user/pass or jellyfin)
 		app.jellyfinLogin = true
@@ -561,7 +460,7 @@ func start(asDaemon, firstCall bool) {
 
 		invDaemon := newInviteDaemon(time.Duration(60*time.Second), app)
 		go invDaemon.run()
-		defer invDaemon.shutdown()
+		defer invDaemon.Shutdown()
 
 		userDaemon := newUserDaemon(time.Duration(60*time.Second), app)
 		go userDaemon.run()

migrations.go

@@ -0,0 +1,180 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"gopkg.in/ini.v1"
+)
+
+func runMigrations(app *appContext) {
+	migrateProfiles(app)
+	migrateBootstrap(app)
+	migrateEmailStorage(app)
+	// migrateHyphens(app)
+}
+
+// Migrate pre-0.2.0 user templates to profiles
+func migrateProfiles(app *appContext) {
+	if !(app.storage.policy.BlockedTags == nil && app.storage.configuration.GroupedFolders == nil && len(app.storage.displayprefs) == 0) {
+		app.info.Println("Migrating user template files to new profile format")
+		app.storage.migrateToProfile()
+		for _, path := range [3]string{app.storage.policy_path, app.storage.configuration_path, app.storage.displayprefs_path} {
+			if _, err := os.Stat(path); !os.IsNotExist(err) {
+				dir, fname := filepath.Split(path)
+				newFname := strings.Replace(fname, ".json", ".old.json", 1)
+				err := os.Rename(path, filepath.Join(dir, newFname))
+				if err != nil {
+					app.err.Fatalf("Failed to rename %s: %s", fname, err)
+				}
+			}
+		}
+		app.info.Println("In case of a problem, your original files have been renamed to <file>.old.json")
+		app.storage.storeProfiles()
+	}
+}
+
+// Migrate pre-0.2.5 bootstrap theme choice to a17t version.
+func migrateBootstrap(app *appContext) {
+	themes := map[string]string{
+		"Jellyfin (Dark)": "dark-theme",
+		"Default (Light)": "light-theme",
+	}
+
+	if app.config.Section("ui").Key("theme").String() == "Bootstrap (Light)" {
+		app.config.Section("ui").Key("theme").SetValue("Default (Light)")
+	}
+	if val, ok := themes[app.config.Section("ui").Key("theme").String()]; ok {
+		app.cssClass = val
+	}
+}
+
+func migrateEmailConfig(app *appContext) {
+	tempConfig, _ := ini.Load(app.configPath)
+	fmt.Println(warning("Part of your email configuration will be migrated to the new \"messages\" section.\nA backup will be made."))
+	err := tempConfig.SaveTo(app.configPath + "_" + commit + ".bak")
+	if err != nil {
+		app.err.Fatalf("Failed to backup config: %v", err)
+		return
+	}
+	for _, setting := range []string{"use_24h", "date_format", "message"} {
+		if val := app.config.Section("email").Key(setting).Value(); val != "" {
+			tempConfig.Section("email").Key(setting).SetValue("")
+			tempConfig.Section("messages").Key(setting).SetValue(val)
+		}
+	}
+	if app.config.Section("messages").Key("enabled").MustBool(false) || app.config.Section("telegram").Key("enabled").MustBool(false) {
+		tempConfig.Section("messages").Key("enabled").SetValue("true")
+	}
+	err = tempConfig.SaveTo(app.configPath)
+	if err != nil {
+		app.err.Fatalf("Failed to save config: %v", err)
+		return
+	}
+	app.loadConfig()
+}
+
+// Migrate pre-0.3.6 email settings to the new messages section.
+// Called just after loading email storage in main.go.
+func migrateEmailStorage(app *appContext) error {
+	// use_24h was moved to messages, so this checks if migration has already occurred or not.
+	if app.config.Section("email").Key("use_24h").Value() == "" {
+		return nil
+	}
+	var emails map[string]interface{}
+	err := loadJSON(app.storage.emails_path, &emails)
+	if err != nil {
+		return err
+	}
+	newEmails := map[string]EmailAddress{}
+	for jfID, addr := range emails {
+		newEmails[jfID] = EmailAddress{
+			Addr:    addr.(string),
+			Contact: true,
+		}
+	}
+	err = storeJSON(app.storage.emails_path+".bak", emails)
+	if err != nil {
+		return err
+	}
+	err = storeJSON(app.storage.emails_path, newEmails)
+	if err != nil {
+		return err
+	}
+	app.info.Println("Migrated to new email format. A backup has also been made.")
+	return nil
+}
+
+// Migrate between hyphenated & non-hyphenated user IDs. Doesn't seem to happen anymore, so disabled.
+// func migrateHyphens(app *appContext) {
+// 	checkVersion := func(version string) int {
+// 		numberStrings := strings.Split(version, ".")
+// 		n := 0
+// 		for _, s := range numberStrings {
+// 			num, err := strconv.Atoi(s)
+// 			if err == nil {
+// 				n += num
+// 			}
+// 		}
+// 		return n
+// 	}
+// 	if serverType == mediabrowser.JellyfinServer && checkVersion(app.jf.ServerInfo.Version) >= checkVersion("10.7.0") {
+// 		// Get users to check if server uses hyphenated userIDs
+// 		app.jf.GetUsers(false)
+//
+// 		noHyphens := true
+// 		for id := range app.storage.emails {
+// 			if strings.Contains(id, "-") {
+// 				noHyphens = false
+// 				break
+// 			}
+// 		}
+// 		if noHyphens == app.jf.Hyphens {
+// 			var newEmails map[string]interface{}
+// 			var newUsers map[string]time.Time
+// 			var status, status2 int
+// 			var err, err2 error
+// 			if app.jf.Hyphens {
+// 				app.info.Println(info("Your build of Jellyfin appears to hypenate user IDs. Your emails.json/users.json file will be modified to match."))
+// 				time.Sleep(time.Second * time.Duration(3))
+// 				newEmails, status, err = app.hyphenateEmailStorage(app.storage.emails)
+// 				newUsers, status2, err2 = app.hyphenateUserStorage(app.storage.users)
+// 			} else {
+// 				app.info.Println(info("Your emails.json/users.json file uses hyphens, but the Jellyfin server no longer does. It will be modified."))
+// 				time.Sleep(time.Second * time.Duration(3))
+// 				newEmails, status, err = app.deHyphenateEmailStorage(app.storage.emails)
+// 				newUsers, status2, err2 = app.deHyphenateUserStorage(app.storage.users)
+// 			}
+// 			if status != 200 || err != nil {
+// 				app.err.Printf("Failed to get users from Jellyfin (%d): %v", status, err)
+// 				app.err.Fatalf("Couldn't upgrade emails.json")
+// 			}
+// 			if status2 != 200 || err2 != nil {
+// 				app.err.Printf("Failed to get users from Jellyfin (%d): %v", status, err)
+// 				app.err.Fatalf("Couldn't upgrade users.json")
+// 			}
+// 			emailBakFile := app.storage.emails_path + ".bak"
+// 			usersBakFile := app.storage.users_path + ".bak"
+// 			err = storeJSON(emailBakFile, app.storage.emails)
+// 			err2 = storeJSON(usersBakFile, app.storage.users)
+// 			if err != nil {
+// 				app.err.Fatalf("couldn't store emails.json backup: %v", err)
+// 			}
+// 			if err2 != nil {
+// 				app.err.Fatalf("couldn't store users.json backup: %v", err)
+// 			}
+// 			app.storage.emails = newEmails
+// 			app.storage.users = newUsers
+// 			err = app.storage.storeEmails()
+// 			err2 = app.storage.storeUsers()
+// 			if err != nil {
+// 				app.err.Fatalf("couldn't store emails.json: %v", err)
+// 			}
+// 			if err2 != nil {
+// 				app.err.Fatalf("couldn't store users.json: %v", err)
+// 			}
+// 		}
+// 	}
+// }

tray.go

@@ -94,7 +94,6 @@ func onReady() {
 			open.Start(logPath)
 		case <-mQuit.ClickedCh:
 			systray.Quit()
-			// case <-mOnLogin.ClickedCh:
 		}
 	}
 }

views.go

@@ -117,23 +117,23 @@ func (app *appContext) AdminPage(gc *gin.Context) {
 	}
 	license = string(l)
 	gcHTML(gc, http.StatusOK, "admin.html", gin.H{
-		"urlBase":          app.getURLBase(gc),
+		"urlBase":         app.getURLBase(gc),
-		"cssClass":         app.cssClass,
+		"cssClass":        app.cssClass,
-		"contactMessage":   "",
+		"contactMessage":  "",
-		"email_enabled":    emailEnabled,
+		"emailEnabled":    emailEnabled,
-		"telegram_enabled": telegramEnabled,
+		"telegramEnabled": telegramEnabled,
-		"discord_enabled":  discordEnabled,
+		"discordEnabled":  discordEnabled,
-		"matrix_enabled":   matrixEnabled,
+		"matrixEnabled":   matrixEnabled,
-		"notifications":    notificationsEnabled,
+		"ombiEnabled":     ombiEnabled,
-		"version":          version,
+		"notifications":   notificationsEnabled,
-		"commit":           commit,
+		"version":         version,
-		"ombiEnabled":      ombiEnabled,
+		"commit":          commit,
-		"username":         !app.config.Section("email").Key("no_username").MustBool(false),
+		"username":        !app.config.Section("email").Key("no_username").MustBool(false),
-		"strings":          app.storage.lang.Admin[lang].Strings,
+		"strings":         app.storage.lang.Admin[lang].Strings,
-		"quantityStrings":  app.storage.lang.Admin[lang].QuantityStrings,
+		"quantityStrings": app.storage.lang.Admin[lang].QuantityStrings,
-		"language":         app.storage.lang.Admin[lang].JSON,
+		"language":        app.storage.lang.Admin[lang].JSON,
-		"langName":         lang,
+		"langName":        lang,
-		"license":          license,
+		"license":         license,
 	})
 }