Skip to content

Commit

Permalink
fix: character not removed when wikilinks are created
Browse files Browse the repository at this point in the history
close #19
  • Loading branch information
Mara-Li committed Aug 11, 2022
1 parent 1715a80 commit 6a175db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "main.js",
"scripts": {
"dev": "node esbuild.config.mjs",
"vault": "node esbuild.config.mjs production && copy main.js \"I:\\Seed\\.obsidian\\plugins\\obsidian-mkdocs-publisher\" && copy styles.css \"I:\\Seed\\.obsidian\\plugins\\obsidian-mkdocs-publisher\"",
"vault": "node esbuild.config.mjs production && copy main.js \"D:\\Documents\\Seed\\.obsidian\\plugins\\obsidian-mkdocs-publisher\" && copy styles.css \"D:\\Documents\\Seed\\.obsidian\\plugins\\obsidian-mkdocs-publisher\"",
"build": "node esbuild.config.mjs production",
"lint": "eslint --ext .ts plugin/",
"lint:fix": "eslint --fix --ext .ts plugin/",
Expand Down
5 changes: 4 additions & 1 deletion plugin/contents_conversion/convertText.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,20 @@ function convertWikilinks(
for (const wikiMatch of wikiMatches) {
const fileMatch = wikiMatch.match(fileRegex);
if (fileMatch) {
const fileName = fileMatch[0].replace('[[', '').replace('|', '');
// @ts-ignore
const fileName = fileMatch[0].replaceAll('[', '').replaceAll('|', '').replaceAll(']', '');
const linkedFile=linkedFiles.find(item => item.linkFrom===fileName);
if (linkedFile) {
const altText = linkedFile.altText.length > 0 ? linkedFile.altText : linkedFile.linked.extension === 'md' ? linkedFile.linked.basename : "";
const linkCreator = `[${altText}](${encodeURI(linkedFile.linkFrom)})`;
console.log('Linked', linkCreator);
fileContent = fileContent.replace(wikiMatch, linkCreator);
} else if (!fileName.startsWith('http')) {
const altMatch = wikiMatch.match(/(\|).*(]])/);
const altCreator = fileName.split('/');
const altLink = creatorAltLink(altMatch, altCreator, fileName.split('.').at(-1));
const linkCreator = `[${altLink}](${encodeURI(fileName.trim())})`;
console.log('link creator not linked', linkCreator);
fileContent = fileContent.replace(wikiMatch, linkCreator);
}
}
Expand Down

0 comments on commit 6a175db

Please sign in to comment.