fix runfile loading & improve logging noise

Author: JacksonTheMaster

src/api/handlers.go

@@ -30,8 +30,6 @@ func HandleRunSteamCMD(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Only GET requests are allowed", http.StatusMethodNotAllowed)
 		return
 	}
-
-	logger.Core.Info("Running SteamCMD")
 	_, err := steamcmd.InstallAndRunSteamCMD()
 
 	// Update last execution time

src/api/pages/TwoBoxForm.go

@@ -129,7 +129,7 @@ func ServeTwoBoxFormTemplate(w http.ResponseWriter, r *http.Request) {
 			SecondaryLabelType: "hidden",
 			SubmitButtonText:   localization.GetString("UIText_PlsRead_SubmitButton"),
 			SkipButtonText:     localization.GetString("UIText_PlsRead_SkipButton"),
-			NextStep:           "game_branch",
+			NextStep:           "admin_account",
 		},
 		"game_branch": {
 			ID:                       "game_branch",
@@ -364,11 +364,14 @@ func ServeTwoBoxFormTemplate(w http.ResponseWriter, r *http.Request) {
 			data.Step = "welcome"
 		}
 		stepOrder := []string{
-			"welcome", "pls_read", "game_branch", "server_name", "save_name", "world_id", "max_players",
-			"server_password", "discord_enabled", "discord_token", "control_panel_channel", "save_channel",
-			"log_channel", "connection_list_channel", "status_channel", "control_channel",
-			"network_config_choice", "game_port", "update_port", "upnp_enabled",
-			"local_ip_address", "admin_account", "finalize",
+			"welcome", "pls_read",
+			//"game_branch",
+			//"server_name", "save_name", "world_id", "max_players",
+			//"server_password", "discord_enabled", "discord_token", "control_panel_channel", "save_channel",
+			//"log_channel", "connection_list_channel", "status_channel", "control_channel",
+			//"network_config_choice", "game_port", "update_port", "upnp_enabled",
+			//"local_ip_address",
+			"admin_account", "finalize",
 		}
 		var stepSlice []Step
 		for _, id := range stepOrder {

src/api/runfileapi/runfile.go

@@ -112,7 +112,6 @@ func HandleRunfileGroups(w http.ResponseWriter, r *http.Request) {
 	}
 
 	groups := runfile.GetUIGroups()
-	logger.Runfile.Info("fetched UI groups")
 	writeJSONResponse(w, http.StatusOK, groups, "")
 }
 
@@ -153,8 +152,6 @@ func HandleRunfileArgs(w http.ResponseWriter, r *http.Request) {
 	for i, arg := range args {
 		apiArgs[i] = toAPIGameArg(arg)
 	}
-
-	logger.Runfile.Info(fmt.Sprintf("fetched args for group=%s", group))
 	writeJSONResponse(w, http.StatusOK, apiArgs, "")
 }
 

src/api/runfileapi/runfilegallery.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/SteamServerUI/SteamServerUI/v7/src/core/loader"
 	"github.com/SteamServerUI/SteamServerUI/v7/src/logger"
 	"github.com/SteamServerUI/SteamServerUI/v7/src/steamserverui/gallery"
 )
@@ -18,7 +19,6 @@ type response struct {
 
 // GalleryHandler handles GET /api/v2/gallery
 func GalleryHandler(w http.ResponseWriter, r *http.Request) {
-	logger.Runfile.Info("Handling GET /api/v2/gallery request")
 	forceUpdate := strings.ToLower(r.URL.Query().Get("forceUpdate")) == "true"
 
 	runfiles, err := gallery.GetRunfileGallery(forceUpdate)
@@ -28,13 +28,12 @@ func GalleryHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	logger.Runfile.Info("Returning " + strconv.Itoa(len(runfiles)) + " runfiles from gallery")
+	logger.Runfile.Debug("Returning " + strconv.Itoa(len(runfiles)) + " runfiles from gallery")
 	sendResponse(w, http.StatusOK, response{Data: runfiles})
 }
 
 // GallerySelectHandler handles POST /api/v2/gallery/select
 func GallerySelectHandler(w http.ResponseWriter, r *http.Request) {
-	logger.Runfile.Info("Handling POST /api/v2/gallery/select request")
 
 	var req struct {
 		Identifier string `json:"identifier"`
@@ -57,7 +56,8 @@ func GallerySelectHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	logger.Runfile.Info("Successfully saved runfile " + req.Identifier)
+	logger.Runfile.Debug("Successfully saved runfile " + req.Identifier)
+	loader.ReloadBackend()
 	sendResponse(w, http.StatusOK, response{Data: "Runfile " + req.Identifier + " saved"})
 }
 

src/core/loader/loader.go

@@ -37,6 +37,7 @@ func ReloadBackend() {
 
 	logger.Core.Info("Reloading backend...")
 	ReloadConfig()
+	ReloadRunfile()
 	ReloadBepInEx()
 	//ReloadStationeersBackupManager()
 	ReloadLocalizer()

src/core/loader/runfile.go

@@ -19,8 +19,8 @@ func InitRunfile(game string) error {
 		return fmt.Errorf("game cannot be empty")
 	}
 
-	logger.Runfile.Info("Updating runfile game to " + game)
-	logger.Runfile.Info("Stopping server if running")
+	logger.Runfile.Debug("Updating runfile game to " + game)
+	logger.Runfile.Debug("Stopping server if running")
 	gamemgr.InternalStopServer()
 	config.SetRunfileIdentifier(game)
 

src/steamcmd/steamcmd.go

@@ -122,6 +122,11 @@ func runSteamCMD(steamCMDDir string) (int, error) {
 		cmd.Env = newEnv
 	}
 
+	if config.GetSkipSteamCMD() {
+		logger.Install.Warn("Skipping SteamCMD installation")
+		return 0, nil
+	}
+
 	// Run the command
 	if config.GetLogLevel() == 10 {
 		cmdString := strings.Join(cmd.Args, " ")

src/steamserverui/gallery/gallery.go

@@ -11,6 +11,7 @@ import (
 	"sync"
 
 	"github.com/SteamServerUI/SteamServerUI/v7/src/config"
+	"github.com/SteamServerUI/SteamServerUI/v7/src/core/loader"
 	"github.com/SteamServerUI/SteamServerUI/v7/src/logger"
 )
 
@@ -44,7 +45,7 @@ func GetRunfileGallery(forceUpdate bool) ([]GalleryRunfile, error) {
 
 	// Fetch manifest from GitHub Pages
 	const manifestURL = "https://steamserverui.github.io/runfiles/manifest.ssui"
-	logger.Runfile.Info("Fetching runfile gallery from " + manifestURL)
+	logger.Runfile.Debug("Fetching runfile gallery from " + manifestURL)
 	resp, err := http.Get(manifestURL)
 	if err != nil {
 		logger.Runfile.Error(fmt.Sprintf("Failed to fetch manifest: %v", err))
@@ -92,7 +93,7 @@ func SaveRunfileToDisk(identifier string) error {
 	baseURL := "https://steamserverui.github.io/runfiles"
 	fileURL := fmt.Sprintf("%s/%s", baseURL, filename)
 
-	logger.Runfile.Info("Fetching runfile from " + fileURL)
+	logger.Runfile.Debug("Fetching runfile from " + fileURL)
 	resp, err := http.Get(fileURL)
 	if err != nil {
 		logger.Runfile.Error(fmt.Sprintf("Failed to fetch runfile %s: %v", filename, err))
@@ -106,7 +107,16 @@ func SaveRunfileToDisk(identifier string) error {
 	}
 
 	saveFilePath := filepath.Join(config.GetRunfilesFolder(), filename)
-	logger.Runfile.Info("Saving runfile to " + saveFilePath)
+	logger.Runfile.Debug("Saving runfile to " + saveFilePath)
+
+	// get the dir of the saveFilePath, and os.MkdirAll it if it doesn't exist
+	dir := filepath.Dir(saveFilePath)
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		if err := os.MkdirAll(dir, 0755); err != nil {
+			logger.Runfile.Error(fmt.Sprintf("Failed to create runfiles directory %s: %v", dir, err))
+			return fmt.Errorf("couldn't create directory")
+		}
+	}
 
 	// Create or overwrite the file
 	file, err := os.Create(saveFilePath)
@@ -122,7 +132,8 @@ func SaveRunfileToDisk(identifier string) error {
 		return fmt.Errorf("couldn't save %s, disk's being dramatic", filename)
 	}
 
-	logger.Runfile.Info("Successfully saved runfile " + filename)
+	logger.Runfile.Debug("Successfully saved runfile " + filename)
+	loader.InitRunfile(identifier)
 	return nil
 }
 

src/steamserverui/runfile/args.go

@@ -222,7 +222,7 @@ func LoadRunfile(gameName, runFilesFolder string) error {
 	}
 
 	CurrentRunfile = &runfile
-	logger.Runfile.Info(fmt.Sprintf("runfile loaded: path=%s", filePath))
+	logger.Runfile.Debug(fmt.Sprintf("runfile loaded: path=%s", filePath))
 	return nil
 }
 
@@ -276,7 +276,7 @@ func SaveRunfile() error {
 		break
 	}
 
-	logger.Runfile.Info(fmt.Sprintf("runfile saved: path=%s", filePath))
+	logger.Runfile.Debug(fmt.Sprintf("runfile saved: path=%s", filePath))
 	return nil
 }