diff --git a/src/modals/ImportExportModal.js b/src/modals/ImportExportModal.js index d518254..98723bf 100644 --- a/src/modals/ImportExportModal.js +++ b/src/modals/ImportExportModal.js @@ -35,7 +35,6 @@ function ImportDatabaseModal({ isOpen, onRequestClose }) { async function handleImportDatabase(file) { setIsLoading(true); backgroundTaskRunningRef.current = true; - await database.delete(); await worker.importData(file, Comlink.proxy(handleDBProgress)); setIsLoading(false); backgroundTaskRunningRef.current = false; diff --git a/src/workers/DatabaseWorker.js b/src/workers/DatabaseWorker.js index 3e7bbf2..d30a526 100644 --- a/src/workers/DatabaseWorker.js +++ b/src/workers/DatabaseWorker.js @@ -1,5 +1,5 @@ import * as Comlink from "comlink"; -import { importDB, exportDB } from "dexie-export-import"; +import { importInto, exportDB } from "dexie-export-import"; import { encode } from "@msgpack/msgpack"; import { getDatabase } from "../database"; @@ -59,7 +59,8 @@ let service = { */ async importData(data, progressCallback) { try { - await importDB(data, { progressCallback }); + let db = getDatabase({}); + await importInto(db, data, { progressCallback, overwriteValues: true }); } catch {} }, };