Fix WordPress reply relationships during migration

ui/src/composables/use-migrate-task-runner.ts

@@ -39,6 +39,55 @@ export function useMigrateTaskRunner(taskGroups: Ref<MigrateTaskGroup[]>) {
   const failedTasks = computed(() => allTasks.value.filter((task) => task.status === 'failed'))
   const hasFailedTasks = computed(() => failedTasks.value.length > 0)
 
+  function taskKey(task: MigrateTaskItem<any>) {
+    return `${task.type}:${task.id}`
+  }
+
+  async function runTasksInDependencyOrder(tasks: MigrateTaskItem<any>[]) {
+    const tasksToRun = tasks.filter((task) => task.status !== 'running')
+    const remaining = new Set(tasksToRun)
+    const taskByKey = new Map(allTasks.value.map((task) => [taskKey(task), task]))
+
+    tasksToRun.forEach((task) => {
+      task.status = 'pending'
+      task.error = undefined
+    })
+
+    while (remaining.size > 0) {
+      const readyTasks = Array.from(remaining).filter((task) =>
+        (task.dependsOn || []).every((dependencyKey) => {
+          const dependency = taskByKey.get(dependencyKey)
+          return !dependency || dependency.status === 'success'
+        })
+      )
+
+      if (readyTasks.length === 0) {
+        const hasRunningDependency = Array.from(remaining).some((task) =>
+          (task.dependsOn || []).some(
+            (dependencyKey) => taskByKey.get(dependencyKey)?.status === 'running'
+          )
+        )
+        if (hasRunningDependency) {
+          await taskQueue.drained()
+          continue
+        }
+
+        remaining.forEach((task) => {
+          const unresolvedDependencies = (task.dependsOn || []).filter((dependencyKey) => {
+            const dependency = taskByKey.get(dependencyKey)
+            return dependency && dependency.status !== 'success'
+          })
+          task.status = 'failed'
+          task.error = `依赖任务未成功：${unresolvedDependencies.join('、')}`
+        })
+        break
+      }
+
+      await Promise.all(readyTasks.map((task) => taskQueue.push(task)))
+      readyTasks.forEach((task) => remaining.delete(task))
+    }
+  }
+
   watch(
     taskGroups,
     (groups) => {
@@ -49,10 +98,7 @@ export function useMigrateTaskRunner(taskGroups: Ref<MigrateTaskGroup[]>) {
               return
             }
 
-            task.status = 'pending'
-            task.error = undefined
-            importLoading.value = true
-            taskQueue.push(task)
+            void retryTask(task)
           }
         })
       })
@@ -94,19 +140,7 @@ export function useMigrateTaskRunner(taskGroups: Ref<MigrateTaskGroup[]>) {
     isImportStarted.value = true
     beforeUnloadGuard.enable()
 
-    const tasksToRun = [...pendingTasks.value, ...failedTasks.value]
-    tasksToRun.forEach((task) => {
-      if (task.status !== 'running') {
-        task.status = 'pending'
-        task.error = undefined
-      }
-
-      taskQueue.push(task).catch(() => {
-        // error is handled in asyncWorker
-      })
-    })
-
-    await taskQueue.drained()
+    await runTasksInDependencyOrder([...pendingTasks.value, ...failedTasks.value])
 
     importLoading.value = false
     beforeUnloadGuard.disable()
@@ -128,11 +162,7 @@ export function useMigrateTaskRunner(taskGroups: Ref<MigrateTaskGroup[]>) {
     }
 
     importLoading.value = true
-    failedTasks.value.forEach((task) => {
-      task.retry()
-    })
-
-    await taskQueue.drained()
+    await runTasksInDependencyOrder([...failedTasks.value])
 
     importLoading.value = false
 
@@ -148,9 +178,8 @@ export function useMigrateTaskRunner(taskGroups: Ref<MigrateTaskGroup[]>) {
   }
 
   async function retryTask(task: MigrateTaskItem) {
-    task.retry()
     importLoading.value = true
-    await taskQueue.drained()
+    await runTasksInDependencyOrder([task])
     importLoading.value = false
   }
 

ui/src/composables/use-migrate-task.ts

@@ -33,13 +33,15 @@ function createTaskItem<T>(
   type: string,
   label: string,
   item: T,
-  run: () => Promise<TaskResponse>
+  run: () => Promise<TaskResponse>,
+  dependsOn?: string[]
 ): MigrateTaskItem<T> {
   return {
     id,
     type,
     label,
     item,
+    ...(dependsOn?.length ? { dependsOn } : {}),
     status: 'pending',
     run,
     retry: () => {}
@@ -244,6 +246,10 @@ export function useMigrateTask(
         )
       )
     } else {
+      const dependsOn = [`comment:${comment.spec.commentName}`]
+      if (comment.spec.quoteReply) {
+        dependsOn.push(`reply:${comment.spec.quoteReply}`)
+      }
       commentTasks.push(
         createTaskItem(
           comment.metadata?.name || 'unknown',
@@ -253,7 +259,8 @@ export function useMigrateTask(
           () =>
             coreApiClient.content.reply.createReply({
               reply: comment as Reply
-            })
+            }),
+          dependsOn
         )
       )
     }

ui/src/modules/wordpress/use-wordpress-data-parser.ts

@@ -335,7 +335,7 @@ export function useWordPressDataParser(file: File): useWordPressDataParserReturn
   const createReply = (
     reply: Comment,
     refType: 'Post' | 'SinglePage',
-    replyTarget: { commentName: string; quoteReply: string },
+    replyTarget: { commentName: string; quoteReply?: string },
     authorById: Map<number, Author>
   ): MigrateReply => {
     const fallbackAuthor = authorById.get(reply['wp:comment_user_id'])
@@ -368,7 +368,7 @@ export function useWordPressDataParser(file: File): useWordPressDataParserReturn
         creationTime: new Date(reply['wp:comment_date']).toISOString(),
         hidden: false,
         commentName: replyTarget.commentName,
-        quoteReply: replyTarget.quoteReply
+        ...(replyTarget.quoteReply ? { quoteReply: replyTarget.quoteReply } : {})
       },
       status: {},
       ownerRef:
@@ -398,13 +398,13 @@ export function useWordPressDataParser(file: File): useWordPressDataParserReturn
   function resolveWordPressReplyTarget(
     comment: Comment,
     commentById: Map<string, Comment>
-  ): { commentName: string; quoteReply: string } | undefined {
+  ): { commentName: string; quoteReply?: string } | undefined {
     if (comment['wp:comment_parent'] === 0) {
       return undefined
     }
 
-    const quoteReply = String(comment['wp:comment_parent'])
-    const directParent = commentById.get(quoteReply)
+    const directParentName = String(comment['wp:comment_parent'])
+    const directParent = commentById.get(directParentName)
     if (!directParent) {
       return undefined
     }
@@ -415,7 +415,7 @@ export function useWordPressDataParser(file: File): useWordPressDataParserReturn
     while (rootComment['wp:comment_parent'] !== 0) {
       const currentId = String(rootComment['wp:comment_id'])
       if (visited.has(currentId)) {
-        break
+        return undefined
       }
 
       visited.add(currentId)
@@ -427,9 +427,10 @@ export function useWordPressDataParser(file: File): useWordPressDataParserReturn
       rootComment = nextParent
     }
 
+    const commentName = String(rootComment['wp:comment_id'])
     return {
-      commentName: String(rootComment['wp:comment_id']),
-      quoteReply
+      commentName,
+      ...(directParentName !== commentName ? { quoteReply: directParentName } : {})
     }
   }
 

ui/src/types/index.ts

@@ -224,6 +224,7 @@ export interface MigrateTaskItem<T = any> {
   type: string
   label: string
   item: T
+  dependsOn?: string[]
   status: MigrateTaskState
   error?: string
   run: () => Promise<AxiosResponse<any, any>>