fix: Should identify the server created save

Voxelum · Aug 22, 2024 · 4c74ecc · 4c74ecc
1 parent d5cd053
commit 4c74ecc
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 3 deletions.
diff --git a/xmcl-keystone-ui/locales/de.yaml b/xmcl-keystone-ui/locales/de.yaml
@@ -1205,6 +1205,7 @@ save:
   shared: Instanz verwendet freigegebenen Speicherordner
   showDirectory: Speicherverzeichnis anzeigen
   unselected: gemeinsames Archiv
+  useCurrent: Aktuelle Welt verwenden
 saves: {}
 screenshots:
   empty: Sie haben keine Bildschirmfotos

diff --git a/xmcl-keystone-ui/locales/en.yaml b/xmcl-keystone-ui/locales/en.yaml
@@ -1115,6 +1115,7 @@ save:
   shared: Instance use shared saves folder
   showDirectory: Show saves directory
   unselected: Shared Saves
+  useCurrent: Use current world
 saves: {}
 screenshots:
   empty: You don't have screenshots

diff --git a/xmcl-keystone-ui/locales/es-ES.yaml b/xmcl-keystone-ui/locales/es-ES.yaml
@@ -842,6 +842,7 @@ save:
   shared: La instancia utiliza la carpeta guardada compartida
   showDirectory: Mostrar directorio de guardado
   unselected: archivo compartido
+  useCurrent: Usar el mundo actual
 saves: {}
 screenshots:
   empty: No tienes capturas de pantalla

diff --git a/xmcl-keystone-ui/locales/fr.yaml b/xmcl-keystone-ui/locales/fr.yaml
@@ -1158,6 +1158,7 @@ save:
   shared: L'instance utilise le dossier de sauvegarde partagé
   showDirectory: Afficher le répertoire de sauvegarde
   unselected: archives partagées
+  useCurrent: Utiliser le monde actuel
 saves: {}
 screenshots:
   empty: Vous n'avez pas de capture d'écran

diff --git a/xmcl-keystone-ui/locales/gl.yaml b/xmcl-keystone-ui/locales/gl.yaml
@@ -351,6 +351,7 @@ save:
   shared: A instancia utiliza o cartafol de gardados compartidos
   showDirectory: Mostrar o directorio de gardar
   unselected: arquivo compartido
+  useCurrent: Usa o mundo actual
 saves: {}
 server:
   maxPlayers: Máximo xogadores

diff --git a/xmcl-keystone-ui/locales/hu.yaml b/xmcl-keystone-ui/locales/hu.yaml
@@ -1144,6 +1144,7 @@ save:
   shared: Példány megosztott mentési mappa használata
   showDirectory: Mentés könyvtár megjelenítése
   unselected: megosztott archívum
+  useCurrent: Használja a jelenlegi világot
 saves: {}
 screenshots:
   empty: Nincsenek képernyőképeid

diff --git a/xmcl-keystone-ui/locales/it-IT.yaml b/xmcl-keystone-ui/locales/it-IT.yaml
@@ -1141,6 +1141,7 @@ save:
   shared: L'istanza utilizza la cartella di salvataggio condivisa
   showDirectory: Mostra la directory di salvataggio
   unselected: archivio condiviso
+  useCurrent: Usa il mondo attuale
 saves: {}
 screenshots:
   empty: Non hai screenshot

diff --git a/xmcl-keystone-ui/locales/pl.yaml b/xmcl-keystone-ui/locales/pl.yaml
@@ -1152,6 +1152,7 @@ save:
   shared: Instancja korzysta ze wspólnego folderu zapisów
   showDirectory: Pokaż katalog zapisu
   unselected: wspólne archiwum
+  useCurrent: Użyj obecnego świata
 saves: {}
 screenshots:
   empty: Nie masz zrzutów ekranu

diff --git a/xmcl-keystone-ui/locales/ru.yaml b/xmcl-keystone-ui/locales/ru.yaml
@@ -1202,6 +1202,7 @@ save:
   shared: Экземпляр использует общую папку сохранений
   showDirectory: Открыть папку с мирами
   unselected: общий архив
+  useCurrent: Использовать текущий мир
 screenshots:
   empty: У вас нет снимков экрана
   goto: Открыть папку со снимками экрана

diff --git a/xmcl-keystone-ui/locales/uk.yaml b/xmcl-keystone-ui/locales/uk.yaml
@@ -1113,6 +1113,7 @@ save:
   shared: Екземпляр використовує спільну папку збереження
   showDirectory: Показати каталог збереження
   unselected: спільний архів
+  useCurrent: Використовуйте поточний світ
 saves: {}
 screenshots:
   empty: У вас немає скріншотів

diff --git a/xmcl-keystone-ui/locales/zh-CN.yaml b/xmcl-keystone-ui/locales/zh-CN.yaml
@@ -1068,6 +1068,7 @@ save:
   shared: 实例使用共享存档文件夹
   showDirectory: 显示保存目录
   unselected: 共享的存档
+  useCurrent: 使用当前世界
 saves: {}
 screenshots:
   empty: 您还没有截图

diff --git a/xmcl-keystone-ui/locales/zh-TW.yaml b/xmcl-keystone-ui/locales/zh-TW.yaml
@@ -1065,6 +1065,7 @@ save:
   shared: 實例使用共享存档資料夾
   showDirectory: 顯示儲存目錄
   unselected: 共享的存檔
+  useCurrent: 使用當前世界
 saves: {}
 screenshots:
   empty: 您還沒有截圖

diff --git a/xmcl-keystone-ui/src/views/AppLaunchServerDialog.vue b/xmcl-keystone-ui/src/views/AppLaunchServerDialog.vue
@@ -79,9 +79,9 @@
                 @click="toggle"
               >
                 <v-icon size="80">
-                  add
+                  {{ rawWorldExists ? 'save' : 'add' }}
                 </v-icon>
-                {{ t('save.createNew') }}
+                {{ rawWorldExists ? t('save.useCurrent') : t('save.createNew') }}
               </v-card>
             </v-item>
             <v-item
@@ -259,6 +259,7 @@ const onlineMode = ref(false)
 const isAcceptEula = ref(false)
 const nogui = ref(false)
 const linkedWorld = ref('')
+const rawWorldExists = ref(false)
 const { getEULA, setEULA, getServerProperties, setServerProperties } = useService(InstanceOptionsServiceKey)
 const { linkSaveAsServerWorld, getLinkedSaveWorld } = useService(InstanceSavesServiceKey)
 
@@ -302,6 +303,7 @@ const { isShown } = useDialog('launch-server', () => {
     _eula = v
   })
   getLinkedSaveWorld(path.value).then((v) => {
+    rawWorldExists.value = v !== undefined && v !== ''
     linkedWorld.value = v ?? ''
   })
   getServerInstanceMods(path.value).then((mods) => {

diff --git a/xmcl-runtime-api/src/services/InstanceSavesService.ts b/xmcl-runtime-api/src/services/InstanceSavesService.ts
@@ -167,7 +167,7 @@ export interface InstanceSavesService {
   /**
    * Get the linked save world path.
    * @param instancePath
-   * @return The linked save world path. Should if it's a origial world folder them it's unlinked folder existed. `undefined` if no folder existed.
+   * @return The linked save world path. Empty string if it's a raw world folder, else it's linked folder existed. `undefined` if no folder existed.
    */
   getLinkedSaveWorld(instancePath: string): Promise<string | undefined>
 }