@nger/fk-upload 1.0.102 → 1.0.105

package/dist/templates/check-upload.js

@@ -102,7 +102,7 @@ let CheckUploadController = class CheckUploadController {
         };
     }
     async checkFinish() {
-        const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { status: (0, typeorm_2.In)([1, 2, 3]) } });
+        const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, {});
         await Promise.all(finishs.map(finish => {
             const item = new rabbitmq_1.TaskEntity();
             item.topic = actions_1.CHECK_ACTION;

package/dist/templates/tasks/check-task.d.ts

@@ -3,5 +3,6 @@ import { Next, Injector } from '@nger/core';
 export declare class CheckTask extends Task {
     constructor();
     handle(injector: Injector, next?: Next): Promise<void>;
+    getLocalSize(path: string): number;
     getSize(url: string): Promise<number>;
 }

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

@@ -8,6 +8,7 @@ const actions_1 = require("./actions");
 const rabbitmq_1 = require("@nger/rabbitmq");
 const core_1 = require("@nger/core");
 const request_1 = require("request");
+const fs_extra_1 = require("fs-extra");
 class CheckTask extends rabbitmq_1.Task {
     constructor() {
         super(actions_1.CHECK_ACTION);
@@ -21,24 +22,45 @@ class CheckTask extends rabbitmq_1.Task {
         const filename = data.filename;
         if (filename) {
             const finishs = await db.manager.findOne(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { filename } });
-            const uploadSize = await this.getSize(finishs.uploadUrl);
-            const downloadSize = await this.getSize(finishs.url);
-            if (uploadSize === downloadSize) {
-                await complete();
+            if (finishs.uploadUrl) {
+                const uploadSize = await this.getSize(finishs.uploadUrl);
+                const downloadSize = await this.getSize(finishs.url);
+                if (uploadSize === downloadSize) {
+                    if (finishs.status < 2) {
+                        await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 2 });
+                    }
+                    await complete();
+                    return next && next();
+                }
             }
-            else {
-                await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 0 });
-                const item = await task.createDownLoadTask(finishs.url, finishs.loginId, finishs.topicId);
-                await manager.send(item);
-                // redownload
+            if (finishs.totalSize === this.getLocalSize(finishs.path)) {
+                // re upload
+                await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 1 });
+                const upload = await task.createUploadTask({
+                    filename: finishs.filename,
+                    path: finishs.path,
+                    url: finishs.url,
+                    topicId: finishs.topicId,
+                    loginId: finishs.loginId
+                }, finishs.totalSize, finishs.fileMd5, injector);
+                await manager.send(upload);
                 await complete();
+                return next && next();
             }
+            await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 0 });
+            const item = await task.createDownLoadTask(finishs.url, finishs.loginId, finishs.topicId);
+            await manager.send(item);
+            await complete();
         }
         else {
             await complete();
         }
         return next && next();
     }
+    getLocalSize(path) {
+        const satts = (0, fs_extra_1.statSync)(path);
+        return satts.size;
+    }
     async getSize(url) {
         const size = (0, core_1.defer)();
         const req = (0, request_1.get)(url, {

package/package.json

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