Skip to content

Commit 6b87e21

Browse files
authored
fix: 清空下载任务时,删除临时文件 (#335)
1 parent b34943a commit 6b87e21

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

app/main/files/transfer/downloads.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<a
152152
ng-if="item.status=='running' || item.status=='retrying' || item.status=='waiting'|| item.status=='verifying'"
153153
href=""
154-
ng-click="item.stop()"
154+
ng-click="stop(item)"
155155
class="btn btn-default btn-xs"
156156
>
157157
<i class="glyphicon glyphicon-pause text-warning"></i>

app/main/files/transfer/downloads.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ angular.module("web").controller("transferDownloadsCtrl", [
2929
clearAllCompleted: clearAllCompleted,
3030
clearAll: clearAll,
3131
stopAll: stopAll,
32+
stop: stop,
3233
startAll: startAll,
3334
checkStartJob: checkStartJob,
3435
openLocaleFolder: function (item) {
@@ -87,6 +88,7 @@ angular.module("web").controller("transferDownloadsCtrl", [
8788
var arr = $scope.lists.downloadJobList;
8889
for (var i = 0; i < arr.length; i++) {
8990
if (item === arr[i]) {
91+
item.destroy();
9092
arr.splice(i, 1);
9193
break;
9294
}
@@ -125,13 +127,7 @@ angular.module("web").controller("transferDownloadsCtrl", [
125127
var arr = $scope.lists.downloadJobList;
126128
for (var i = 0; i < arr.length; i++) {
127129
var n = arr[i];
128-
if (
129-
n.status == "running" ||
130-
n.status == "waiting" ||
131-
n.status == "verifying" ||
132-
n.status == "retrying"
133-
)
134-
n.stop();
130+
n.destroy();
135131
arr.splice(i, 1);
136132
i--;
137133
}
@@ -143,6 +139,11 @@ angular.module("web").controller("transferDownloadsCtrl", [
143139
);
144140
}
145141

142+
function stop(item) {
143+
item.stop();
144+
ossDownloadManager.saveProg();
145+
}
146+
146147
var stopFlag = false;
147148

148149
function stopAll() {

node/ossstore/lib/download-job.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,14 @@ DownloadJob.prototype.wait = function () {
651651
return self;
652652
};
653653

654+
DownloadJob.prototype.destroy = function () {
655+
var self = this;
656+
var tmpName = self.to.path + ".download";
657+
util.deleteFileIfExists(tmpName);
658+
self._lastStatusFailed = true;
659+
return self.stop();
660+
};
661+
654662
DownloadJob.prototype._changeStatus = function (status, retryTimes) {
655663
var self = this;
656664
self.status = status;

0 commit comments

Comments
 (0)