Update export progress and all export mode

Fix all export mode

Author: Komediruzecki

src/components/molecules/Export/ExportProgressItem.tsx

@@ -262,7 +262,8 @@ const ExportProgressItem = ({
   )
   const exportAsMd = async (noteDoc: NoteDoc, exportPath: string) => {
     const mdString = convertNoteDocToMarkdownString(noteDoc, includeFrontMatter)
-    await writeFile(exportPath, mdString)
+    const filename = `${exportPath}.md`
+    await writeFile(filename, mdString)
   }
 
   const exportAsPdf = async (
@@ -279,7 +280,8 @@ const ExportProgressItem = ({
       preferences['export.printOptions'],
       previewStyle
     )
-    await writeFile(exportPath, pdfBuffer)
+    const filename = `${exportPath}.pdf`
+    await writeFile(filename, pdfBuffer)
   }
 
   const exportAsHtml = async (
@@ -320,10 +322,11 @@ const ExportProgressItem = ({
         const exportNoteFilenameWithoutExtension = `${filenamify(
           getValidNoteTitle(noteDoc)
         )}`
-        const exportNotePathname = join(
+        const exportNotePathnameNoExt = join(
           join(rootDir, noteExportFolder),
-          `${exportNoteFilenameWithoutExtension}.${exportProcedureData.exportType}`
+          exportNoteFilenameWithoutExtension
         )
+        const exportNotePathname = `${exportNotePathnameNoExt}.${exportProcedureData.exportType}`
         setExportState({
           exportProgressValue: convertValueToPercentage(
             exportingNoteIndex / notesToExport.length
@@ -353,7 +356,7 @@ const ExportProgressItem = ({
             break
           case 'md':
             try {
-              await exportAsMd(noteDoc as NoteDoc, exportNotePathname)
+              await exportAsMd(noteDoc as NoteDoc, exportNotePathnameNoExt)
             } catch (err) {
               addExportError(
                 `Cannot export: '${exportNotePathname.substring(
@@ -364,7 +367,7 @@ const ExportProgressItem = ({
             break
           case 'all':
             try {
-              await exportAsMd(noteDoc as NoteDoc, exportNotePathname)
+              await exportAsMd(noteDoc as NoteDoc, exportNotePathnameNoExt)
             } catch (err) {
               addExportError(
                 `Cannot export: '${exportNotePathname.substring(
@@ -387,7 +390,7 @@ const ExportProgressItem = ({
             try {
               await exportAsPdf(
                 noteDoc as NoteDoc,
-                exportNotePathname,
+                exportNotePathnameNoExt,
                 attachmentMap
               )
             } catch (err) {
@@ -403,7 +406,7 @@ const ExportProgressItem = ({
             try {
               await exportAsPdf(
                 noteDoc as NoteDoc,
-                exportNotePathname,
+                exportNotePathnameNoExt,
                 attachmentMap
               )
             } catch (err) {

src/components/pages/WikiNotePage.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import { NoteStorage } from '../../lib/db/types'
 import NoteDetail from '../organisms/NoteDetail'
 import {
@@ -17,11 +17,7 @@ import { usePreferences } from '../../lib/preferences'
 import { usePreviewStyle } from '../../lib/preview'
 import { mapTopBarTree } from '../../lib/v2/mappers/local/topbarTree'
 import { useLocalUI } from '../../lib/v2/hooks/useLocalUI'
-import {
-  getPathByName,
-  showSaveDialog,
-  openPath,
-} from '../../lib/electronOnly'
+import { getPathByName, showSaveDialog, openPath } from '../../lib/electronOnly'
 import { useIpcListener } from '../../lib/useIpcListener'
 import path from 'path'
 import pathParse from 'path-parse'
@@ -203,6 +199,7 @@ const WikiNotePage = ({ storage }: WikiNotePageProps) => {
 
   const includeFrontMatter = preferences['markdown.includeFrontMatter']
 
+  // todo: sometimes seems to open multiple windows when cancelled by user
   useIpcListener('save-as', async () => {
     if (note == null) {
       return