From ffedce4351a09c6cdc4b2355d2bfdc3f5f80f692 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 12 Sep 2022 15:23:22 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D1=81=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/Reader/ReaderWorker.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

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}`);
+            }
         }
     }