chore: #57 output errors in the end

Author: shaunthegeek

app/Commands/WikiImportCommand.php

@@ -18,6 +18,8 @@ class WikiImportCommand extends Command
 
     protected Disk $codingDisk;
     protected Wiki $codingWiki;
+    protected array $errors = [];
+
     /**
      * The signature of the command.
      *
@@ -81,12 +83,21 @@ public function handle(Disk $codingDisk, Wiki $codingWiki, \App\Confluence $conf
         }
         switch ($dataType) {
             case 'HTML':
-                return $this->handleConfluenceHtml();
+                $this->handleConfluenceHtml();
+                break;
             case 'API':
-                return $this->handleConfluenceApi();
+                $this->handleConfluenceApi();
+                break;
             default:
                 break;
         }
+        if (!empty($this->errors)) {
+            $this->info('报错信息汇总：');
+        }
+        foreach ($this->errors as $error) {
+            $this->error($error);
+        }
+        return count($this->errors);
     }
 
     private function createWiki($data)
@@ -139,7 +150,9 @@ private function handleConfluenceHtml(): int
         $htmlDir = $this->unzipConfluenceHtml();
         $filePath = $htmlDir . 'index.html';
         if (!file_exists($filePath)) {
-            $this->error("文件不存在：$filePath");
+            $message = "文件不存在：$filePath";
+            $this->error($message);
+            $this->errors[] = $message;
             return 1;
         }
         try {
@@ -187,6 +200,13 @@ private function uploadConfluencePages(string $dataPath, array $tree, array $tit
                 $dataPath,
                 $attachments
             );
+            foreach ($codingAttachments as $attachmentPath => $codingAttachment) {
+                if (empty($codingAttachment)) {
+                    $message = '错误：文件上传失败 ' . $attachmentPath;
+                    $this->error($message);
+                    $this->errors[] = $message;
+                }
+            }
             $markdown = $this->codingWiki->replaceAttachments($markdown, $codingAttachments);
             $mdFilename = substr($page, 0, -5) . '.md';
             if ($this->option('save-markdown')) {
@@ -208,14 +228,18 @@ private function uploadConfluencePages(string $dataPath, array $tree, array $tit
                     $result['JobId']
                 );
             } catch (Exception $e) {
-                $this->error('错误：导入失败，跳过');
+                $message = '错误：导入失败，跳过 ' . $title . ' ' . $page;
+                $this->error($message);
+                $this->errors[] = $message;
                 continue;
             }
             if ($jobStatus['Status'] == 'success') {
                 $wikiId = intval($jobStatus['Iids'][0]);
             }
             if (empty($wikiId)) {
-                $this->error('错误：导入失败，跳过');
+                $message = '错误：导入失败，跳过 ' . $title . ' ' . $page;
+                $this->error($message);
+                $this->errors[] = $message;
                 continue;
             }
             $this->codingWiki->updateTitle($this->codingToken, $this->codingProjectUri, $wikiId, $title);

tests/Feature/WikiImportCommandTest.php

@@ -121,7 +121,7 @@ public function testHandleShow()
             ->assertExitCode(0);
     }
 
-    public function testHandleConfluenceHtmlFileNotExist()
+    public function testHandleConfluenceHtmlDirNotExist()
     {
         $codingToken = $this->faker->md5;
         config(['coding.token' => $codingToken]);
@@ -133,15 +133,27 @@ public function testHandleConfluenceHtmlFileNotExist()
         $this->artisan('wiki:import')
             ->expectsQuestion('数据来源？', 'Confluence')
             ->expectsQuestion('数据类型？', 'HTML')
-            ->expectsQuestion('空间导出的 HTML zip 文件路径', '~/Downloads/')
-            ->expectsOutput('文件不存在：~/Downloads/index.html')
+            ->expectsQuestion('空间导出的 HTML zip 文件路径', '/dev/null/')
+            ->expectsOutput('文件不存在：/dev/null/index.html')
+            ->expectsOutput('报错信息汇总：')
+            ->expectsOutput('文件不存在：/dev/null/index.html')
             ->assertExitCode(1);
+    }
+
+    public function testHandleConfluenceHtmlFileNotExist()
+    {
+        $codingToken = $this->faker->md5;
+        config(['coding.token' => $codingToken]);
+        $codingTeamDomain = $this->faker->domainWord;
+        config(['coding.team_domain' => $codingTeamDomain]);
+        $codingProjectUri = $this->faker->slug;
+        config(['coding.project_uri' => $codingProjectUri]);
 
         $this->artisan('wiki:import')
             ->expectsQuestion('数据来源？', 'Confluence')
             ->expectsQuestion('数据类型？', 'HTML')
-            ->expectsQuestion('空间导出的 HTML zip 文件路径', '~/Downloads/index.html')
-            ->expectsOutput('文件不存在：~/Downloads/index.html')
+            ->expectsQuestion('空间导出的 HTML zip 文件路径', '/dev/null/index.html')
+            ->expectsOutput('文件不存在：/dev/null/index.html')
             ->assertExitCode(1);
     }