yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: images and files with cyrillic names don't import (#4654)

Browse Source 
closes #4559
This commit is contained in:
Tom Moor
2023-01-06 06:02:15 -08:00
committed by GitHub
parent cbd9971bc7
commit 4b47bffcf5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/queues/tasks/ImportMarkdownZipTask.ts
View File

@@ -152,22 +152,20 @@ export default class ImportMarkdownZipTask extends ImportTask {
// and replace them out with attachment redirect urls before continuing. // and replace them out with attachment redirect urls before continuing.
for (const document of output.documents) { for (const document of output.documents) {
for (const attachment of output.attachments) { for (const attachment of output.attachments) {
const encodedPath = encodeURI(attachment.path);
// Pull the collection and subdirectory out of the path name, upload // Pull the collection and subdirectory out of the path name, upload
// folders in an export are relative to the document itself // folders in an export are relative to the document itself
const normalizedAttachmentPath = attachment.path.replace( const normalizedAttachmentPath = encodedPath.replace(
/(.*)uploads\//, /(.*)uploads\//,
"uploads/" "uploads/"
); );
const reference = `<<${attachment.id}>>`; const reference = `<<${attachment.id}>>`;
document.text = document.text document.text = document.text
.replace(new RegExp(escapeRegExp(attachment.path), "g"), reference) .replace(new RegExp(escapeRegExp(encodedPath), "g"), reference)
.replace( .replace(
new RegExp(escapeRegExp(normalizedAttachmentPath), "g"), new RegExp(`/?${escapeRegExp(normalizedAttachmentPath)}`, "g"),
reference
)
.replace(
new RegExp(escapeRegExp(`/${normalizedAttachmentPath}`), "g"),
reference reference
); );
} }