From 9fe3c4fa9196446f7d7534f6b7fd6acca277fe9b Mon Sep 17 00:00:00 2001
From: Leilei332 <LeiYiXia29@outlook.com>
Date: Mon, 19 Aug 2024 10:56:42 +0800
Subject: [PATCH] Use template to handle image import

---
 core/ui/EditorToolbar/file-import.tid         | 46 ++-----------------
 core/ui/FileImportTemplate.tid                | 43 +++++++++++++++++
 core/wiki/config/EditorEnableImportFilter.tid |  2 +-
 .../markdown/EditorToolbar/file-import.tid    |  9 ++++
 4 files changed, 58 insertions(+), 42 deletions(-)
 create mode 100644 core/ui/FileImportTemplate.tid
 create mode 100644 plugins/tiddlywiki/markdown/EditorToolbar/file-import.tid

diff --git a/core/ui/EditorToolbar/file-import.tid b/core/ui/EditorToolbar/file-import.tid
index 20cff547d..6ccdf3049 100644
--- a/core/ui/EditorToolbar/file-import.tid
+++ b/core/ui/EditorToolbar/file-import.tid
@@ -1,45 +1,9 @@
 title: $:/core/ui/EditorToolbar/file-import
 tags: $:/tags/EditorTools
+image: [img[$title$]]
+file: [[$title$]]
+regexp-search:
+regexp-replace:
 condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 
-\define lingo-base() $:/language/Import/
-
-\define closePopupActions()
-<$action-deletetiddler $filter="[title<importState>] [title<importTitle>]"/>
-\end
-
-\define replacement-text-image() [img[$title$]]
-
-\define replacement-text-file() [[$title$]]
-
-\define postImportActions()
-\whitespace trim
-<$list filter="[<importTitle>links[]] :reduce[get[type]prefix[image]then<replacement-text-image>else<replacement-text-file>search-replace[$title$],<currentTiddler>addprefix<accumulator>]" variable="imageTitle">
-<$action-sendmessage
-	$message="tm-edit-text-operation"
-	$param="insert-text"
-	text=<<imageTitle>>
-/>
-</$list>
-<<closePopupActions>>
-\end
-
-\define buttons()
-\whitespace trim
-<$button class="tc-btn-invisible" actions=<<closePopupActions>> ><<lingo Listing/Cancel/Caption>></$button>
-&#32;
-<$button class="tc-btn-invisible" message="tm-perform-import" param=<<importTitle>> actions=<<postImportActions>> ><<lingo Listing/Import/Caption>></$button>
-\end
-
-\whitespace trim
-<$reveal type="popup" state=<<importState>> tag="div" class="tc-editor-importpopup">
-<div class="tc-editor-import">
-<$list filter="[<importTitle>field:plugin-type[import]]">
-<h2><<lingo Editor/Import/Heading>></h2>
-<$tiddler tiddler=<<importTitle>>>
-{{||$:/core/ui/ImportListing}}
-<<buttons>>
-</$tiddler>
-</$list>
-</div>
-</$reveal>
+{{||$:/core/ui/FileImportTemplate}}
diff --git a/core/ui/FileImportTemplate.tid b/core/ui/FileImportTemplate.tid
new file mode 100644
index 000000000..d36e2f9e5
--- /dev/null
+++ b/core/ui/FileImportTemplate.tid
@@ -0,0 +1,43 @@
+title: $:/core/ui/FileImportTemplate
+
+\whitespace trim
+
+\procedure lingo-base() $:/language/Import/
+
+\procedure closePopupActions()
+<$action-deletetiddler $filter="[title<importState>] [title<importTitle>]"/>
+\end
+
+\procedure postImportActions()
+<$list filter="[<importTitle>links[]]">
+	<$let escaped-title={{{ [<currentTiddler>search-replace:g:regexp<replacement-regexp>,<replacement-replace>] }}}>
+		<$let insertText={{{ [get[type]prefix[image]then<replacement-text-image>else<replacement-text-file>search-replace[$title$],<escaped-title>] }}}>
+			<$action-sendmessage
+				$message="tm-edit-text-operation"
+				$param="insert-text"
+				text=<<insertText>>
+			/>
+		</$let>
+	</$let>
+</$list>
+<<closePopupActions>>
+\end
+
+\procedure buttons()
+<$button class="tc-btn-invisible tc-small-gap-right" actions=<<closePopupActions>> ><<lingo Listing/Cancel/Caption>></$button>
+<$button class="tc-btn-invisible" message="tm-perform-import" param=<<importTitle>> actions=<<postImportActions>> ><<lingo Listing/Import/Caption>></$button>
+\end
+
+<$let replacement-text-image={{!!image}} replacement-text-file={{!!file}} replacement-regexp={{!!regexp-search}} replacement-replace={{!!regexp-replace}}>
+<$reveal type="popup" state=<<importState>> tag="div" class="tc-editor-importpopup">
+<div class="tc-editor-import">
+<$list filter="[<importTitle>field:plugin-type[import]]">
+<h2><<lingo Editor/Import/Heading>></h2>
+<$tiddler tiddler=<<importTitle>>>
+{{||$:/core/ui/ImportListing}}
+<<buttons>>
+</$tiddler>
+</$list>
+</div>
+</$reveal>
+</$let>
diff --git a/core/wiki/config/EditorEnableImportFilter.tid b/core/wiki/config/EditorEnableImportFilter.tid
index 55d068e12..805ad72f0 100644
--- a/core/wiki/config/EditorEnableImportFilter.tid
+++ b/core/wiki/config/EditorEnableImportFilter.tid
@@ -1,4 +1,4 @@
 title: $:/config/Editor/EnableImportFilter
 type: text/vnd.tiddlywiki
 
-[all[current]type[text/vnd.tiddlywiki]] [all[current]!has[type]]
\ No newline at end of file
+[all[current]type[text/vnd.tiddlywiki]] [all[current]!has[type]] [all[current]type[text/markdown]] [all[current]type[text/x-markdown]]
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/file-import.tid b/plugins/tiddlywiki/markdown/EditorToolbar/file-import.tid
new file mode 100644
index 000000000..9335d20b8
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/file-import.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/file-import
+tags: $:/tags/EditorTools
+image: ![](<#$title$>)
+file: [](<#$title$>)
+regexp-search: [()<>\\]
+regexp-replace: \$&
+condition: [<targetTiddler>type[text/x-markdown]] [<targetTiddler>type[text/markdown]]
+
+{{||$:/core/ui/FileImportTemplate}}
\ No newline at end of file