diff --git a/ini.go b/ini.go index 62a77f4..6992253 100644 --- a/ini.go +++ b/ini.go @@ -12,9 +12,9 @@ type RoomIni struct { night int room int - name string + name string credits string - links []string + links []string size float64 speed float64 @@ -147,7 +147,7 @@ func loadIniMeta(roomini *RoomIni, cfg *ini.File) error { func loadIniCredits(roomini *RoomIni, cfg *ini.File) error { roomini.name = loadString(cfg, "name", "") roomini.credits = loadString(cfg, "credits", "") - + linksstring := loadString(cfg, "links", "") roomini.links = strings.Split(linksstring, " ") @@ -228,7 +228,7 @@ func loadInt(cfg *ini.File, key string, def int) (int, error) { return valint, nil } - + return def, nil } @@ -248,7 +248,7 @@ func loadFloat(cfg *ini.File, key string, def float64) (float64, error) { return valfloat, nil } - + return def, nil } @@ -263,6 +263,6 @@ func loadString(cfg *ini.File, key string, def string) string { return val.String() } - + return def } diff --git a/main.go b/main.go index 189baef..0af880a 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ func mainErr() error { log.Errorf("Error in room assigmnents: %v", err) return nil } - + AssignExtraRooms(roomFolders, *roomPerNight) // only deletes DATA/NIGHT_* folders and the CF.ini file diff --git a/out.go b/out.go index 9dc6afd..e51d68a 100644 --- a/out.go +++ b/out.go @@ -22,16 +22,16 @@ var SILENCE_WAV []byte const FILEPERM = 0644 var styleRedtext = lipgloss.NewStyle(). - Foreground(lipgloss.Color("9")) + Foreground(lipgloss.Color("9")) var styleYellowtext = lipgloss.NewStyle(). - Foreground(lipgloss.Color("11")) + Foreground(lipgloss.Color("11")) var styleGreentext = lipgloss.NewStyle(). - Foreground(lipgloss.Color("10")) + Foreground(lipgloss.Color("10")) var padd = lipgloss.NewStyle(). - PaddingLeft(4) + PaddingLeft(4) // only deletes DATA/NIGHT_* folders and the CF.ini file // will not touch TITLE or any game files @@ -135,7 +135,7 @@ Splash2len=%d } inistr.WriteString(roomFolder.Cfg.ToIni()) - err = checkCredits(&roomFolder); + err = checkCredits(&roomFolder) if err != nil { 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(). - Bold(true). - Padding(0, 1). - Background(lipgloss.Color("10")). - Foreground(lipgloss.Color("0")) + Bold(true). + Padding(0, 1). + Background(lipgloss.Color("10")). + Foreground(lipgloss.Color("0")) var styleTextCopy = lipgloss.NewStyle(). - Bold(true). - Foreground(lipgloss.Color("10")) + Bold(true). + Foreground(lipgloss.Color("10")) func copyFolder(roomFolder *RoomFolder, outpath string) error { 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(textCopy2Comb)) - if roomFolder.IsDefaultCfg { log.Info(padd.Render(styleYellowtext.Render("room.ini was not found, using default settings"))) }