fix: hanging on windows

.github/workflows/release.yaml

@@ -1,8 +1,7 @@
 name: Release
 on:
-  release:
-    types:
-      - created
+    pull_request:
+        branches: [master]
 
 jobs:
 

config.json

@@ -1,6 +1,6 @@
 {
-    "enexSource": "/test/data/test-template.enex",
-    "templateFile": "/sampleTemplate.tmpl",
+    "enexSource": "./test/data/test-template.enex",
+    "templateFile": "./sampleTemplate.tmpl",
     "outputDir": "out",
     "keepOriginalHtml": false,
     "isMetadataNeeded": false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yarle-evernote-to-md",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Yet Another Rope Ladder from Evernote",
   "keywords": [
     "evernote",
@@ -15,7 +15,8 @@
     "yarle": "./dist/dropTheRope.js"
   },
   "scripts": {
-    "clean": "rimraf ./out && rimraf ./dist && rimraf \"node_modules/!(rimraf|.bin)\"",
+    "clean-by-rimraf": "rimraf ./out && rimraf ./dist && rimraf \"node_modules/!(rimraf|.bin)\"",
+    "clean": "rm -f -r ./out && rm -f -r ./dist && rm -r -f ./node_modules",
     "build": "npm i  && tsc --project ./src/tsconfig.json",
     "build:watch": "nodemon --watch src/ --exec \"npm run build\" -e ts",
     "coverage": "nyc mocha",
@@ -26,7 +27,7 @@
     "package": "electron-forge package",
     "make": "electron-forge make",
     "compile": "npm run build && copyfiles -u 1 \"src/ui/**/*\" dist",
-    "start": "tsc  --project ./src/tsconfig.json && electron-forge start",
+    "start": "tsc  --project ./src/tsconfig.json && electron-forge start --inspect-electron",
     "publish": "electron-forge publish",
     "css-build": "node-sass --omit-source-map-url ./src/ui/sass/purecss.scss ./src/ui/css/purecss.css",
     "css-watch": "npm run css-build -- --watch",

src/process-node.ts

@@ -17,7 +17,7 @@ export const processNode = (note: any, notebookName: string): void => {
 
   let dateStarted: Date = new Date();  
   loggerInfo("\n");
-  loggerInfo("Started conversion: " + dateStarted);
+  loggerInfo("Conversion started at " + dateStarted);
 
   if (Array.isArray(note.content))
     note.content = note.content.join('');
@@ -58,7 +58,7 @@ export const processNode = (note: any, notebookName: string): void => {
   // tslint:disable-next-line:no-console
   let dateFinished: Date = new Date();  
   let conversionDuration = (dateFinished.getTime()- dateStarted.getTime())/1000; //in seconds.
-  loggerInfo("Finished conversion: " + dateFinished);  
+  loggerInfo("Conversion finished at " + dateFinished);  
   loggerInfo(`Note "${noteData.title}" converted successfully in ${conversionDuration} seconds.`);
 
 

src/ui/assets/js/ipc.js

@@ -35,7 +35,6 @@ function startLogWatcher() {
 
   function onWatcherReady() {
     console.info('From here can you check for real changes, the initial scan has been completed.');
-    ipcRenderer.send('startConversion');
 
   }
 
@@ -87,6 +86,8 @@ function(n) {
 
         $('#startConversion').click(function () {
           startLogWatcher();
+          ipcRenderer.send('startConversion');
+
         });
 
         $('#saveTemplate').click(function () {

src/ui/main.ts

@@ -40,7 +40,7 @@ function createWindow () {
     minHeight: 800,
     backgroundColor: '#312450',
     show: false,
-    icon: path.join(__dirname, 'assets/icons/png/64x64.png'),
+    icon: path.join(__dirname, 'assets/icons/png/192x192.png'),
     webPreferences: {
       nodeIntegration: true
     }
@@ -82,9 +82,6 @@ function createWindow () {
 
   secondWindow.loadURL(`file://${__dirname}/windows/ipcwindow.html`)
 
-  require('./menu/mainmenu')
-
-
   mainWindow.loadURL(
     url.format({
       pathname: path.join(__dirname, `../../src/ui/index.html`),
@@ -219,5 +216,4 @@ ipcMain.on('startConversion', async(event: any, data: any) => {
 ipcMain.on('saveTemplate', async(event: any, data: any) => {
   store.set(data.id, data.value);
   console.log(`Template : ${data.value}`);
-  loggerInfo(`template and config: ${JSON.stringify(store.get(data.id))}`);
 })

src/ui/sections/template.html

@@ -15,7 +15,7 @@ <h2>Step 3: Set your template</h2>
          </section>
          <section>
           <ul class="actions">
-            <li><a href="#" class="button" id="saveTemplate">Save</a></li>
+            <li><a href="#" class="button" name="saveTemplate" id="saveTemplate">Save</a></li>
           </ul>
          </section>
           </div>

src/ui/settingsMapper.ts

@@ -22,5 +22,6 @@ export const mapSettingsToYarleOptions = (): YarleOptions => {
         keepMDCharactersOfENNotes: store.get('keepMDCharactersOfENNotes') as boolean,
         monospaceIsCodeBlock: store.get('monospaceIsCodeBlock') as boolean,
         keepOriginalHtml: store.get('keepOriginalHtml') as boolean,
+        currentTemplate: store.get('currentTemplate') as string
     }
 }

src/utils/clearLogFile.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs';
 import { LOGFILE } from './loggerInfo';
 export const clearLogFile = () => {
-    if (fs.existsSync(LOGFILE)){
-        fs.truncateSync(LOGFILE)
-    }
+
+        fs.unlinkSync(LOGFILE);
 }

src/utils/folder-utils.ts

@@ -5,6 +5,8 @@ import { Path } from '../paths';
 import { yarleOptions } from '../yarle';
 
 import { getNoteFileName, getNoteName } from './filename-utils';
+import { loggerInfo } from './loggerInfo';
+import { logger } from './logger';
 
 export const paths: Path = {};
 
@@ -38,11 +40,11 @@ const clearDistDir = (dstPath: string): void => {
 };
 
 export const getRelativeResourceDir = (note: any): string => {
-  return yarleOptions.haveEnexLevelResources ? './_resources' : `./_resources/${getResourceDir(paths.mdPath, note)}.resources`;
+  return yarleOptions.haveEnexLevelResources ? `.${path.sep}_resources` : `.${path.sep}_resources${path.sep}${getResourceDir(paths.mdPath, note)}.resources`;
 };
 
 export const getAbsoluteResourceDir = (note: any): string => {
-  return yarleOptions.haveEnexLevelResources ? paths.resourcePath : `${paths.resourcePath}/${getResourceDir(paths.mdPath, note)}.resources`;
+  return yarleOptions.haveEnexLevelResources ? paths.resourcePath : `${paths.resourcePath}${path.sep}${getResourceDir(paths.mdPath, note)}.resources`;
 };
 
 const resourceDirClears = new Map<string, number>();
@@ -71,20 +73,22 @@ export const clearMdNotesDistDir = (): void => {
 };
 
 export const setPaths = (): void => {
-  const enexFolder = yarleOptions.enexSource.split('/');
+  loggerInfo('setting paths');
+  const enexFolder = yarleOptions.enexSource.split(path.sep);
   const enexFile = (enexFolder.length >= 1 ?  enexFolder[enexFolder.length - 1] : enexFolder[0]).split('.')[0];
   const outputDir = path.isAbsolute(yarleOptions.outputDir)
     ? yarleOptions.outputDir
-    : `${process.cwd()}/${yarleOptions.outputDir}`;
+    : `${process.cwd()}${path.sep}${yarleOptions.outputDir}`;
 
-  paths.mdPath = `${outputDir}/notes/`;
-  paths.resourcePath = `${outputDir}/notes/_resources`;
+  paths.mdPath = `${outputDir}${path.sep}notes${path.sep}`;
+  paths.resourcePath = `${outputDir}${path.sep}notes${path.sep}_resources`;
   if (!yarleOptions.skipEnexFileNameFromOutputPath) {
     paths.mdPath = `${paths.mdPath}${enexFile}`;
-    paths.resourcePath = `${outputDir}/notes/${enexFile}/_resources`;
+    paths.resourcePath = `${outputDir}${path.sep}notes${path.sep}${enexFile}${path.sep}_resources`;
   }
   fsExtra.mkdirsSync(paths.mdPath);
   fsExtra.mkdirsSync(paths.resourcePath);
+  logger.info(`path ${paths.mdPath} created`);
   // clearDistDir(paths.simpleMdPath);
   // clearDistDir(paths.complexMdPath);
 };

src/utils/loggerInfo.ts

@@ -20,7 +20,7 @@ const getAppDataPath = () => {
     }
   }
 
-export const LOGFILE =  path.join(getAppDataPath(),'/conversion.log');
+export const LOGFILE =  path.join(getAppDataPath(),'conversion.log');
 console.log(`logfilepath: ${LOGFILE}`);
 
 

src/yarle.ts

@@ -33,11 +33,11 @@ export let yarleOptions: YarleOptions = { ...defaultYarleOptions };
 
 const setOptions = (options: YarleOptions): void => {
   yarleOptions = { ...defaultYarleOptions, ...options };
-  let template = yarleOptions.currentTemplate ? yarleOptions.currentTemplate : defaultTemplate;
 
-  if (yarleOptions.templateFile) {
-    template = fs.readFileSync(yarleOptions.templateFile, 'utf-8');
-  }
+
+  let template = (yarleOptions.templateFile)  ?  fs.readFileSync(yarleOptions.templateFile, 'utf-8'): defaultTemplate;
+  template = yarleOptions.currentTemplate ? yarleOptions.currentTemplate : template;
+
   /*if (yarleOptions.templateFile) {*/
   // todo: handle file not exists error
   yarleOptions.skipCreationTime = !hasCreationTimeInTemplate(template);
@@ -49,11 +49,13 @@ const setOptions = (options: YarleOptions): void => {
   yarleOptions.keepOriginalHtml = hasLinkToOriginalInTemplate(template);
 
   yarleOptions.currentTemplate = template;
+
+  loggerInfo(`Current template is: ${template}`);
   /*}*/
 };
 
 export const parseStream = async (options: YarleOptions): Promise<void> => {
-
+  // loggerInfo(`Getting stream from ${options.enexSource}`);
   const stream = fs.createReadStream(options.enexSource);
   // const xml = new XmlStream(stream);
   let noteNumber = 0;