cleanup

gantoine · gantoine · commit 4031072eafe1 · 2026-07-20T17:31:36.000-04:00
diff --git a/frontend/src/locales/bg_BG/settings.json b/frontend/src/locales/bg_BG/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Приоритет на регионите",
   "scan-region-priority-desc": "Ред на кодовете на региони, използвани от IGDB и ScreenScraper за регионални варианти. Печели първият наличен регион.",
   "scan-settings": "Настройки за сканиране",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Неуспешно запазване на настройките за сканиране: {detail}",
   "scan-settings-saved": "Настройките за сканиране са запазени",
   "scan-unsaved-changes": "Имаш незапазени промени",
diff --git a/frontend/src/locales/cs_CZ/settings.json b/frontend/src/locales/cs_CZ/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Priorita regionů",
   "scan-region-priority-desc": "Pořadí kódů regionů používaných IGDB a ScreenScraper pro regionální varianty. Vyhrává první dostupný region.",
   "scan-settings": "Nastavení skenování",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Nelze uložit nastavení skenování: {detail}",
   "scan-settings-saved": "Nastavení skenování uloženo",
   "scan-unsaved-changes": "Máte neuložené změny",
diff --git a/frontend/src/locales/de_DE/settings.json b/frontend/src/locales/de_DE/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Regionspriorität",
   "scan-region-priority-desc": "Reihenfolge der von IGDB und ScreenScraper für regionale Varianten verwendeten Regionscodes. Die erste verfügbare Region gewinnt.",
   "scan-settings": "Scan-Einstellungen",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Scan-Einstellungen konnten nicht gespeichert werden: {detail}",
   "scan-settings-saved": "Scan-Einstellungen gespeichert",
   "scan-unsaved-changes": "Du hast ungespeicherte Änderungen",
diff --git a/frontend/src/locales/en_GB/settings.json b/frontend/src/locales/en_GB/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Region priority",
   "scan-region-priority-desc": "Order of region codes used by IGDB and ScreenScraper for regional variants. The first available region wins.",
   "scan-settings": "Scan settings",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Unable to save scan settings: {detail}",
   "scan-settings-saved": "Scan settings saved",
   "scan-unsaved-changes": "You have unsaved changes",
diff --git a/frontend/src/locales/en_US/settings.json b/frontend/src/locales/en_US/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Region priority",
   "scan-region-priority-desc": "Order of region codes used by IGDB and ScreenScraper for regional variants. The first available region wins.",
   "scan-settings": "Scan settings",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Unable to save scan settings: {detail}",
   "scan-settings-saved": "Scan settings saved",
   "scan-unsaved-changes": "You have unsaved changes",
diff --git a/frontend/src/locales/es_ES/settings.json b/frontend/src/locales/es_ES/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Prioridad de regiones",
   "scan-region-priority-desc": "Orden de los códigos de región usados por IGDB y ScreenScraper para las variantes regionales. Gana la primera región disponible.",
   "scan-settings": "Ajustes de escaneo",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "No se pudieron guardar los ajustes de escaneo: {detail}",
   "scan-settings-saved": "Ajustes de escaneo guardados",
   "scan-unsaved-changes": "Tienes cambios sin guardar",
diff --git a/frontend/src/locales/fr_FR/settings.json b/frontend/src/locales/fr_FR/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Priorité des régions",
   "scan-region-priority-desc": "Ordre des codes de région utilisés par IGDB et ScreenScraper pour les variantes régionales. La première région disponible l'emporte.",
   "scan-settings": "Paramètres de scan",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Impossible d'enregistrer les paramètres de scan : {detail}",
   "scan-settings-saved": "Paramètres de scan enregistrés",
   "scan-unsaved-changes": "Vous avez des modifications non enregistrées",
diff --git a/frontend/src/locales/hu_HU/settings.json b/frontend/src/locales/hu_HU/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Régió prioritás",
   "scan-region-priority-desc": "Az IGDB és a ScreenScraper által a regionális változatokhoz használt régiókódok sorrendje. Az első elérhető régió nyer.",
   "scan-settings": "Szkennelési beállítások",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Nem sikerült menteni a szkennelési beállításokat: {detail}",
   "scan-settings-saved": "Szkennelési beállítások mentve",
   "scan-unsaved-changes": "Nem mentett módosításaid vannak",
diff --git a/frontend/src/locales/it_IT/settings.json b/frontend/src/locales/it_IT/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Priorità regioni",
   "scan-region-priority-desc": "Ordine dei codici regione usati da IGDB e ScreenScraper per le varianti regionali. Vince la prima regione disponibile.",
   "scan-settings": "Impostazioni di scansione",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Impossibile salvare le impostazioni di scansione: {detail}",
   "scan-settings-saved": "Impostazioni di scansione salvate",
   "scan-unsaved-changes": "Hai modifiche non salvate",
diff --git a/frontend/src/locales/ja_JP/settings.json b/frontend/src/locales/ja_JP/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "リージョン優先順位",
   "scan-region-priority-desc": "IGDB と ScreenScraper が地域別バリアントに使用するリージョンコードの順序。最初に利用可能なリージョンが使用されます。",
   "scan-settings": "スキャン設定",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "スキャン設定を保存できませんでした: {detail}",
   "scan-settings-saved": "スキャン設定を保存しました",
   "scan-unsaved-changes": "保存されていない変更があります",
diff --git a/frontend/src/locales/ko_KR/settings.json b/frontend/src/locales/ko_KR/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "지역 우선순위",
   "scan-region-priority-desc": "IGDB와 ScreenScraper가 지역별 변형에 사용하는 지역 코드의 순서입니다. 사용 가능한 첫 번째 지역이 선택됩니다.",
   "scan-settings": "스캔 설정",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "스캔 설정을 저장할 수 없습니다: {detail}",
   "scan-settings-saved": "스캔 설정이 저장되었습니다",
   "scan-unsaved-changes": "저장되지 않은 변경 사항이 있습니다",
diff --git a/frontend/src/locales/pl_PL/settings.json b/frontend/src/locales/pl_PL/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Priorytet regionów",
   "scan-region-priority-desc": "Kolejność kodów regionów używanych przez IGDB i ScreenScraper dla wariantów regionalnych. Wygrywa pierwszy dostępny region.",
   "scan-settings": "Ustawienia skanowania",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Nie można zapisać ustawień skanowania: {detail}",
   "scan-settings-saved": "Ustawienia skanowania zapisane",
   "scan-unsaved-changes": "Masz niezapisane zmiany",
diff --git a/frontend/src/locales/pt_BR/settings.json b/frontend/src/locales/pt_BR/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Prioridade de regiões",
   "scan-region-priority-desc": "Ordem dos códigos de região usados pelo IGDB e ScreenScraper para variantes regionais. A primeira região disponível prevalece.",
   "scan-settings": "Configurações de escaneamento",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Não foi possível salvar as configurações de escaneamento: {detail}",
   "scan-settings-saved": "Configurações de escaneamento salvas",
   "scan-unsaved-changes": "Você tem alterações não salvas",
diff --git a/frontend/src/locales/ro_RO/settings.json b/frontend/src/locales/ro_RO/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Prioritate regiune",
   "scan-region-priority-desc": "Ordinea codurilor de regiune folosite de IGDB și ScreenScraper pentru variantele regionale. Prima regiune disponibilă câștigă.",
   "scan-settings": "Setări de scanare",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Nu s-au putut salva setările de scanare: {detail}",
   "scan-settings-saved": "Setări de scanare salvate",
   "scan-unsaved-changes": "Ai modificări nesalvate",
diff --git a/frontend/src/locales/ru_RU/settings.json b/frontend/src/locales/ru_RU/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Приоритет регионов",
   "scan-region-priority-desc": "Порядок кодов регионов, используемых IGDB и ScreenScraper для региональных вариантов. Побеждает первый доступный регион.",
   "scan-settings": "Настройки сканирования",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Не удалось сохранить настройки сканирования: {detail}",
   "scan-settings-saved": "Настройки сканирования сохранены",
   "scan-unsaved-changes": "У вас есть несохранённые изменения",
diff --git a/frontend/src/locales/tr_TR/settings.json b/frontend/src/locales/tr_TR/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "Bölge önceliği",
   "scan-region-priority-desc": "IGDB ve ScreenScraper tarafından bölgesel varyantlar için kullanılan bölge kodlarının sırası. İlk mevcut bölge kazanır.",
   "scan-settings": "Tarama ayarları",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "Tarama ayarları kaydedilemedi: {detail}",
   "scan-settings-saved": "Tarama ayarları kaydedildi",
   "scan-unsaved-changes": "Kaydedilmemiş değişiklikleriniz var",
diff --git a/frontend/src/locales/zh_CN/settings.json b/frontend/src/locales/zh_CN/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "地区优先级",
   "scan-region-priority-desc": "IGDB 和 ScreenScraper 用于地区变体的地区代码顺序。第一个可用的地区将被采用。",
   "scan-settings": "扫描设置",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "无法保存扫描设置：{detail}",
   "scan-settings-saved": "扫描设置已保存",
   "scan-unsaved-changes": "您有未保存的更改",
diff --git a/frontend/src/locales/zh_TW/settings.json b/frontend/src/locales/zh_TW/settings.json
@@ -361,6 +361,8 @@
   "scan-region-priority": "地區優先順序",
   "scan-region-priority-desc": "IGDB 和 ScreenScraper 用於地區變體的地區代碼順序。第一個可用的地區將被採用。",
   "scan-settings": "掃描設定",
+  "scan-settings-load-error-desc": "The scan settings could not be loaded from the server. Editing is disabled to avoid overwriting your existing configuration.",
+  "scan-settings-load-error-title": "Unable to load scan settings",
   "scan-settings-save-error": "無法儲存掃描設定：{detail}",
   "scan-settings-saved": "掃描設定已儲存",
   "scan-unsaved-changes": "您有未儲存的變更",
diff --git a/frontend/src/stores/config.ts b/frontend/src/stores/config.ts
@@ -53,13 +53,16 @@ export default defineStore("config", {
   }),
 
   actions: {
-    async fetchConfig(): Promise<ConfigResponse> {
+    async fetchConfig({
+      rethrow = false,
+    }: { rethrow?: boolean } = {}): Promise<ConfigResponse> {
       try {
         const response = await api.get("/config");
         this.config = response.data;
         return this.config;
       } catch (error) {
         console.error("Error fetching config: ", error);
+        if (rethrow) throw error;
         return this.config;
       }
     },
diff --git a/frontend/src/v2/views/Settings/ScanSettings.vue b/frontend/src/v2/views/Settings/ScanSettings.vue
@@ -256,13 +256,22 @@ const canEdit = computed(
 );
 
 const loading = ref(true);
+const loadError = ref(false);
 const saving = ref(false);
 
-onMounted(async () => {
-  const cfg = await configStore.fetchConfig();
-  resetForm(cfg);
-  loading.value = false;
-});
+async function loadConfig() {
+  loading.value = true;
+  loadError.value = false;
+  try {
+    resetForm(await configStore.fetchConfig({ rethrow: true }));
+  } catch {
+    loadError.value = true;
+  } finally {
+    loading.value = false;
+  }
+}
+
+onMounted(loadConfig);
 
 function onReset() {
   resetForm(config.value);
@@ -271,9 +280,10 @@ function onReset() {
 async function onSave() {
   saving.value = true;
   try {
-    await configApi.updateScanSettings(formToPayload(form));
-    const cfg = await configStore.fetchConfig();
-    resetForm(cfg);
+    const payload = formToPayload(form);
+    await configApi.updateScanSettings(payload);
+    savedSnapshot.value = JSON.stringify(payload);
+    await configStore.fetchConfig();
     snackbar.success(t("settings.scan-settings-saved"));
   } catch (err) {
     const e = err as {
@@ -326,6 +336,19 @@ onBeforeUnmount(() =>
   <div v-if="loading" class="r-v2-scan-settings__loading">
     <RSpinner />
   </div>
+  <div v-else-if="loadError" class="r-v2-section-stack r-v2-scan-settings">
+    <RAlert type="error">
+      <template #title>
+        {{ t("settings.scan-settings-load-error-title") }}
+      </template>
+      {{ t("settings.scan-settings-load-error-desc") }}
+      <template #actions>
+        <RBtn variant="text" :loading="loading" @click="loadConfig">
+          {{ t("common.try-again") }}
+        </RBtn>
+      </template>
+    </RAlert>
+  </div>
   <div v-else class="r-v2-section-stack r-v2-scan-settings">
     <RAlert v-if="!config.CONFIG_FILE_MOUNTED" type="error">
       <template #title>
