Skip to content

Fixes for problems when executing batch actions #574

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
Gongui wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for problems when executing batch actions #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00475f1
don't request to update a task's state if the desired state matches t…
Dec 16, 2020
1554289
use multicall when performing batch actions instead of making a reque…
Dec 16, 2020
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
13 changes: 12 additions & 1 deletion src/scripts/controllers/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,18 @@
};

$scope.changeTasksState = function (state) {
var gids = $rootScope.taskContext.getSelectedTaskIds();
var tasks = $rootScope.taskContext.getSelectedTasks();
var gids = [];

var task = null;
for (let index = 0; index < tasks.length; index++) {
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use var index to replace let index. AriaNg also supports old browser that may not support let.

task = tasks[index];
if (state == 'start' && task.status != 'active' && task.status != 'waiting') {
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use === instead of ==, !== instead of !=

gids.push(task.gid)
}else if (state == 'pause' && task.status != 'paused'){
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format your code, missing two space
} else if (...
... !='paused') {

gids.push(task.gid);
}
}

if (!gids || gids.length < 1) {
return;
Expand Down
20 changes: 8 additions & 12 deletions src/scripts/services/aria2RpcService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,11 @@

for (var i = 0; i < context.gids.length; i++) {
contexts.push({
silent: !!context.silent,
gid: context.gids[i]
'methodName': 'aria2.forceRemove', 'params': [context.gids[i]]
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can modify the variable name of contexts to methods, and it is more readable methods.push(this.forceRemove({ gid: context.gids[i] }, true))

the same below

});
}

return invokeMulti(this.forceRemove, contexts, context.callback);
return this.multicall({'methods': contexts});
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

return this.multicall({
    methods: methods,
    silent: !!context.silent
});

Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the data structure in callback result may be different, you may need to modify the code in ariaTaskService.js(Line 831-833)

},
pause: function (context, returnContextOnly) {
return invoke(buildRequestContext('pause', context, context.gid), !!returnContextOnly);
Expand All @@ -359,12 +358,11 @@

for (var i = 0; i < context.gids.length; i++) {
contexts.push({
silent: !!context.silent,
gid: context.gids[i]
'methodName': 'aria2.forcePause', 'params': [context.gids[i]]
});
}

return invokeMulti(this.forcePause, contexts, context.callback);
return this.multicall({'methods': contexts});
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may need to modify the code in main.js(Line 158-174)

},
forcePauseAll: function (context, returnContextOnly) {
return invoke(buildRequestContext('forcePauseAll', context), !!returnContextOnly);
Expand All @@ -377,12 +375,11 @@

for (var i = 0; i < context.gids.length; i++) {
contexts.push({
silent: !!context.silent,
gid: context.gids[i]
'methodName': 'aria2.unpause', 'params': [context.gids[i]]
});
}

return invokeMulti(this.unpause, contexts, context.callback);
return this.multicall({'methods': contexts});
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may need to modify the code in main.js(Line 158-174)

},
unpauseAll: function (context, returnContextOnly) {
return invoke(buildRequestContext('unpauseAll', context), !!returnContextOnly);
Expand Down Expand Up @@ -455,12 +452,11 @@

for (var i = 0; i < context.gids.length; i++) {
contexts.push({
silent: !!context.silent,
gid: context.gids[i]
'methodName': 'aria2.removeDownloadResult', 'params': [context.gids[i]]
});
}

return invokeMulti(this.removeDownloadResult, contexts, context.callback);
return this.multicall({'methods': contexts});
Copy link
Owner

@mayswind mayswind Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may need to modify the code in ariaTaskService.js(Line 843-845)

},
getVersion: function (context, returnContextOnly) {
return invoke(buildRequestContext('getVersion', context), !!returnContextOnly);
Expand Down