@nger/fk-upload 1.0.114 → 1.0.117
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CheckUploadController = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const fk_service_1 = require("./tasks/fk.service");
|
|
5
6
|
const fs_1 = require("fs");
|
|
6
7
|
const fk_download_task_entity_1 = require("./../entities/fk-download-task.entity");
|
|
7
8
|
const rabbitmq_1 = require("@nger/rabbitmq");
|
|
@@ -89,7 +90,11 @@ let CheckUploadController = class CheckUploadController {
|
|
|
89
90
|
}
|
|
90
91
|
const list = await download.find({ where: { status: 1, totalSize: (0, typeorm_2.LessThan)(1024 * 1024 * 1024) } });
|
|
91
92
|
const task = this.injector.get(task_service_1.TaskService);
|
|
93
|
+
const fk = this.injector.get(fk_service_1.FkService);
|
|
92
94
|
await Promise.all(list.map(async (item) => {
|
|
95
|
+
const cloudSize = await fk.getSize(item.url);
|
|
96
|
+
const localSize = fk.getLocalSize(item.path);
|
|
97
|
+
console.log({ cloudSize, localSize });
|
|
93
98
|
const upload = await task.createUploadTask({
|
|
94
99
|
filename: item.filename,
|
|
95
100
|
path: item.path,
|
|
@@ -41,14 +41,17 @@ class UploadTask extends rabbitmq_1.Task {
|
|
|
41
41
|
await complete();
|
|
42
42
|
return next && next();
|
|
43
43
|
}
|
|
44
|
-
|
|
44
|
+
const cloudSize = await fk.getSize(old.url);
|
|
45
|
+
const localSize = fk.getLocalSize(old.path);
|
|
46
|
+
if (cloudSize != localSize) {
|
|
45
47
|
await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
|
|
46
48
|
const download = await taskService.createDownLoadTask(old.url, old.loginId, old.topicId);
|
|
47
49
|
await manager.send(download);
|
|
48
50
|
await complete();
|
|
49
51
|
return next && next();
|
|
50
52
|
}
|
|
51
|
-
|
|
53
|
+
console.log(`receive upload task`, task.filename);
|
|
54
|
+
if (old.status == 1) {
|
|
52
55
|
// upload
|
|
53
56
|
await fk.startUploadFile(task).then(async (res) => {
|
|
54
57
|
// create effect task
|
|
@@ -63,7 +66,7 @@ class UploadTask extends rabbitmq_1.Task {
|
|
|
63
66
|
}
|
|
64
67
|
if (this.errorCount > 10) {
|
|
65
68
|
this.errorCount = 0;
|
|
66
|
-
return
|
|
69
|
+
return complete();
|
|
67
70
|
}
|
|
68
71
|
this.errorCount += 1;
|
|
69
72
|
throw e;
|