move .cue creation setting to game settings

n-at · Jan 12, 2025 · d697f16 · d697f16
1 parent 34a2e21
commit d697f16
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 15 deletions.
diff --git a/assets/l10n/en_US.json b/assets/l10n/en_US.json
@@ -73,6 +73,7 @@
   "game.edit.auto-save-enabled.label": "Auto save enabled",
   "game.edit.auto-save-interval.label": "Auto save interval (minutes)",
   "game.edit.auto-save-capacity": "Auto save capacity",
+  "game.edit.cue-enabled.label": "Enable creation of .cue file",
   "game.edit.tags.undefined": "Choose or enter a tag...",
   "game.edit.tags.label": "Tags",
   "game.edit.submit": "Save",
@@ -229,7 +230,6 @@
   "settings-platform.emulation.threads.label": "Use threads",
   "settings-platform.emulation.disable-vsync.label": "Disable VSync",
   "settings-platform.emulation.disable-browser-db.label": "Disable browser DB",
-  "settings-platform.emulation.cue-enabled.label": "Enable creation of .cue file",
   "settings-platform.core.title": "Core",
   "settings-platform.core.empty": "No options for selected core",
   "settings-platform.play.title": "Play",

diff --git a/assets/l10n/ru_RU.json b/assets/l10n/ru_RU.json
@@ -73,6 +73,7 @@
   "game.edit.auto-save-enabled.label": "Включить авто сохранение",
   "game.edit.auto-save-interval.label": "Интервал авто сохранения (минут)",
   "game.edit.auto-save-capacity": "Количество авто сохранений",
+  "game.edit.cue-enabled.label": "Включить создание файлов .cue",
   "game.edit.tags.undefined": "Введите или выберите теги...",
   "game.edit.tags.label": "Теги",
   "game.edit.submit": "Сохранить",
@@ -229,7 +230,6 @@
   "settings-platform.emulation.threads.label": "Использовать потоки",
   "settings-platform.emulation.disable-vsync.label": "Отключить вертикальную синхронизацию",
   "settings-platform.emulation.disable-browser-db.label": "Отключить использование БД браузера",
-  "settings-platform.emulation.cue-enabled.label": "Включить создание файлов .cue",
   "settings-platform.core.title": "Ядро",
   "settings-platform.core.empty": "Нет настроек для выбранного ядра",
   "settings-platform.play.title": "Игра",

diff --git a/storage/defaults.go b/storage/defaults.go
@@ -1143,7 +1143,6 @@ func DefaultEmulatorSettings(systemType string) EmulatorSettings {
 	settings.Shader = Shaders[0].Value
 	settings.Buttons = DefaultButtons
 	settings.Controls = [4]EmulatorControls{controls}
-	settings.CueEnabled = true
 
 	return settings
 }
diff --git a/storage/types.go b/storage/types.go
@@ -46,6 +46,7 @@ type Game struct {
 	AutoSaveEnabled          bool
 	AutoSaveInterval         int
 	AutoSaveCapacity         int
+	CueEnabled               bool
 	OverrideEmulatorSettings bool
 	EmulatorSettings         EmulatorSettings
 }
@@ -91,7 +92,6 @@ type EmulatorSettings struct {
 	Threads                bool
 	DisableBrowserDB       bool
 	DisableVSync           bool
-	CueEnabled             bool
 }
 
 type EmulatorControls struct {

diff --git a/templates/includes/form_game_settings.twig b/templates/includes/form_game_settings.twig
@@ -45,3 +45,10 @@
         </div>
     </div>
 </div>
+
+<div class="mb-3">
+    <div class="form-check form-switch">
+        <input type="checkbox" id="cue-enabled" name="cue-enabled" class="form-check-input" value="1" {% if game.CueEnabled %}checked{% endif %}>
+        <label for="cue-enabled">{{ loc("game.edit.cue-enabled.label") }}</label>
+    </div>
+</div>
diff --git a/templates/includes/platform_settings/emulation.twig b/templates/includes/platform_settings/emulation.twig
@@ -33,11 +33,5 @@
             <input type="checkbox" id="disable-browser-db" name="disable-browser-db" class="form-check-input" value="1" {% if settings.DisableBrowserDB %}checked{% endif %}>
             <label for="disable-browser-db">{{ loc("settings-platform.emulation.disable-browser-db.label") }}</label>
         </div>
-        <div class="mb-3">
-            <div class="form-check form-switch">
-                <input type="checkbox" id="cue-enabled" name="cue-enabled" class="form-check-input" value="1" {% if settings.CueEnabled %}checked{% endif %}>
-                <label for="cue-enabled">{{ loc("settings-platform.emulation.cue-enabled.label") }}</label>
-            </div>
-        </div>
     </div>
 </div>
diff --git a/templates/play.twig b/templates/play.twig
@@ -86,7 +86,7 @@
             window.EJS_disableDatabases = true;
         {% endif %}
 
-        {% if not emulator_settings.CueEnabled %}
+        {% if not game.CueEnabled %}
             window.EJS_disableCue = true;
         {% endif %}
 

diff --git a/web/handlers_game.go b/web/handlers_game.go
@@ -3,12 +3,13 @@ package web
 import (
 	"errors"
 	"fmt"
-	"github.com/flosch/pongo2/v6"
-	"github.com/labstack/echo/v4"
-	log "github.com/sirupsen/logrus"
 	"net/http"
 	"playtime/storage"
 	"strconv"
+
+	"github.com/flosch/pongo2/v6"
+	"github.com/labstack/echo/v4"
+	log "github.com/sirupsen/logrus"
 )
 
 func (s *Server) games(c echo.Context) error {
@@ -77,6 +78,7 @@ func (s *Server) gameUpload(c echo.Context) error {
 			AutoSaveEnabled:          settings.DefaultGameSettings.AutoSaveEnabled,
 			AutoSaveInterval:         settings.DefaultGameSettings.AutoSaveInterval,
 			AutoSaveCapacity:         settings.DefaultGameSettings.AutoSaveCapacity,
+			CueEnabled:               settings.DefaultGameSettings.CueEnabled,
 			OverrideEmulatorSettings: false,
 			EmulatorSettings:         storage.DefaultEmulatorSettings(""),
 		}
@@ -193,6 +195,7 @@ func (s *Server) gameEditSubmit(c echo.Context) error {
 	game.AutoSaveEnabled = c.FormValue("auto-save-enabled") == "1"
 	game.AutoSaveInterval = autoSaveInterval * 60
 	game.AutoSaveCapacity = autoSaveCapacity
+	game.CueEnabled = c.FormValue("cue-enabled") == "1"
 
 	newPlatform := c.FormValue("platform")
 	if game.Platform != newPlatform {

diff --git a/web/handlers_settings.go b/web/handlers_settings.go
@@ -58,6 +58,7 @@ func (s *Server) settingsGeneralSubmit(c echo.Context) error {
 	settings.DefaultGameSettings.AutoSaveEnabled = c.FormValue("auto-save-enabled") == "1"
 	settings.DefaultGameSettings.AutoSaveInterval = autoSaveInterval * 60
 	settings.DefaultGameSettings.AutoSaveCapacity = autoSaveCapacity
+	settings.DefaultGameSettings.CueEnabled = c.FormValue("cue-enabled") == "1"
 
 	if _, err := s.storage.SettingsSave(*settings); err != nil {
 		return err
@@ -243,7 +244,6 @@ func settingsCollectFormData(c echo.Context) storage.EmulatorSettings {
 		Threads:                c.FormValue("threads") == "1",
 		DisableBrowserDB:       c.FormValue("disable-browser-db") == "1",
 		DisableVSync:           c.FormValue("disable-vsync") == "1",
-		CueEnabled:             c.FormValue("cue-enabled") == "1",
 		VideoRotation:          videoRotation,
 		Buttons:                buttons,
 		Controls:               settingsCollectControls(c),