Merge branch 'master' of github.com:akosbalasko/yarle

akosbalasko · Jan 15, 2022 · f1afe20 · f1afe20
2 parents 7bd3661 + a763e4f
commit f1afe20
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 42 deletions.
diff --git a/src/dropTheRopeRunner.ts b/src/dropTheRopeRunner.ts
@@ -8,7 +8,7 @@ import * as yarle from './yarle';
 import { YarleOptions } from './YarleOptions';
 import { loggerInfo } from './utils/loggerInfo';
 import { clearLogFile } from './utils/clearLogFile';
-import { RuntimePropertiesSingleton } from './runtime-properties';
+import { applyLinks } from './utils/apply-links';
 
 export const run = async (opts?: YarleOptions) => {
     clearLogFile();
@@ -35,44 +35,5 @@ export const run = async (opts?: YarleOptions) => {
     const outputNotebookFolders = await yarle.dropTheRope(options);
 
     // apply internal links
-    const linkNameMap = RuntimePropertiesSingleton.getInstance();
-    const allLinks = linkNameMap.getAllNoteIdNameMap();
-    for (const [linkName, linkProps] of Object.entries(allLinks)) {
-        const fileName: string = (linkProps as any)['title'];
-        const notebookName: string = (linkProps as any)['notebookName'];
-        const encodedFileName = options.urlEncodeFileNamesAndLinks ? encodeURI(fileName as string) : fileName as string;
-
-        for (const notebookFolder of outputNotebookFolders) {
-            let realFileName = encodedFileName;
-            let realFileNameInContent = encodedFileName;
-            if (notebookName && !notebookFolder.endsWith(notebookName)) {
-                realFileName = `${notebookName}${encodedFileName}`;
-                realFileNameInContent = `${notebookName}/${encodedFileName}`;
-            }
-            const filesInOutputDir = fs.readdirSync(notebookFolder);
-            console.log(`Files in output dir: ${JSON.stringify(filesInOutputDir)}`);
-            console.log(`notebookFolder: ${notebookFolder}`);
-            console.log(`realFileName: ${realFileName}`);
-
-            const extension = '.md';
-
-            const targetFiles = filesInOutputDir.filter(file => {
-                return path.extname(file).toLowerCase() === extension;
-            });
-            for (const targetFile of targetFiles) {
-                const fileContent = fs.readFileSync(`${notebookFolder}${path.sep}${targetFile}`, 'UTF-8');
-                const escapedLinkName = escapeEntity(linkName);
-                const regexp = new RegExp(escapedLinkName, 'g');
-                const updatedContent = fileContent.replace(regexp, realFileNameInContent);
-                if (fileContent !== updatedContent) {
-                    console.log(`replaced output written to: ${notebookFolder}${path.sep}${targetFile}`);
-                    fs.writeFileSync(`${notebookFolder}${path.sep}${targetFile}`, updatedContent);
-                }
-            }
-        }
-    }
-};
-
-const escapeEntity = (entity: string): string => {
-    return entity.replace(/\//g, '\\/');
+    applyLinks(options, outputNotebookFolders);
 };
diff --git a/src/ui/main.ts b/src/ui/main.ts
@@ -4,6 +4,7 @@ import url from 'url';
 import path from 'path';
 import electron from 'electron';
 
+import { applyLinks } from '../utils/apply-links';
 import * as yarle from '../yarle';
 import { loggerInfo } from '../utils/loggerInfo';
 
@@ -177,7 +178,9 @@ electron.ipcMain.on('configurationUpdated', (event: any, data: any) => {
 
 electron.ipcMain.on('startConversion', async (event: any, data: any) => {
   const settings = mapSettingsToYarleOptions();
-  await yarle.dropTheRope(settings);
+  const outputNotebookFolders = await yarle.dropTheRope(settings);
+  // apply internal links
+  applyLinks(settings, outputNotebookFolders);
 
 });
 

diff --git a/src/utils/apply-links.ts b/src/utils/apply-links.ts
@@ -0,0 +1,50 @@
+/* istanbul ignore file */
+// tslint:disable:no-console
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { YarleOptions } from './../YarleOptions';
+import { RuntimePropertiesSingleton } from './../runtime-properties';
+
+export const applyLinks = (options: YarleOptions, outputNotebookFolders: Array<string>): void => {
+    const linkNameMap = RuntimePropertiesSingleton.getInstance();
+    const allLinks = linkNameMap.getAllNoteIdNameMap();
+    for (const [linkName, linkProps] of Object.entries(allLinks)) {
+        const fileName: string = (linkProps as any)['title'];
+        const notebookName: string = (linkProps as any)['notebookName'];
+        const encodedFileName = options.urlEncodeFileNamesAndLinks ? encodeURI(fileName as string) : fileName as string;
+
+        for (const notebookFolder of outputNotebookFolders) {
+            let realFileName = encodedFileName;
+            let realFileNameInContent = encodedFileName;
+            if (notebookName && !notebookFolder.endsWith(notebookName)) {
+                realFileName = `${notebookName}${encodedFileName}`;
+                realFileNameInContent = `${notebookName}/${encodedFileName}`;
+            }
+            const filesInOutputDir = fs.readdirSync(notebookFolder);
+            console.log(`Files in output dir: ${JSON.stringify(filesInOutputDir)}`);
+            console.log(`notebookFolder: ${notebookFolder}`);
+            console.log(`realFileName: ${realFileName}`);
+
+            const extension = '.md';
+
+            const targetFiles = filesInOutputDir.filter(file => {
+                return path.extname(file).toLowerCase() === extension;
+            });
+            for (const targetFile of targetFiles) {
+                const fileContent = fs.readFileSync(`${notebookFolder}${path.sep}${targetFile}`, 'UTF-8');
+                const escapedLinkName = escapeEntity(linkName);
+                const regexp = new RegExp(escapedLinkName, 'g');
+                const updatedContent = fileContent.replace(regexp, realFileNameInContent);
+                if (fileContent !== updatedContent) {
+                    console.log(`replaced output written to: ${notebookFolder}${path.sep}${targetFile}`);
+                    fs.writeFileSync(`${notebookFolder}${path.sep}${targetFile}`, updatedContent);
+                }
+            }
+        }
+    }
+};
+
+const escapeEntity = (entity: string): string => {
+    return entity.replace(/\//g, '\\/');
+};