Merge remote-tracking branch 'origin/main' into dev
# Conflicts: # internal/mixer/mixer.go # internal/page/home.go
This commit is contained in:
@@ -1,5 +0,0 @@
|
|||||||
- [ ] Version string is correct
|
|
||||||
- [ ] Status shows READY or Downloading Assets
|
|
||||||
- [ ]
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package application
|
package application
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
"errors"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -96,7 +95,7 @@ func Run() {
|
|||||||
os.Remove(testFile)
|
os.Remove(testFile)
|
||||||
|
|
||||||
logger.AddFile(filepath.Join(dataDir, "log.txt"))
|
logger.AddFile(filepath.Join(dataDir, "log.txt"))
|
||||||
logger.SetLevel = logger.LevelDebug
|
logger.SetLevel = logger.LevelInfo
|
||||||
|
|
||||||
DB, err = db.Connect(filepath.Join(dataDir, "database.sqlite"))
|
DB, err = db.Connect(filepath.Join(dataDir, "database.sqlite"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -237,12 +236,13 @@ func (app *Application) computeState() State {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
data, err := json.MarshalIndent(config, "", " ")
|
// A rather annoying, insecure, but sometimes necessary "print the config" statement
|
||||||
if err != nil {
|
// data, err := json.MarshalIndent(config, "", " ")
|
||||||
logger.Error("failed to marshal config: %v", err)
|
// if err != nil {
|
||||||
} else {
|
// logger.Error("failed to marshal config: %v", err)
|
||||||
logger.Debug("AppConfig: %s", data)
|
// } else {
|
||||||
}
|
// logger.Debug("AppConfig: %s", data)
|
||||||
|
// }
|
||||||
|
|
||||||
if config.EmailAddress == "" {
|
if config.EmailAddress == "" {
|
||||||
return NEEDS_EMAIL_ADDRESS
|
return NEEDS_EMAIL_ADDRESS
|
||||||
|
|||||||
@@ -197,8 +197,7 @@ func (p *LogViewerPage) Render() error {
|
|||||||
lineSpacing := int32(4)
|
lineSpacing := int32(4)
|
||||||
p.lineHeight = contentFontSize + lineSpacing
|
p.lineHeight = contentFontSize + lineSpacing
|
||||||
|
|
||||||
contentColumnWidth := int32(float32(p.Base.ScreenWidth) * 0.55)
|
contentLeftX := 25
|
||||||
contentLeftX := p.Base.ScreenCenterX - contentColumnWidth/2
|
|
||||||
|
|
||||||
// Title
|
// Title
|
||||||
titleH := float32(p.titleTextureHeight) * titleScale
|
titleH := float32(p.titleTextureHeight) * titleScale
|
||||||
|
|||||||
Reference in New Issue
Block a user