fix: error on xml open dialog cancel

rzuppur · Oct 21, 2022 · 14e0ac8 · 14e0ac8
1 parent c88baf2
commit 14e0ac8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
@@ -62,7 +62,7 @@ async function handleFileOpen(event: IpcMainInvokeEvent) {
     filters: [{name: 'XML Files', extensions: ['xml']}],
   });
   if (canceled) {
-    return;
+    return { xml: null, path: '', cancelled: true };
   } else {
     const path = filePaths[0];
     const fileContents = await promises.readFile(path, 'utf-8');

diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts
@@ -6,7 +6,7 @@ import type {Collection} from '../../renderer/src/model';
 export {versions} from './versions';
 const {ipcRenderer} = require('electron');
 
-export function openXML(): Promise<{xml: Collection; path: string}> {
+export function openXML(): Promise<{xml: Collection; path: string, cancelled?: boolean}> {
   return ipcRenderer.invoke('dialog:openFile');
 }
 

diff --git a/packages/renderer/src/App.vue b/packages/renderer/src/App.vue
@@ -56,9 +56,13 @@ const getTracks = (list: (Playlist | Folder)[]): string[] => {
 
 const actionOpenXML = async () => {
   collectionLoading.value = true;
-  const {xml: collection, path} = await openXML();
-  if (collection) {
-    try {
+  try {
+    const {xml: collection, path, cancelled} = await openXML();
+    if (cancelled) {
+      resetCollection();
+      return;
+    }
+    if (collection) {
       collectionVersion.value = collection.DJ_PLAYLISTS.PRODUCT[0].$.Version;
       collectionTracks.value = collection.DJ_PLAYLISTS.COLLECTION[0].TRACK.map(t => t.$);
 
@@ -101,14 +105,14 @@ const actionOpenXML = async () => {
       collectionLoaded.value = true;
       errorText.value = '';
       collectionFilePath.value = path;
-    } catch (e) {
-      console.error(e);
-      toast('❌ ' + e);
-      errorText.value = 'Error reading the file, make sure you followed the instructions above.';
+    } else {
+      errorText.value = 'Something went wrong';
       resetCollection();
     }
-  } else {
-    errorText.value = 'Something went wrong';
+  } catch (e) {
+    console.error(e);
+    toast('❌ ' + e);
+    errorText.value = 'Error reading the file, make sure you followed the instructions above.';
     resetCollection();
   }
 };