fix: #48 multi images inline

shaunthegeek · shaunthegeek · commit 8bb7e94f8cb8 · 2021-08-03T17:56:12.000+08:00
diff --git a/app/Coding/Wiki.php b/app/Coding/Wiki.php
@@ -33,7 +33,7 @@ public function createMarkdownZip($markdown, $path, $markdownFilename): bool|str
             return false;
         }
         $this->zipArchive->addFromString($markdownFilename, $markdown);
-        preg_match_all('/!\[\]\((.+)\)/', $markdown, $matches);
+        preg_match_all('/!\[\]\(([a-z0-9\/\._\-]+)\)/', $markdown, $matches);
         if (!empty($matches)) {
             foreach ($matches[1] as $attachment) {
                 // markdown image title: ![](images/default.svg "admin")
diff --git a/tests/data/confluence/space1/image-demo_65619.html b/tests/data/confluence/space1/image-demo_65619.html
@@ -72,7 +72,15 @@ <h2 id="helloworld-第二章">第二章</h2>
                         data-linked-resource-type="attachment"
                         data-linked-resource-default-alias="github-ubuntu-16.04.png"
                         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>
+                        data-linked-resource-container-id="65619" data-linked-resource-container-version="4"></span><span class="confluence-embedded-file-wrapper confluence-embedded-manual-size"><img
+                        class="confluence-embedded-image" height="250" src="attachments/65619/65624.png"
+                        data-image-src="attachments/65619/65624.png" data-unresolved-comment-count="0"
+                        data-linked-resource-id="65624" data-linked-resource-version="1"
+                        data-linked-resource-type="attachment"
+                        data-linked-resource-default-alias="coding-logo.png"
+                        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>
diff --git a/tests/data/confluence/space1/image-demo_65619.md b/tests/data/confluence/space1/image-demo_65619.md
@@ -20,4 +20,4 @@ It is a long established fact that a reader will be distracted by the readable c
 
 world
 
-![](attachments/65619/65623.png)
+![](attachments/65619/65623.png)![](attachments/65619/65624.png)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function createMarkdownZip($markdown, $path, $markdownFilename): bool\|str`
`33`	`33`	`return false;`
`34`	`34`	`}`
`35`	`35`	`$this->zipArchive->addFromString($markdownFilename, $markdown);`
`36`		`- preg_match_all('/!\[\]\((.+)\)/', $markdown, $matches);`
	`36`	`+ preg_match_all('/!\[\]\(([a-z0-9\/\._\-]+)\)/', $markdown, $matches);`
`37`	`37`	`if (!empty($matches)) {`
`38`	`38`	`foreach ($matches[1] as $attachment) {`
`39`	`39`	`// markdown image title: ![](images/default.svg "admin")`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ It is a long established fact that a reader will be distracted by the readable c`
`20`	`20`
`21`	`21`	`world`
`22`	`22`
`23`		`-![](attachments/65619/65623.png)`
	`23`	`+![](attachments/65619/65623.png)![](attachments/65619/65624.png)`