Skip to content

Commit 78862d2

Browse files
committed
fix: #36 crash when attachment in content
1 parent c994af0 commit 78862d2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

app/Confluence.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@ public function parsePageHtml(string $filename, string $spaceName): array
3535

3636
public function htmlFile2Markdown(string $filename): string
3737
{
38+
$html = preg_replace(
39+
'|<span class="confluence-embedded-file-wrapper">.*</span>|',
40+
'',
41+
file_get_contents($filename)
42+
);
3843
libxml_use_internal_errors(true);
39-
$this->document->loadHTMLFile($filename);
44+
$this->document->loadHTML($html);
4045

4146
$html = $this->document->saveHTML($this->document->getElementById('main-content'));
4247
return $this->htmlConverter->convert($html);

tests/data/confluence/space1/attachment-demo_65615.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ <h1 id="title-heading" class="pagetitle">
3434
Created by <span class='author'> admin</span>, last modified on 六月 08, 2021
3535
</div>
3636
<div id="main-content" class="wiki-content group">
37+
<p><span class="confluence-embedded-file-wrapper"><a class="confluence-embedded-file" href="/download/attachments/65638/11.xlsx?version=1&amp;modificationDate=1627224902336&amp;api=v2" data-nice-type="Excel Spreadsheet" data-file-src="/download/attachments/65638/11.xlsx?version=1&amp;modificationDate=1627224902336&amp;api=v2" data-linked-resource-id="65651" data-linked-resource-type="attachment" data-linked-resource-container-id="65638" data-linked-resource-default-alias="11.xlsx" data-mime-type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" data-has-thumbnail="true" data-linked-resource-version="1"><img src="rest/documentConversion/latest/conversion/thumbnail/65651/1" height="250"/></a></span></p>
3738
<p>This is a demo page with attachment. <a href="attachments/65615/65616.txt"
3839
data-linked-resource-id="65616"
3940
data-linked-resource-version="1"

0 commit comments

Comments
 (0)