更新本地配方数据、版本号

Tnze · Dec 7, 2023 · 940bc88 · 940bc88
1 parent e80f08e
commit 940bc88
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "ffxiv-best-craft",
     "private": true,
-    "version": "0.13.2",
+    "version": "0.13.3",
     "scripts": {
         "dev": "VITE_BESTCRAFT_TARGET=tauri vite",
         "build": "VITE_BESTCRAFT_TARGET=tauri vite build",

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -7,7 +7,7 @@ license = "AGPL-3.0-or-later"
 name = "app"
 repository = "https://github.com/Tnze/ffxiv-best-craft"
 rust-version = "1.71"
-version = "0.13.2"
+version = "0.13.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/src-tauri/assets/xiv.db b/src-tauri/assets/xiv.db
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
     "package": {
         "productName": "BestCraft",
-        "version": "0.13.2"
+        "version": "0.13.3"
     },
     "build": {
         "distDir": "../dist",

diff --git a/src/components/Settings.vue b/src/components/Settings.vue
@@ -75,7 +75,7 @@ if (isOnTauri) {
                 <el-form-item :label="$t('data-source')">
                     <el-select v-model="store.dataSource">
                         <el-option v-if="isOnTauri" :label="$t('ds-local')" value="local" />
-                        <el-option v-else :label="$t('ds-yyyygames')" value="yyyy.games" />
+                        <el-option :label="$t('ds-yyyygames')" value="yyyy.games" />
                         <el-option :label="$t('ds-xivapi')" value="xivapi" />
                         <el-option :label="$t('ds-cafe')" value="cafe" />
                     </el-select>

diff --git a/src/components/recipe-manager/CustomizeRecipe.vue b/src/components/recipe-manager/CustomizeRecipe.vue
@@ -75,15 +75,16 @@ let recipeLevelPromise: Promise<RecipeLevel> | null = null
 watch(
     [
         autoLoad,
-        () => settingStore.getDataSource,
+        () => settingStore.dataSource,
         () => customRecipe.value.rlv
     ],
     async ([autoLoad, dataSource, rlv]) => {
+        console.log("dataSource", dataSource)
         if (!autoLoad) return;
         try {
             autoLoadLoading.value = true
             if (recipeLevelPromise != null) await recipeLevelPromise
-            recipeLevelPromise = (await dataSource).recipeLevelTable(rlv ?? 0)
+            recipeLevelPromise = (await settingStore.getDataSource).recipeLevelTable(rlv ?? 0)
             recipeLevel.value = await recipeLevelPromise
             recipeLevelPromise = null
         } catch {

diff --git a/src/stores/settings.ts b/src/stores/settings.ts
@@ -33,23 +33,20 @@ export default defineStore('settings', {
             })
         },
         async getDataSource(): Promise<DataSource> {
+            let dataSources: Record<string, () => DataSource> = {
+                'yyyy.games': () => new WebSource(YYYYGamesApiBase),
+                'xivapi': () => new XivApiRecipeSource(XivapiBase, this.dataSourceLang),
+                'cafe': () => new XivApiRecipeSource(CafeMakerApiBase),
+            }
+            let defaultSource: () => DataSource = dataSources['yyyy.games']
             if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") {
                 var { LocalRecipeSource } = await import('../components/recipe-manager/local-source')
-                switch (this.dataSource) {
-                    case 'local':
-                        return new LocalRecipeSource()
-                    case 'xivapi': return new XivApiRecipeSource(XivapiBase, this.dataSourceLang)
-                    case 'cafe': return new XivApiRecipeSource(CafeMakerApiBase)
-                    default: return new LocalRecipeSource()
-                }
-            } else {
-                switch (this.dataSource) {
-                    case 'yyyy.games': return new WebSource(YYYYGamesApiBase)
-                    case 'xivapi': return new XivApiRecipeSource(XivapiBase, this.dataSourceLang)
-                    case 'cafe': return new XivApiRecipeSource(CafeMakerApiBase)
-                    default: return new XivApiRecipeSource(CafeMakerApiBase)
-                }
+                let localSource = () => new LocalRecipeSource()
+                dataSources['local'] = localSource
+                defaultSource = localSource
             }
+
+            return (dataSources[this.dataSource] ?? defaultSource)()
         }
     },
     actions: {