CHORE: go fmt

This commit is contained in:
zomo
2026-04-16 00:26:53 -05:00
parent e6329500b5
commit 262f3d59ec
3 changed files with 18 additions and 19 deletions
+6 -6
View File
@@ -12,9 +12,9 @@ type RoomIni struct {
night int night int
room int room int
name string name string
credits string credits string
links []string links []string
size float64 size float64
speed float64 speed float64
@@ -147,7 +147,7 @@ func loadIniMeta(roomini *RoomIni, cfg *ini.File) error {
func loadIniCredits(roomini *RoomIni, cfg *ini.File) error { func loadIniCredits(roomini *RoomIni, cfg *ini.File) error {
roomini.name = loadString(cfg, "name", "") roomini.name = loadString(cfg, "name", "")
roomini.credits = loadString(cfg, "credits", "") roomini.credits = loadString(cfg, "credits", "")
linksstring := loadString(cfg, "links", "") linksstring := loadString(cfg, "links", "")
roomini.links = strings.Split(linksstring, " ") roomini.links = strings.Split(linksstring, " ")
@@ -228,7 +228,7 @@ func loadInt(cfg *ini.File, key string, def int) (int, error) {
return valint, nil return valint, nil
} }
return def, nil return def, nil
} }
@@ -248,7 +248,7 @@ func loadFloat(cfg *ini.File, key string, def float64) (float64, error) {
return valfloat, nil return valfloat, nil
} }
return def, nil return def, nil
} }
@@ -263,6 +263,6 @@ func loadString(cfg *ini.File, key string, def string) string {
return val.String() return val.String()
} }
return def return def
} }
+1 -1
View File
@@ -32,7 +32,7 @@ func mainErr() error {
log.Errorf("Error in room assigmnents: %v", err) log.Errorf("Error in room assigmnents: %v", err)
return nil return nil
} }
AssignExtraRooms(roomFolders, *roomPerNight) AssignExtraRooms(roomFolders, *roomPerNight)
// only deletes DATA/NIGHT_* folders and the CF.ini file // only deletes DATA/NIGHT_* folders and the CF.ini file
+11 -12
View File
@@ -22,16 +22,16 @@ var SILENCE_WAV []byte
const FILEPERM = 0644 const FILEPERM = 0644
var styleRedtext = lipgloss.NewStyle(). var styleRedtext = lipgloss.NewStyle().
Foreground(lipgloss.Color("9")) Foreground(lipgloss.Color("9"))
var styleYellowtext = lipgloss.NewStyle(). var styleYellowtext = lipgloss.NewStyle().
Foreground(lipgloss.Color("11")) Foreground(lipgloss.Color("11"))
var styleGreentext = lipgloss.NewStyle(). var styleGreentext = lipgloss.NewStyle().
Foreground(lipgloss.Color("10")) Foreground(lipgloss.Color("10"))
var padd = lipgloss.NewStyle(). var padd = lipgloss.NewStyle().
PaddingLeft(4) PaddingLeft(4)
// only deletes DATA/NIGHT_* folders and the CF.ini file // only deletes DATA/NIGHT_* folders and the CF.ini file
// will not touch TITLE or any game files // will not touch TITLE or any game files
@@ -135,7 +135,7 @@ Splash2len=%d
} }
inistr.WriteString(roomFolder.Cfg.ToIni()) inistr.WriteString(roomFolder.Cfg.ToIni())
err = checkCredits(&roomFolder); err = checkCredits(&roomFolder)
if err != nil { if err != nil {
return fmt.Errorf("error checking credits in folder %s: %+v", roomFolder.Path, err) return fmt.Errorf("error checking credits in folder %s: %+v", roomFolder.Path, err)
} }
@@ -177,14 +177,14 @@ func checkCredits(roomFolder *RoomFolder) error {
} }
var styleTextRoom = lipgloss.NewStyle(). var styleTextRoom = lipgloss.NewStyle().
Bold(true). Bold(true).
Padding(0, 1). Padding(0, 1).
Background(lipgloss.Color("10")). Background(lipgloss.Color("10")).
Foreground(lipgloss.Color("0")) Foreground(lipgloss.Color("0"))
var styleTextCopy = lipgloss.NewStyle(). var styleTextCopy = lipgloss.NewStyle().
Bold(true). Bold(true).
Foreground(lipgloss.Color("10")) Foreground(lipgloss.Color("10"))
func copyFolder(roomFolder *RoomFolder, outpath string) error { func copyFolder(roomFolder *RoomFolder, outpath string) error {
nightdir := fmt.Sprintf("NIGHT_%d", roomFolder.Cfg.night) nightdir := fmt.Sprintf("NIGHT_%d", roomFolder.Cfg.night)
@@ -211,7 +211,6 @@ func copyFolder(roomFolder *RoomFolder, outpath string) error {
log.Info(padd.Render(textCopy1Comb)) log.Info(padd.Render(textCopy1Comb))
log.Info(padd.Render(textCopy2Comb)) log.Info(padd.Render(textCopy2Comb))
if roomFolder.IsDefaultCfg { if roomFolder.IsDefaultCfg {
log.Info(padd.Render(styleYellowtext.Render("room.ini was not found, using default settings"))) log.Info(padd.Render(styleYellowtext.Render("room.ini was not found, using default settings")))
} }