mirror of
https://github.com/lidarr/lidarr.git
synced 2025-07-16 10:03:51 -07:00
Fixed: UI and Command manager updates
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
parent
d9a51a1d02
commit
ba96dad8c7
40 changed files with 301 additions and 255 deletions
|
@ -45,7 +45,7 @@ export const defaultState = {
|
|||
filters: [
|
||||
{
|
||||
key: 'monitored',
|
||||
value: false || true,
|
||||
value: false,
|
||||
type: filterTypes.EQUAL
|
||||
}
|
||||
]
|
||||
|
@ -66,7 +66,8 @@ export const defaultState = {
|
|||
|
||||
export const persistState = [
|
||||
'calendar.view',
|
||||
'calendar.selectedFilterKey'
|
||||
'calendar.selectedFilterKey',
|
||||
'calendar.showUpcoming'
|
||||
];
|
||||
|
||||
//
|
||||
|
|
|
@ -57,7 +57,7 @@ function showCommandMessage(payload, dispatch) {
|
|||
const {
|
||||
id,
|
||||
name,
|
||||
manual,
|
||||
trigger,
|
||||
message,
|
||||
body = {},
|
||||
state
|
||||
|
@ -80,7 +80,7 @@ function showCommandMessage(payload, dispatch) {
|
|||
hideAfter = 4;
|
||||
} else if (state === 'failed') {
|
||||
type = messageTypes.ERROR;
|
||||
hideAfter = manual ? 10 : 4;
|
||||
hideAfter = trigger === 'manual' ? 10 : 4;
|
||||
}
|
||||
|
||||
dispatch(showMessage({
|
||||
|
@ -95,10 +95,11 @@ function showCommandMessage(payload, dispatch) {
|
|||
function scheduleRemoveCommand(command, dispatch) {
|
||||
const {
|
||||
id,
|
||||
state
|
||||
status,
|
||||
body
|
||||
} = command;
|
||||
|
||||
if (state === 'queued') {
|
||||
if (status === 'queued') {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -108,6 +109,12 @@ function scheduleRemoveCommand(command, dispatch) {
|
|||
clearTimeout(timeoutId);
|
||||
}
|
||||
|
||||
// 5 minute timeout for executing disk access commands and
|
||||
// 30 seconds for all other commands.
|
||||
const timeout = body.requiresDiskAccess && status === 'started' ?
|
||||
60000 * 5 :
|
||||
30000;
|
||||
|
||||
removeCommandTimeoutIds[id] = setTimeout(() => {
|
||||
dispatch(batchActions([
|
||||
removeCommand({ section: 'commands', id }),
|
||||
|
@ -115,7 +122,7 @@ function scheduleRemoveCommand(command, dispatch) {
|
|||
]));
|
||||
|
||||
delete removeCommandTimeoutIds[id];
|
||||
}, 30000);
|
||||
}, timeout);
|
||||
}
|
||||
|
||||
//
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue