From 74709296e557dfeab2e465f8bd53681934fe8040 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 28 Aug 2021 14:22:16 -0400 Subject: Dictionary database worker refactoring (#1913) * Rename DictionaryWorker => DictionaryWorkerHandler * Rename var * Rename file * Simplify * Rename DictionaryDatabaseModifier => DictionaryWorker * Rename dictionary-database-modifier.js => dictionary-worker.js --- ext/js/pages/settings/dictionary-controller.js | 5 ++--- ext/js/pages/settings/dictionary-import-controller.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'ext/js/pages') diff --git a/ext/js/pages/settings/dictionary-controller.js b/ext/js/pages/settings/dictionary-controller.js index a041e791..2a44f9ad 100644 --- a/ext/js/pages/settings/dictionary-controller.js +++ b/ext/js/pages/settings/dictionary-controller.js @@ -16,7 +16,7 @@ */ /* global - * DictionaryDatabaseModifier + * DictionaryWorker */ class DictionaryEntry { @@ -679,8 +679,7 @@ class DictionaryController { } async _deleteDictionaryInternal(dictionaryTitle, onProgress) { - const dictionaryDatabaseModifier = new DictionaryDatabaseModifier(); - await dictionaryDatabaseModifier.deleteDictionary(dictionaryTitle, onProgress); + await new DictionaryWorker().deleteDictionary(dictionaryTitle, onProgress); yomichan.api.triggerDatabaseUpdated('dictionary', 'delete'); } diff --git a/ext/js/pages/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js index 2716756d..b6700c78 100644 --- a/ext/js/pages/settings/dictionary-import-controller.js +++ b/ext/js/pages/settings/dictionary-import-controller.js @@ -17,7 +17,7 @@ /* global * DictionaryController - * DictionaryDatabaseModifier + * DictionaryWorker */ class DictionaryImportController { @@ -213,8 +213,7 @@ class DictionaryImportController { async _importDictionary(file, importDetails, onProgress) { const archiveContent = await this._readFile(file); - const dictionaryDatabaseModifier = new DictionaryDatabaseModifier(); - const {result, errors} = await dictionaryDatabaseModifier.importDictionary(archiveContent, importDetails, onProgress); + const {result, errors} = await new DictionaryWorker().importDictionary(archiveContent, importDetails, onProgress); yomichan.api.triggerDatabaseUpdated('dictionary', 'import'); const errors2 = await this._addDictionarySettings(result.sequenced, result.title); -- cgit v1.2.3