feat: coding#70 clean instead of continue

Author: shaunthegeek

app/Commands/WikiImportCommand.php

@@ -39,7 +39,7 @@ class WikiImportCommand extends Command
  {--coding_team_domain= : CODING 团队域名，如 xxx.coding.net 即填写 xxx}
  {--coding_project_uri= : CODING 项目标识，如 xxx.coding.net/p/yyy 即填写 yyy}
  {--save-markdown : 本地保留生成的 Markdown 文件}
- {--continue : 断点续传}
+ {--clean : 清除上次产生的本地临时文件，比如断点续传的日志}
 ';
 
 /**
@@ -186,6 +186,7 @@ private function handleConfluenceHtml(): int
  }
 $this->info('发现 ' . count($pages['tree']) . ' 个一级页面');
 $this->info("开始导入 CODING：");
+$this->clean($htmlDir);
 $this->uploadConfluencePages($htmlDir, $pages['tree'], $pages['titles']);
  } catch (\ErrorException$e) {
 $this->error($e->getMessage());
@@ -195,11 +196,18 @@ private function handleConfluenceHtml(): int
 return0;
  }
 
-privatefunctionuploadConfluencePages(string$htmlDir, array$tree, array$titles, int$parentId = 0): void
+privatefunctionclean(string$htmlDir): void
  {
-if ($this->option('continue') && file_exists($htmlDir . DIRECTORY_SEPARATOR . 'success.log')) {
+if ($this->option('clean')) {
+ File::delete($htmlDir . DIRECTORY_SEPARATOR . 'success.log');
+ }
+if (file_exists($htmlDir . DIRECTORY_SEPARATOR . 'success.log')) {
 $this->importedPages = parse_ini_file($htmlDir . DIRECTORY_SEPARATOR . 'success.log');
  }
+ }
+
+privatefunctionuploadConfluencePages(string$htmlDir, array$tree, array$titles, int$parentId = 0): void
+ {
 foreach ($treeas$page => $subPages) {
 $title = $titles[$page];
 $wikiId = $this->uploadConfluencePage($htmlDir . DIRECTORY_SEPARATOR . $page, $title, $parentId);
@@ -214,7 +222,7 @@ private function uploadConfluencePages(string $htmlDir, array $tree, array $titl
 privatefunctionuploadConfluencePage(string$filePath, string$title = '', int$parentId = 0): int
  {
 $page = basename($filePath);
-if ($this->option('continue') && isset($this->importedPages[$page])) {
+if (!$this->option('clean') && isset($this->importedPages[$page])) {
 $this->warn('断点续传，跳过页面：' . $page);
 return$this->importedPages[$page];
  }
@@ -247,7 +255,6 @@ private function uploadConfluencePage(string $filePath, string $title = '', int
 $parentId,
  );
 $this->info('上传成功，正在处理，任务 ID：' . $result['JobId']);
-$wikiId = null;
 try {
 $jobStatus = $this->codingWiki->getImportJobStatusWithRetry(
 $this->codingToken,
@@ -265,9 +272,7 @@ private function uploadConfluencePage(string $filePath, string $title = '', int
 returnfalse;
  }
 $this->codingWiki->updateTitle($this->codingToken, $this->codingProjectUri, $wikiId, $title);
-if ($this->option('continue')) {
-file_put_contents($htmlDir . DIRECTORY_SEPARATOR . 'success.log', "$page = $wikiId\n", FILE_APPEND);
- }
+file_put_contents($htmlDir . DIRECTORY_SEPARATOR . 'success.log', "$page = $wikiId\n", FILE_APPEND);
 return$wikiId;
  }
 

tests/Feature/WikiImportCommandTest.php

@@ -5,7 +5,6 @@
 useApp\Coding\Disk;
 useApp\Coding\Wiki;
 useConfluence\Content;
-useIlluminate\Support\Facades\File;
 useLaravelFans\Confluence\Facades\Confluence;
 useMockery\MockInterface;
 useTests\TestCase;
@@ -181,8 +180,10 @@ public function testHandleConfluenceHtmlSuccess()
 $this->instance(Disk::class, $mockDisk);
 $mockDisk->shouldReceive('uploadAttachments')->times(4)->andReturn([]);
 
- File::delete($this->dataDir . '/confluence/space1/success.log');
-$this->artisan('wiki:import', ['--save-markdown' => true, '--continue' => true])
+$log = "image-demo_65619.html = 27\n"
+ . "65591.html = 27\n";
+file_put_contents($this->dataDir . '/confluence/space1/success.log', $log);
+$this->artisan('wiki:import', ['--save-markdown' => true, '--clean' => true])
  ->expectsQuestion('数据来源？', 'Confluence')
  ->expectsQuestion('数据类型？', 'HTML')
  ->expectsQuestion('空间导出的 HTML zip 文件路径', $this->dataDir . 'confluence/space1/')
@@ -334,7 +335,7 @@ public function testHandleConfluenceHtmlContinueSuccess()
 $log = "image-demo_65619.html = 27\n"
  . "65591.html = 27\n";
 file_put_contents($this->dataDir . '/confluence/space1/success.log', $log);
-$this->artisan('wiki:import', ['--continue' => true])
+$this->artisan('wiki:import')
  ->expectsQuestion('数据来源？', 'Confluence')
  ->expectsQuestion('数据类型？', 'HTML')
  ->expectsQuestion('空间导出的 HTML zip 文件路径', $this->dataDir . 'confluence/space1/')