A local-first personal finance app
Accept `.blob` files when importing Actual export (#785)
Jakub Kuczys6c01e6eaaf7a
diff --git a/packages/loot-core/src/server/cloud-storage.js b/packages/loot-core/src/server/cloud-storage.jsindex fd5a9a5cdb..d37d975302 100644--- a/packages/loot-core/src/server/cloud-storage.js+++ b/packages/loot-core/src/server/cloud-storage.js@@ -161,8 +161,13 @@ export async function exportBuffer() {}export async function importBuffer(fileData, buffer) {- let zipped = new AdmZip(buffer);- let entries = zipped.getEntries();+ let zipped, entries;+ try {+ zipped = new AdmZip(buffer);+ entries = zipped.getEntries();+ } catch (err) {+ throw FileDownloadError('not-zip-file');+ }let dbEntry = entries.find(e => e.entryName.includes('db.sqlite'));let metaEntry = entries.find(e => e.entryName.includes('metadata.json'));diff --git a/packages/loot-core/src/server/main.js b/packages/loot-core/src/server/main.jsindex d81348c105..eed06087f1 100644--- a/packages/loot-core/src/server/main.js+++ b/packages/loot-core/src/server/main.js@@ -2108,10 +2108,18 @@ handlers['import-budget'] = async function ({ filepath, type }) {// duplicate some of the workflowawait handlers['close-budget']();- let { id } = await cloudStorage.importBuffer(- { cloudFileId: null, groupId: null },- buffer,- );+ let id;+ try {+ ({ id } = await cloudStorage.importBuffer(+ { cloudFileId: null, groupId: null },+ buffer,+ ));+ } catch (e) {+ if (e.type === 'FileDownloadError') {+ return { error: e.reason };+ }+ throw e;+ }// We never want to load cached data from imported files, so// delete the cachediff --git a/packages/loot-core/src/shared/errors.js b/packages/loot-core/src/shared/errors.jsindex 3b20c05198..fc0a8cd195 100644--- a/packages/loot-core/src/shared/errors.js+++ b/packages/loot-core/src/shared/errors.js@@ -28,6 +28,7 @@ export function getDownloadError({ reason, meta, fileName }) {case 'network':case 'download-failure':return 'Downloading the file failed. Check your network connection.';+ case 'not-zip-file':case 'invalid-zip-file':case 'invalid-meta-file':return 'Downloaded file is invalid, sorry! Contact [email protected] for support.';diff --git a/packages/loot-design/src/components/manager/ImportActual.js b/packages/loot-design/src/components/manager/ImportActual.jsindex f541b061f9..50cb6da772 100644--- a/packages/loot-design/src/components/manager/ImportActual.js+++ b/packages/loot-design/src/components/manager/ImportActual.js@@ -12,6 +12,12 @@ function getErrorMessage(error) {return 'Unable to parse file. Please select a JSON file exported from nYNAB.';case 'not-ynab5':return 'This file is not valid. Please select a JSON file exported from nYNAB.';+ case 'not-zip-file':+ return 'This file is not valid. Please select an unencrypted archive of Actual data.';+ case 'invalid-zip-file':+ return 'This archive is not a valid Actual export file.';+ case 'invalid-metadata-file':+ return 'The metadata file in the given archive is corrupted.';default:return 'An unknown error occurred while importing. Sorry! We have been notified of this issue.';}@@ -25,7 +31,7 @@ function Import({ modalProps, availableImports }) {async function onImport() {const res = await window.Actual.openFileDialog({properties: ['openFile'],- filters: [{ name: 'actual', extensions: ['zip'] }],+ filters: [{ name: 'actual', extensions: ['zip', 'blob'] }],});if (res) {setImporting(true);diff --git a/upcoming-release-notes/785.md b/upcoming-release-notes/785.mdnew file mode 100644index 0000000000..534b88ee09--- /dev/null+++ b/upcoming-release-notes/785.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [Jackenmen]+---++Allow importing `.blob` files from actual-server