Merge remote-tracking branch 'origin/main' into dev

# Conflicts:
#	internal/mixer/mixer.go
#	internal/page/home.go
This commit is contained in:
NeilClack
2026-07-11 17:46:50 -05:00
3 changed files with 9 additions and 15 deletions
-5
View File
@@ -1,5 +0,0 @@
- [ ] Version string is correct
- [ ] Status shows READY or Downloading Assets
- [ ]
+8 -8
View File
@@ -1,7 +1,6 @@
package application
import (
"encoding/json"
"errors"
"os"
"path/filepath"
@@ -96,7 +95,7 @@ func Run() {
os.Remove(testFile)
logger.AddFile(filepath.Join(dataDir, "log.txt"))
logger.SetLevel = logger.LevelDebug
logger.SetLevel = logger.LevelInfo
DB, err = db.Connect(filepath.Join(dataDir, "database.sqlite"))
if err != nil {
@@ -237,12 +236,13 @@ func (app *Application) computeState() State {
panic(err)
}
data, err := json.MarshalIndent(config, "", " ")
if err != nil {
logger.Error("failed to marshal config: %v", err)
} else {
logger.Debug("AppConfig: %s", data)
}
// A rather annoying, insecure, but sometimes necessary "print the config" statement
// data, err := json.MarshalIndent(config, "", " ")
// if err != nil {
// logger.Error("failed to marshal config: %v", err)
// } else {
// logger.Debug("AppConfig: %s", data)
// }
if config.EmailAddress == "" {
return NEEDS_EMAIL_ADDRESS
+1 -2
View File
@@ -197,8 +197,7 @@ func (p *LogViewerPage) Render() error {
lineSpacing := int32(4)
p.lineHeight = contentFontSize + lineSpacing
contentColumnWidth := int32(float32(p.Base.ScreenWidth) * 0.55)
contentLeftX := p.Base.ScreenCenterX - contentColumnWidth/2
contentLeftX := 25
// Title
titleH := float32(p.titleTextureHeight) * titleScale