fix: #47 img src data

shaunthegeek · shaunthegeek · commit 25e8b633d38f · 2021-08-03T17:18:35.000+08:00
diff --git a/app/Coding/Wiki.php b/app/Coding/Wiki.php
@@ -39,6 +39,10 @@ public function createMarkdownZip($markdown, $path, $markdownFilename): bool|str
                 // markdown image title: ![](images/default.svg "admin")
                 $tmp = explode(' ', $attachment);
                 $filename = $tmp[0];
+                if (!file_exists($path . $filename)) {
+                    error_log("文件不存在：$filename");
+                    continue;
+                }
                 $this->zipArchive->addFile($path . $filename, $filename);
             }
         }
diff --git a/app/Confluence.php b/app/Confluence.php
@@ -40,6 +40,7 @@ public function htmlFile2Markdown(string $filename): string
                 '|<span class="confluence-embedded-file-wrapper">.*</span>|',
                 '|<div class="drop-zone-empty-text">.*</div>|s',
                 '|<li class="drop-zone-text hidden">.*</li>|s',
+                '|<img .* src="data:.*/>|',
             ],
             '',
             file_get_contents($filename)
diff --git a/tests/data/confluence/space1/image-demo_65619.html b/tests/data/confluence/space1/image-demo_65619.html
@@ -74,6 +74,7 @@ <h2 id="helloworld-第二章">第二章</h2>
                         data-base-url="http://9.134.190.26:8090" data-linked-resource-content-type="image/png"
                         data-linked-resource-container-id="65619" data-linked-resource-container-version="4"></span></p>
                 <p>
+                <p><img class="drawio-diagram-image" width="821" style="width:821px;" src="data:image/png;base64,iVBORw" /></p>
             </div>
 
             <div class="pageSection group">

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ public function createMarkdownZip($markdown, $path, $markdownFilename): bool\|str`
`39`	`39`	`// markdown image title: ![](images/default.svg "admin")`
`40`	`40`	`$tmp = explode(' ', $attachment);`
`41`	`41`	`$filename = $tmp[0];`
	`42`	`+ if (!file_exists($path . $filename)) {`
	`43`	`+ error_log("文件不存在：$filename");`
	`44`	`+ continue;`
	`45`	`+ }`
`42`	`46`	`$this->zipArchive->addFile($path . $filename, $filename);`
`43`	`47`	`}`
`44`	`48`	`}`