diff --git a/server/core/Reader/ReaderWorker.js b/server/core/Reader/ReaderWorker.js index 340c4f90..8cd5e63d 100644 --- a/server/core/Reader/ReaderWorker.js +++ b/server/core/Reader/ReaderWorker.js @@ -83,6 +83,7 @@ class ReaderWorker { let convertFilename = ''; const overLoadMes = 'Слишком большая очередь загрузки. Пожалуйста, попробуйте позже.'; + const fileNotFoundMes = 'Файл не найден'; const overLoadErr = new Error(overLoadMes); let q = null; @@ -193,17 +194,24 @@ class ReaderWorker { mes = mes[0]; if (mes == 'abort') mes = overLoadMes; + if (mes.indexOf('ENOTDIR') >= 0) + mes = fileNotFoundMes; + wState.set({state: 'error', error: mes}); } finally { //clean - if (q) - q.ret(); - if (decompDir) - await fs.remove(decompDir); - if (downloadedFilename && !isUploaded) - await fs.remove(downloadedFilename); - if (convertFilename) - await fs.remove(convertFilename); + try { + if (q) + q.ret(); + if (decompDir) + await fs.remove(decompDir); + if (downloadedFilename && !isUploaded) + await fs.remove(downloadedFilename); + if (convertFilename) + await fs.remove(convertFilename); + } catch (e) { + log(LM_ERR, `Remove error: ${e.stack}`); + } } }