@nger/fk-upload 1.0.103 → 1.0.104

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.
Files changed (3) hide show
  1. package/dist/templates/check-upload.js +1 -1
  2. package/dist/templates/tasks/check-task.js +13 -13
  3. package/package.json +1 -1
package/dist/templates/check-upload.js CHANGED
@@ -102,7 +102,7 @@ let CheckUploadController = class CheckUploadController {
102
102
  };
103
103
  }
104
104
  async checkFinish() {
105
- const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { uploadUrl: (0, typeorm_2.Not)((0, typeorm_2.IsNull)()) } });
105
+ const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, {});
106
106
  await Promise.all(finishs.map(finish => {
107
107
  const item = new rabbitmq_1.TaskEntity();
108
108
  item.topic = actions_1.CHECK_ACTION;
package/dist/templates/tasks/check-task.js CHANGED
@@ -21,21 +21,21 @@ class CheckTask extends rabbitmq_1.Task {
21
21
  const filename = data.filename;
22
22
  if (filename) {
23
23
  const finishs = await db.manager.findOne(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { filename } });
24
- const uploadSize = await this.getSize(finishs.uploadUrl);
25
- const downloadSize = await this.getSize(finishs.url);
26
- if (uploadSize === downloadSize) {
27
- if (finishs.status < 2) {
28
- await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 2 });
24
+ if (finishs.uploadUrl) {
25
+ const uploadSize = await this.getSize(finishs.uploadUrl);
26
+ const downloadSize = await this.getSize(finishs.url);
27
+ if (uploadSize === downloadSize) {
28
+ if (finishs.status < 2) {
29
+ await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 2 });
30
+ }
31
+ await complete();
32
+ return next && next();
29
33
  }
30
- await complete();
31
- }
32
- else {
33
- await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 0 });
34
- const item = await task.createDownLoadTask(finishs.url, finishs.loginId, finishs.topicId);
35
- await manager.send(item);
36
- // redownload
37
- await complete();
38
34
  }
35
+ await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 0 });
36
+ const item = await task.createDownLoadTask(finishs.url, finishs.loginId, finishs.topicId);
37
+ await manager.send(item);
38
+ await complete();
39
39
  }
40
40
  else {
41
41
  await complete();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nger/fk-upload",
3
- "version": "1.0.103",
3
+ "version": "1.0.104",
4
4
  "description": "",
5
5
  "main": "dist/core.js",
6
6
  "types": "dist/core.d.ts",