Skip to content

Commit 9c268e3

shaunthegeek shaunthegeek

committed

feat: #66 ignore page not found

1 parent bbfb879 commit 9c268e3Copy full SHA for 9c268e3

File tree

4 files changed

+39

-21

lines changed

app
- Commands
  - WikiImportCommand.php
- Confluence.php
tests
- Feature
  - WikiImportCommandTest.php
- data/confluence/space1
  - index.html

4 files changed

+39

-21

lines changed

`‎app/Commands/WikiImportCommand.php‎`

Lines changed: 31 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use Confluence\Content;`
`8`	`8`	`use DOMDocument;`
`9`	`9`	`use Exception;`
	`10`	`+use Illuminate\Contracts\Filesystem\FileNotFoundException;`
`10`	`11`	`use Illuminate\Support\Str;`
`11`	`12`	`use LaravelFans\Confluence\Facades\Confluence;`
`12`	`13`	`use LaravelZero\Framework\Commands\Command;`
`@@ -192,26 +193,13 @@ private function uploadConfluencePages(string $dataPath, array $tree, array $tit`
`192`	`193`	`foreach ($tree as $page => $subPages) {`
`193`	`194`	`$title = $titles[$page];`
`194`	`195`	`$this->info('标题:' . $title);`
`195`		`- $markdown = $this->confluence->htmlFile2Markdown($dataPath . $page);`
`196`		`- $attachments = $this->confluence->parseAttachments($dataPath . $page, $markdown);`
`197`		`- $codingAttachments = $this->codingDisk->uploadAttachments(`
`198`		`- $this->codingToken,`
`199`		`- $this->codingProjectUri,`
`200`		`- $dataPath,`
`201`		`- $attachments`
`202`		`- );`
`203`		`- foreach ($codingAttachments as $attachmentPath => $codingAttachment) {`
`204`		`- if (empty($codingAttachment)) {`
`205`		`- $message = '错误:文件上传失败 ' . $attachmentPath;`
`206`		`- $this->error($message);`
`207`		`- $this->errors[] = $message;`
`208`		`- }`
`209`		`- }`
`210`		`- $markdown = $this->codingWiki->replaceAttachments($markdown, $codingAttachments);`
`211`		`- $mdFilename = substr($page, 0, -5) . '.md';`
`212`		`- if ($this->option('save-markdown')) {`
`213`		`- file_put_contents($dataPath . $mdFilename, $markdown . "\n");`
	`196`	`+ try {`
	`197`	`+ $markdown = $this->confluence->htmlFile2Markdown($dataPath . $page);`
	`198`	`+ } catch (FileNotFoundException $e) {`
	`199`	`+ $this->error('页面不存在:' . $dataPath . $page);`
	`200`	`+ continue;`
`214`	`201`	`}`
	`202`	`+ $mdFilename = $this->dealAttachments($dataPath, $page, $markdown);`
`215`	`203`	`$zipFilePath = $this->codingWiki->createMarkdownZip($markdown, $dataPath, $mdFilename, $title);`
`216`	`204`	`$result = $this->codingWiki->createWikiByUploadZip(`
`217`	`205`	`$this->codingToken,`
`@@ -277,4 +265,28 @@ private function unzipConfluenceHtml(): string`
`277`	`265`	`}`
`278`	`266`	`return str_ends_with($dataPath, '/index.html') ? substr($dataPath, 0, -10) : Str::finish($dataPath, '/');`
`279`	`267`	`}`
	`268`	`+`
	`269`	`+ private function dealAttachments(string $dataPath, string $page, string $markdown): string`
	`270`	`+ {`
	`271`	`+ $attachments = $this->confluence->parseAttachments($dataPath . $page, $markdown);`
	`272`	`+ $codingAttachments = $this->codingDisk->uploadAttachments(`
	`273`	`+ $this->codingToken,`
	`274`	`+ $this->codingProjectUri,`
	`275`	`+ $dataPath,`
	`276`	`+ $attachments`
	`277`	`+ );`
	`278`	`+ foreach ($codingAttachments as $attachmentPath => $codingAttachment) {`
	`279`	`+ if (empty($codingAttachment)) {`
	`280`	`+ $message = '错误:文件上传失败 ' . $attachmentPath;`
	`281`	`+ $this->error($message);`
	`282`	`+ $this->errors[] = $message;`
	`283`	`+ }`
	`284`	`+ }`
	`285`	`+ $markdown = $this->codingWiki->replaceAttachments($markdown, $codingAttachments);`
	`286`	`+ $mdFilename = substr($page, 0, -5) . '.md';`
	`287`	`+ if ($this->option('save-markdown')) {`
	`288`	`+ file_put_contents($dataPath . $mdFilename, $markdown . "\n");`
	`289`	`+ }`
	`290`	`+ return $mdFilename;`
	`291`	`+ }`
`280`	`292`	`}`

`‎app/Confluence.php‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use DOMDocument;`
`6`	`6`	`use DOMXPath;`
	`7`	`+use Illuminate\Support\Facades\File;`
`7`	`8`	`use League\HTMLToMarkdown\Converter\TableConverter;`
`8`	`9`	`use League\HTMLToMarkdown\HtmlConverter;`
`9`	`10`
`@@ -46,7 +47,7 @@ public function htmlFile2Markdown(string $filename): string`
`46`	`47`	`'\|<img .* src="data:.*/>\|',`
`47`	`48`	`],`
`48`	`49`	`'',`
`49`		`- file_get_contents($filename)`
	`50`	`+ File::get($filename)`
`50`	`51`	`);`
`51`	`52`	`libxml_use_internal_errors(true);`
`52`	`53`	`$this->document->loadHTML($html);`

`‎tests/Feature/WikiImportCommandTest.php‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,10 @@ public function testHandleConfluenceHtmlSuccess()`
`186`	`186`	`->expectsQuestion('空间导出的 HTML zip 文件路径', $this->dataDir . 'confluence/space1/')`
`187`	`187`	`->expectsOutput('空间名称:空间 1')`
`188`	`188`	`->expectsOutput('空间标识:space1')`
`189`		`- ->expectsOutput('发现 2 个一级页面')`
	`189`	`+ ->expectsOutput('发现 3 个一级页面')`
`190`	`190`	`->expectsOutput("开始导入 CODING:")`
	`191`	`+ ->expectsOutput('标题:Not Found')`
	`192`	`+ ->expectsOutput('页面不存在:' . $this->dataDir . 'confluence/space1/not-found.html')`
`191`	`193`	`->expectsOutput('标题:Image Demo')`
`192`	`194`	`->expectsOutput('上传成功,正在处理,任务 ID:a12353fa-f45b-4af2-83db-666bf9f66615')`
`193`	`195`	`->expectsOutput('标题:你好世界')`

`‎tests/data/confluence/space1/index.html‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ <h1 id="title-heading" class="pagetitle">`
`44`	`44`	`<h2 class="pageSectionTitle">Available Pages:</h2>`
`45`	`45`	`</div>`
`46`	`46`	`<ul>`
	`47`	`+ <li>`
	`48`	`+ <a href="not-found.html">Not Found</a>`
	`49`	`+`
`47`	`50`	`<li>`
`48`	`51`	`<a href="image-demo_65619.html">Image Demo</a>`
`49`	`52`

0 commit comments

Comments

(0)