Skip to content

fix: submit download tasks sequentially to preserve input order #834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hackeriori wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: submit download tasks sequentially to preserve input order #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/scripts/controllers/new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

saveDownloadPath(options);

return aria2TaskService.newUriTasks(tasks, pauseOnAdded, responseCallback);
return aria2TaskService.newUriTasksSequentially(tasks, pauseOnAdded, responseCallback);
};

var downloadByTorrent = function (pauseOnAdded, responseCallback) {
Expand Down
62 changes: 62 additions & 0 deletions src/scripts/services/aria2TaskService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,68 @@
callback: callback
});
},
newUriTasksSequentially: function (tasks, pauseOnAdded, callback, silent) {
var newUriTaskFunc = this.newUriTask;

var deferred = $q.defer();
var lastPromise = null;

var results = [];
var hasSuccess = false;
var hasError = false;
var completedCount = 0;

var doAddFunc = function (task, index) {
return newUriTaskFunc(task, pauseOnAdded, function (response) {
results.push(response);

if (response.success) {
hasSuccess = true;
} else {
hasError = true;
}

completedCount++;

if (completedCount === tasks.length) {
var finalResponse = {
hasSuccess: hasSuccess,
hasError: hasError,
results: results,
successCount: results.filter(function (r) { return r.success; }).length,
failedCount: results.filter(function (r) { return !r.success; }).length
};

deferred.resolve(finalResponse);

if (callback) {
callback(finalResponse);
}
}
}, silent);
};

for (var i = 0; i < tasks.length; i++) {
var task = tasks[i];
var currentPromise = null;

if (!lastPromise) {
currentPromise = doAddFunc(task, i);
} else {
currentPromise = (function (task, index) {
return lastPromise.then(function onSuccess() {
return doAddFunc(task, index);
}).catch(function onError() {
return doAddFunc(task, index);
});
})(task, i);
}

lastPromise = currentPromise;
}

return deferred.promise;
},
newTorrentTask: function (task, pauseOnAdded, callback, silent) {
return aria2RpcService.addTorrent({
task: task,
Expand Down