Add error handling to readProfileFile

Author: VilppeRiskidev

src/components/profiles-modals/ImportProfileModal.vue

@@ -117,28 +117,25 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
             return;
         }
 
-        let read: string | null = null;
+        let read: string = '';
         try {
             read = await ProfileUtils.readProfileFile(files[0]);
         } catch (e: unknown) {
-            if(e instanceof R2Error) {
-                this.$store.commit('error/handleError', e)
-                this.closeModal();
-                return;
-            }
+            const err = R2Error.fromThrownValue(e);
+            this.$store.commit('error/handleError', err);
+            this.closeModal();
+            return;
         }
 
-        if (read) {
-            this.profileImportFilePath = files[0];
-            this.profileImportContent = await ProfileUtils.parseYamlToExportFormat(read);
+        this.profileImportFilePath = files[0];
+        this.profileImportContent = await ProfileUtils.parseYamlToExportFormat(read);
 
-            if (this.profileToOnlineMods.length === 0) {
-                this.activeStep = 'NO_PACKAGES_IN_IMPORT';
-                return;
-            }
-
-            this.activeStep = 'REVIEW_IMPORT';
+        if (this.profileToOnlineMods.length === 0) {
+            this.activeStep = 'NO_PACKAGES_IN_IMPORT';
+            return;
         }
+
+        this.activeStep = 'REVIEW_IMPORT';
     }
 
     // Fired when user has accepted the mods to be imported in the review phase.

src/utils/ProfileUtils.ts

@@ -180,20 +180,23 @@ export async function populateImportedProfile(
     }
 }
 
-export async function readProfileFile(file: string) {
-    let read = '';
+export async function readProfileFile(file: string): Promise<string> {
+    let read: string | undefined;
     if (file.endsWith('.r2x')) {
         read = (await FsProvider.instance.readFile(file)).toString();
     } else if (file.endsWith('.r2z')) {
-        const result: Buffer | null = await ZipProvider.instance.readFile(file, "export.r2x");
-        if (!result) {
-            throw new R2Error(
-                'Error when reading file contents',
-                'Reading the .r2z file contents failed. File contents be empty or corrupted.',
-                'Ensure that the imported profile file is valid.'
-            );
-        }
-        read = result.toString();
+        await ZipProvider.instance.readFile(file, "export.r2x").then(
+            (value) => { read = value?.toString() },
+            () => { return null; }
+        );
+    }
+
+    if (!read) {
+        throw new R2Error(
+            'Error when reading file contents',
+            'Reading the .r2z file contents failed. File contents be empty or corrupted.',
+            'Ensure that the imported profile file is valid.'
+        );
     }
     return read;
 }