From 8c4a50f68c9543c14cfe76abd2f6f42135b0e13d Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 31 Jul 2021 14:46:09 -0400 Subject: DictionaryImporterThreaded (#1865) * Create new classes for importing dictionaries from a separate thread * Use threaded importer * Update worker tests --- ext/js/language/dictionary-importer-worker.js | 83 +++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 ext/js/language/dictionary-importer-worker.js (limited to 'ext/js/language/dictionary-importer-worker.js') diff --git a/ext/js/language/dictionary-importer-worker.js b/ext/js/language/dictionary-importer-worker.js new file mode 100644 index 00000000..f44a10f9 --- /dev/null +++ b/ext/js/language/dictionary-importer-worker.js @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2021 Yomichan Authors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* global + * DictionaryDatabase + * DictionaryImporter + * DictionaryImporterWorkerMediaLoader + */ + +class DictionaryImporterWorker { + constructor() { + this._mediaLoader = new DictionaryImporterWorkerMediaLoader(); + } + + prepare() { + self.addEventListener('message', this._onMessage.bind(this), false); + } + + // Private + + _onMessage(e) { + const {action, params} = e.data; + switch (action) { + case 'import': + this._onImport(params); + break; + case 'getImageResolution.response': + this._mediaLoader.handleMessage(params); + break; + } + } + + async _onImport({details, archiveContent}) { + const onProgress = (...args) => { + self.postMessage({ + action: 'progress', + params: {args} + }); + }; + let response; + try { + const result = await this._importDictionary(archiveContent, details, onProgress); + response = {result}; + } catch (e) { + response = {error: serializeError(e)}; + } + self.postMessage({action: 'complete', params: response}); + } + + async _importDictionary(archiveContent, importDetails, onProgress) { + const dictionaryDatabase = await this._getPreparedDictionaryDatabase(); + try { + const dictionaryImporter = new DictionaryImporter(this._mediaLoader); + const {result, errors} = await dictionaryImporter.importDictionary(dictionaryDatabase, archiveContent, importDetails, onProgress); + return { + result, + errors: errors.map((error) => serializeError(error)) + }; + } finally { + dictionaryDatabase.close(); + } + } + + async _getPreparedDictionaryDatabase() { + const dictionaryDatabase = new DictionaryDatabase(); + await dictionaryDatabase.prepare(); + return dictionaryDatabase; + } +} -- cgit v1.2.3