fix: New external instance should on the front of the list with corre…

…ct name
Voxelum · Jun 8, 2023 · 4c56244 · 4c56244
1 parent 3c7a30e
commit 4c56244
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/xmcl-keystone-ui/src/composables/instanceSort.ts b/xmcl-keystone-ui/src/composables/instanceSort.ts
@@ -7,11 +7,7 @@ export function useSortedInstance() {
   const { state } = useService(InstanceServiceKey)
   const unordered = computed(() => state.instances)
 
-  const sorted = computed(() => {
-    const result = unordered.value.slice().sort((a, b) => ordered.value.indexOf(a.path) - ordered.value.indexOf(b.path))
-    // console.log(result)
-    return result
-  })
+  const sorted = computed(() => unordered.value.slice().reverse().sort((a, b) => ordered.value.indexOf(a.path) - ordered.value.indexOf(b.path)))
 
   const setToPrevious = (instancePath: string, pivot: string) => {
     const targetIndex = sorted.value.findIndex(v => v.path === pivot)

diff --git a/xmcl-runtime/lib/services/InstanceService.ts b/xmcl-runtime/lib/services/InstanceService.ts
@@ -528,10 +528,9 @@ export class InstanceService extends StatefulService<InstanceState> implements I
     }))
 
     if (!isVersionIsolated) {
-      const folderName = dirname(path)
       const options: CreateInstanceOption = {
         path,
-        name: isPathDiskRootPath(folderName) ? basename(path) : basename(folderName),
+        name: '',
       }
       if (profile) {
         const sorted = Object.values(profile.profiles).sort((a, b) =>
@@ -576,11 +575,13 @@ export class InstanceService extends StatefulService<InstanceState> implements I
         }
       }
 
+      const dirPath = dirname(path)
+      const folderName = basename(dirPath)
       if (folderName === 'minecraft' || folderName === '.minecraft') {
         const name = getExpectVersion(options.runtime)
         options.name = name
       } else {
-        options.name = folderName
+        options.name = isPathDiskRootPath(dirPath) ? basename(path) : folderName
       }
 
       await this.createInstance(options)