@nger/fk-upload 1.0.73 → 1.0.76

package/dist/templates/check-upload.d.ts

@@ -13,5 +13,8 @@ export declare class CheckUploadController {
         msg: string;
         list: TaskEntity<object>[];
     }>;
-    checkSpace(): Promise<void>;
+    checkSpace(): Promise<{
+        msg: string;
+        removes: string[];
+    }>;
 }

package/dist/templates/check-upload.js

@@ -33,16 +33,23 @@ let CheckUploadController = class CheckUploadController {
         const task = this.db.manager.getRepository(rabbitmq_1.TaskEntity);
         const list = await task.find({ where: { topic: '@nger/fk-upload/download-task', status: 0 } });
         await Promise.all(list.map(item => this.manager.send(item)));
-        return { msg: 'recheck success', list };
+        return { msg: 'redownload success', list };
     }
     async checkSpace() {
         const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
+        // remove to large
+        const largs = await download.find({ where: { totalSize: (0, typeorm_2.MoreThan)(1024 * 1024 * 1024) } });
+        // remove not use
+        // remove finish
         const list = await download.find({ where: { status: (0, typeorm_2.In)([2, 3]) } });
-        list.map(item => {
+        const removes = [];
+        Promise.all([...list, ...largs].map(async (item) => {
             if ((0, fs_1.existsSync)(item.path)) {
-                (0, fs_extra_1.unlink)(item.path);
+                await (0, fs_extra_1.unlink)(item.path);
+                removes.push(item.path);
             }
-        });
+        }));
+        return { msg: 'succes', removes };
     }
 };
 tslib_1.__decorate([

package/dist/templates/tasks/download-task.js

@@ -31,6 +31,11 @@ class DownloadTask extends rabbitmq_1.Task {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
         const fail = injector.get(rabbitmq_1.FAIL);
+        const download = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
+        if (download.status !== 0) {
+            complete();
+            return next && next();
+        }
         (0, fs_extra_1.ensureDir)((0, path_1.dirname)(task.path));
         const writeStream = (0, fs_1.createWriteStream)(task.path);
         const manager = injector.get(rabbitmq_1.TaskManager);

package/dist/templates/tasks/fk.service.js

@@ -162,7 +162,7 @@ let FkService = class FkService {
                     task.uploadUrl = fullUrl;
                 }
             }
-            console.log(`uploading ${task.filename} ${Math.floor((index + 1 / task.totalChunks) * 100)}%`);
+            console.log(`uploading ${task.filename} ${Math.floor((index + 1 / task.totalChunks))}%`);
             index = index + 1;
         } while (!complete);
         // upload complete

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.73",
+  "version": "1.0.76",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",