mirror of
https://github.com/lidarr/Lidarr
synced 2025-02-23 06:20:50 +00:00
Fixed: UI and Command manager updates
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick
parent
d9a51a1d02
commit
ba96dad8c7
40 changed files with 301 additions and 255 deletions
|
|
@ -116,13 +116,12 @@ class AddNewArtistSearchResult extends Component {
|
|||
|
||||
{
|
||||
isExistingArtist &&
|
||||
<span title="Already in your library">
|
||||
<Icon
|
||||
className={styles.alreadyExistsIcon}
|
||||
name={icons.CHECK_CIRCLE}
|
||||
size={36}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.alreadyExistsIcon}
|
||||
name={icons.CHECK_CIRCLE}
|
||||
size={36}
|
||||
title="Already in your library"
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -134,13 +134,12 @@ class AlbumDetailsMedium extends Component {
|
|||
className={styles.expandButton}
|
||||
onPress={this.onExpandPress}
|
||||
>
|
||||
<span title={isExpanded ? 'Hide tracks' : 'Show tracks'}>
|
||||
<Icon
|
||||
className={styles.expandButtonIcon}
|
||||
name={isExpanded ? icons.COLLAPSE : icons.EXPAND}
|
||||
size={24}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.expandButtonIcon}
|
||||
name={isExpanded ? icons.COLLAPSE : icons.EXPAND}
|
||||
title={isExpanded ? 'Hide tracks' : 'Show tracks'}
|
||||
size={24}
|
||||
/>
|
||||
{
|
||||
!isSmallScreen &&
|
||||
<span> </span>
|
||||
|
|
|
|||
|
|
@ -48,9 +48,10 @@ function EpisodeStatus(props) {
|
|||
|
||||
if (grabbed) {
|
||||
return (
|
||||
<div className={styles.center} title="Album is downloading">
|
||||
<div className={styles.center}>
|
||||
<Icon
|
||||
name={icons.DOWNLOADING}
|
||||
title="Album is downloading"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
|
@ -74,9 +75,10 @@ function EpisodeStatus(props) {
|
|||
|
||||
if (!airDateUtc) {
|
||||
return (
|
||||
<div className={styles.center} title="TBA">
|
||||
<div className={styles.center}>
|
||||
<Icon
|
||||
name={icons.TBA}
|
||||
title="TBA"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
|
@ -84,9 +86,10 @@ function EpisodeStatus(props) {
|
|||
|
||||
if (!monitored) {
|
||||
return (
|
||||
<div className={styles.center} title="Album is not monitored">
|
||||
<div className={styles.center}>
|
||||
<Icon
|
||||
name={icons.UNMONITORED}
|
||||
title="Album is not monitored"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
|
@ -94,18 +97,20 @@ function EpisodeStatus(props) {
|
|||
|
||||
if (hasAired) {
|
||||
return (
|
||||
<div className={styles.center} title="Track missing from disk">
|
||||
<div className={styles.center}>
|
||||
<Icon
|
||||
name={icons.MISSING}
|
||||
title="Track missing from disk"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={styles.center} title="Album has not aired">
|
||||
<div className={styles.center}>
|
||||
<Icon
|
||||
name={icons.NOT_AIRED}
|
||||
title="Album has not aired"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -39,12 +39,11 @@ class AlbumStudioRow extends Component {
|
|||
/>
|
||||
|
||||
<TableRowCell className={styles.status}>
|
||||
<span title={status === 'ended' ? 'Ended' : 'Continuing'}>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
|
||||
title={status === 'ended' ? 'Ended' : 'Continuing'}
|
||||
/>
|
||||
</TableRowCell>
|
||||
|
||||
<TableRowCell className={styles.title}>
|
||||
|
|
|
|||
|
|
@ -580,7 +580,9 @@ class ArtistDetails extends Component {
|
|||
<InteractiveImportModal
|
||||
isOpen={isInteractiveImportModalOpen}
|
||||
folder={path}
|
||||
allowArtistChange={false}
|
||||
showFilterExistingFiles={true}
|
||||
showImportMode={false}
|
||||
onModalClose={this.onInteractiveImportModalClose}
|
||||
/>
|
||||
</PageContentBodyConnector>
|
||||
|
|
|
|||
|
|
@ -150,13 +150,12 @@ class ArtistDetailsSeason extends Component {
|
|||
|
||||
</div>
|
||||
|
||||
<span title={isExpanded ? 'Hide albums' : 'Show albums'}>
|
||||
<Icon
|
||||
className={styles.expandButtonIcon}
|
||||
name={isExpanded ? icons.COLLAPSE : icons.EXPAND}
|
||||
size={24}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.expandButtonIcon}
|
||||
name={isExpanded ? icons.COLLAPSE : icons.EXPAND}
|
||||
title={isExpanded ? 'Hide albums' : 'Show albums'}
|
||||
size={24}
|
||||
/>
|
||||
|
||||
{
|
||||
!isSmallScreen &&
|
||||
|
|
|
|||
|
|
@ -19,19 +19,17 @@ function ArtistStatusCell(props) {
|
|||
className={className}
|
||||
{...otherProps}
|
||||
>
|
||||
<span title={monitored ? 'Artist is monitored' : 'Artist is unmonitored'}>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={monitored ? icons.MONITORED : icons.UNMONITORED}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={monitored ? icons.MONITORED : icons.UNMONITORED}
|
||||
title={monitored ? 'Artist is monitored' : 'Artist is unmonitored'}
|
||||
/>
|
||||
|
||||
<span title={status === 'ended' ? 'Ended' : 'Continuing'}>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
|
||||
title={status === 'ended' ? 'Ended' : 'Continuing'}
|
||||
/>
|
||||
</Component>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,11 +107,10 @@ class AgendaEvent extends Component {
|
|||
|
||||
{
|
||||
!queueItem && grabbed &&
|
||||
<span title="Album is downloading">
|
||||
<Icon
|
||||
name={icons.DOWNLOADING}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
name={icons.DOWNLOADING}
|
||||
title="Album is downloading"
|
||||
/>
|
||||
}
|
||||
</Link>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -4,15 +4,14 @@ import PropTypes from 'prop-types';
|
|||
import React, { Component } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
|
||||
import CalendarDay from './CalendarDay';
|
||||
|
||||
function createCalendarEventsConnector() {
|
||||
return createSelector(
|
||||
(state, { date }) => date,
|
||||
createClientSideCollectionSelector('calendar'),
|
||||
(date, calendar) => {
|
||||
const filtered = _.filter(calendar.items, (item) => {
|
||||
(state) => state.calendar.items,
|
||||
(date, items) => {
|
||||
const filtered = _.filter(items, (item) => {
|
||||
return moment(date).isSame(moment(item.releaseDate), 'day');
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -91,12 +91,11 @@ class CalendarEvent extends Component {
|
|||
|
||||
{
|
||||
!queueItem && grabbed &&
|
||||
<span title="Album is downloading">
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={icons.DOWNLOADING}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
className={styles.statusIcon}
|
||||
name={icons.DOWNLOADING}
|
||||
title="Album is downloading"
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import styles from './Icon.css';
|
|||
|
||||
function Icon(props) {
|
||||
const {
|
||||
containerClassName,
|
||||
className,
|
||||
name,
|
||||
kind,
|
||||
|
|
@ -16,11 +17,7 @@ function Icon(props) {
|
|||
...otherProps
|
||||
} = props;
|
||||
|
||||
if (title && !window.Lidarr.isProduction) {
|
||||
console.error('Icons cannot have a title');
|
||||
}
|
||||
|
||||
return (
|
||||
const icon = (
|
||||
<FontAwesomeIcon
|
||||
className={classNames(
|
||||
className,
|
||||
|
|
@ -34,9 +31,23 @@ function Icon(props) {
|
|||
{...otherProps}
|
||||
/>
|
||||
);
|
||||
|
||||
if (title) {
|
||||
return (
|
||||
<span
|
||||
className={containerClassName}
|
||||
title={title}
|
||||
>
|
||||
{icon}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
Icon.propTypes = {
|
||||
containerClassName: PropTypes.string,
|
||||
className: PropTypes.string,
|
||||
name: PropTypes.object.isRequired,
|
||||
kind: PropTypes.string.isRequired,
|
||||
|
|
|
|||
|
|
@ -45,9 +45,10 @@ function Message(props) {
|
|||
styles[type]
|
||||
)}
|
||||
>
|
||||
<div className={styles.iconContainer} title={name}>
|
||||
<div className={styles.iconContainer}>
|
||||
<Icon
|
||||
name={getIconName(name)}
|
||||
title={name}
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
.filterText {
|
||||
margin-left: 5px;
|
||||
font-size: $largeFontSize;
|
||||
}
|
||||
|
||||
.footer {
|
||||
|
|
|
|||
|
|
@ -169,7 +169,9 @@ class InteractiveImportModalContent extends Component {
|
|||
render() {
|
||||
const {
|
||||
downloadId,
|
||||
allowArtistChange,
|
||||
showFilterExistingFiles,
|
||||
showImportMode,
|
||||
filterExistingFiles,
|
||||
title,
|
||||
folder,
|
||||
|
|
@ -211,17 +213,7 @@ class InteractiveImportModalContent extends Component {
|
|||
|
||||
<ModalBody>
|
||||
{
|
||||
isFetching &&
|
||||
<LoadingIndicator />
|
||||
}
|
||||
|
||||
{
|
||||
error &&
|
||||
<div>{errorMessage}</div>
|
||||
}
|
||||
|
||||
{
|
||||
isPopulated && showFilterExistingFiles && !isFetching &&
|
||||
showFilterExistingFiles &&
|
||||
<div className={styles.filterContainer}>
|
||||
<Menu alignMenu={align.RIGHT}>
|
||||
<MenuButton>
|
||||
|
|
@ -258,6 +250,16 @@ class InteractiveImportModalContent extends Component {
|
|||
</div>
|
||||
}
|
||||
|
||||
{
|
||||
isFetching &&
|
||||
<LoadingIndicator />
|
||||
}
|
||||
|
||||
{
|
||||
error &&
|
||||
<div>{errorMessage}</div>
|
||||
}
|
||||
|
||||
{
|
||||
isPopulated && !!items.length && !isFetching && !isFetching &&
|
||||
<Table
|
||||
|
|
@ -278,6 +280,7 @@ class InteractiveImportModalContent extends Component {
|
|||
key={item.id}
|
||||
isSelected={selectedState[item.id]}
|
||||
{...item}
|
||||
allowArtistChange={allowArtistChange}
|
||||
onSelectedChange={this.onSelectedChange}
|
||||
onValidRowChange={this.onValidRowChange}
|
||||
/>
|
||||
|
|
@ -295,9 +298,9 @@ class InteractiveImportModalContent extends Component {
|
|||
</ModalBody>
|
||||
|
||||
<ModalFooter className={styles.footer}>
|
||||
{
|
||||
!downloadId &&
|
||||
<div className={styles.leftButtons}>
|
||||
<div className={styles.leftButtons}>
|
||||
{
|
||||
!downloadId && showImportMode &&
|
||||
<SelectInput
|
||||
className={styles.importMode}
|
||||
name="importMode"
|
||||
|
|
@ -305,13 +308,16 @@ class InteractiveImportModalContent extends Component {
|
|||
values={importModeOptions}
|
||||
onChange={this.onImportModeChange}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
|
||||
<div className={downloadId ? styles.leftButtons : styles.centerButtons}>
|
||||
<Button onPress={this.onSelectArtistPress}>
|
||||
Select Artist
|
||||
</Button>
|
||||
<div className={styles.centerButtons}>
|
||||
{
|
||||
allowArtistChange &&
|
||||
<Button onPress={this.onSelectArtistPress}>
|
||||
Select Artist
|
||||
</Button>
|
||||
}
|
||||
|
||||
<Button onPress={this.onSelectAlbumPress}>
|
||||
Select Album
|
||||
|
|
@ -357,6 +363,8 @@ class InteractiveImportModalContent extends Component {
|
|||
|
||||
InteractiveImportModalContent.propTypes = {
|
||||
downloadId: PropTypes.string,
|
||||
allowArtistChange: PropTypes.bool.isRequired,
|
||||
showImportMode: PropTypes.bool.isRequired,
|
||||
showFilterExistingFiles: PropTypes.bool.isRequired,
|
||||
filterExistingFiles: PropTypes.bool.isRequired,
|
||||
importMode: PropTypes.string.isRequired,
|
||||
|
|
@ -377,7 +385,9 @@ InteractiveImportModalContent.propTypes = {
|
|||
};
|
||||
|
||||
InteractiveImportModalContent.defaultProps = {
|
||||
allowArtistChange: true,
|
||||
showFilterExistingFiles: false,
|
||||
showImportMode: true,
|
||||
importMode: 'move'
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ class InteractiveImportRow extends Component {
|
|||
render() {
|
||||
const {
|
||||
id,
|
||||
allowArtistChange,
|
||||
relativePath,
|
||||
artist,
|
||||
album,
|
||||
|
|
@ -210,6 +211,7 @@ class InteractiveImportRow extends Component {
|
|||
</TableRowCell>
|
||||
|
||||
<TableRowCellButton
|
||||
isDisabled={!allowArtistChange}
|
||||
onPress={this.onSelectArtistPress}
|
||||
>
|
||||
{
|
||||
|
|
@ -348,6 +350,7 @@ class InteractiveImportRow extends Component {
|
|||
|
||||
InteractiveImportRow.propTypes = {
|
||||
id: PropTypes.number.isRequired,
|
||||
allowArtistChange: PropTypes.bool.isRequired,
|
||||
relativePath: PropTypes.string.isRequired,
|
||||
artist: PropTypes.object,
|
||||
album: PropTypes.object,
|
||||
|
|
|
|||
|
|
@ -92,9 +92,10 @@ class QualityProfileItem extends Component {
|
|||
|
||||
{
|
||||
connectDragSource(
|
||||
<div className={styles.dragHandle} title="Create group">
|
||||
<div className={styles.dragHandle}>
|
||||
<Icon
|
||||
className={styles.dragIcon}
|
||||
title="Create group"
|
||||
name={icons.REORDER}
|
||||
/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -129,10 +129,11 @@ class QualityProfileItemGroup extends Component {
|
|||
|
||||
{
|
||||
connectDragSource(
|
||||
<div className={styles.dragHandle} title="Reorder">
|
||||
<div className={styles.dragHandle}>
|
||||
<Icon
|
||||
className={styles.dragIcon}
|
||||
name={icons.REORDER}
|
||||
title="Reorder"
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -87,11 +87,10 @@ class BackupRow extends Component {
|
|||
<TableRow key={id}>
|
||||
<TableRowCell className={styles.type}>
|
||||
{
|
||||
<span title={iconTooltip}>
|
||||
<Icon
|
||||
name={iconClassName}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
name={iconClassName}
|
||||
title={iconTooltip}
|
||||
/>
|
||||
}
|
||||
</TableRowCell>
|
||||
|
||||
|
|
|
|||
|
|
@ -125,12 +125,11 @@ class Health extends Component {
|
|||
return (
|
||||
<TableRow key={`health${item.message}`}>
|
||||
<TableRowCell>
|
||||
<span title={titleCase(item.type)}>
|
||||
<Icon
|
||||
name={icons.DANGER}
|
||||
kind={item.type.toLowerCase() === 'error' ? kinds.DANGER : kinds.WARNING}
|
||||
/>
|
||||
</span>
|
||||
<Icon
|
||||
name={icons.DANGER}
|
||||
kind={item.type.toLowerCase() === 'error' ? kinds.DANGER : kinds.WARNING}
|
||||
title={titleCase(item.type)}
|
||||
/>
|
||||
</TableRowCell>
|
||||
|
||||
<TableRowCell>{item.message}</TableRowCell>
|
||||
|
|
|
|||
|
|
@ -105,7 +105,6 @@ class CutoffUnmet extends Component {
|
|||
filters,
|
||||
columns,
|
||||
totalRecords,
|
||||
isSearchingForAlbums,
|
||||
isSearchingForCutoffUnmetAlbums,
|
||||
isSaving,
|
||||
onFilterSelect,
|
||||
|
|
@ -129,8 +128,7 @@ class CutoffUnmet extends Component {
|
|||
<PageToolbarButton
|
||||
label="Search Selected"
|
||||
iconName={icons.SEARCH}
|
||||
isDisabled={!itemsSelected}
|
||||
isSpinning={isSearchingForAlbums}
|
||||
isDisabled={!itemsSelected || isSearchingForCutoffUnmetAlbums}
|
||||
onPress={this.onSearchSelectedPress}
|
||||
/>
|
||||
|
||||
|
|
@ -255,7 +253,6 @@ CutoffUnmet.propTypes = {
|
|||
filters: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
columns: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
totalRecords: PropTypes.number,
|
||||
isSearchingForAlbums: PropTypes.bool.isRequired,
|
||||
isSearchingForCutoffUnmetAlbums: PropTypes.bool.isRequired,
|
||||
isSaving: PropTypes.bool.isRequired,
|
||||
onFilterSelect: PropTypes.func.isRequired,
|
||||
|
|
|
|||
|
|
@ -20,11 +20,9 @@ function createMapStateToProps() {
|
|||
(state) => state.wanted.cutoffUnmet,
|
||||
createCommandsSelector(),
|
||||
(cutoffUnmet, commands) => {
|
||||
const isSearchingForAlbums = _.some(commands, { name: commandNames.ALBUM_SEARCH });
|
||||
const isSearchingForCutoffUnmetAlbums = _.some(commands, { name: commandNames.CUTOFF_UNMET_ALBUM_SEARCH });
|
||||
|
||||
return {
|
||||
isSearchingForAlbums,
|
||||
isSearchingForCutoffUnmetAlbums,
|
||||
isSaving: _.some(cutoffUnmet.items, { isSaving: true }),
|
||||
...cutoffUnmet
|
||||
|
|
|
|||
|
|
@ -114,7 +114,6 @@ class Missing extends Component {
|
|||
filters,
|
||||
columns,
|
||||
totalRecords,
|
||||
isSearchingForAlbums,
|
||||
isSearchingForMissingAlbums,
|
||||
isSaving,
|
||||
onFilterSelect,
|
||||
|
|
@ -139,8 +138,7 @@ class Missing extends Component {
|
|||
<PageToolbarButton
|
||||
label="Search Selected"
|
||||
iconName={icons.SEARCH}
|
||||
isDisabled={!itemsSelected}
|
||||
isSpinning={isSearchingForAlbums}
|
||||
isDisabled={!itemsSelected || isSearchingForMissingAlbums}
|
||||
onPress={this.onSearchSelectedPress}
|
||||
/>
|
||||
|
||||
|
|
@ -277,7 +275,6 @@ Missing.propTypes = {
|
|||
filters: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
columns: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
totalRecords: PropTypes.number,
|
||||
isSearchingForAlbums: PropTypes.bool.isRequired,
|
||||
isSearchingForMissingAlbums: PropTypes.bool.isRequired,
|
||||
isSaving: PropTypes.bool.isRequired,
|
||||
onFilterSelect: PropTypes.func.isRequired,
|
||||
|
|
|
|||
|
|
@ -19,11 +19,9 @@ function createMapStateToProps() {
|
|||
(state) => state.wanted.missing,
|
||||
createCommandsSelector(),
|
||||
(missing, commands) => {
|
||||
const isSearchingForAlbums = _.some(commands, { name: commandNames.ALBUM_SEARCH });
|
||||
const isSearchingForMissingAlbums = _.some(commands, { name: commandNames.MISSING_ALBUM_SEARCH });
|
||||
|
||||
return {
|
||||
isSearchingForAlbums,
|
||||
isSearchingForMissingAlbums,
|
||||
isSaving: _.some(missing.items, { isSaving: true }),
|
||||
...missing
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json;
|
||||
|
|
@ -24,37 +24,6 @@ public class CommandResource : RestResource
|
|||
[JsonIgnore]
|
||||
public string CompletionMessage { get; set; }
|
||||
|
||||
//Legacy
|
||||
public CommandStatus State
|
||||
{
|
||||
get
|
||||
{
|
||||
return Status;
|
||||
}
|
||||
|
||||
set { }
|
||||
}
|
||||
|
||||
public bool Manual
|
||||
{
|
||||
get
|
||||
{
|
||||
return Trigger == CommandTrigger.Manual;
|
||||
}
|
||||
|
||||
set { }
|
||||
}
|
||||
|
||||
public DateTime StartedOn
|
||||
{
|
||||
get
|
||||
{
|
||||
return Queued;
|
||||
}
|
||||
|
||||
set { }
|
||||
}
|
||||
|
||||
public DateTime? StateChangeTime
|
||||
{
|
||||
get
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace NzbDrone.Core.Test.Messaging.Commands
|
|||
[TestFixture]
|
||||
public class CommandExecutorFixture : TestBase<CommandExecutor>
|
||||
{
|
||||
private BlockingCollection<CommandModel> _commandQueue;
|
||||
private CommandQueue _commandQueue;
|
||||
private Mock<IExecute<CommandA>> _executorA;
|
||||
private Mock<IExecute<CommandB>> _executorB;
|
||||
private bool _commandExecuted = false;
|
||||
|
|
@ -46,7 +46,7 @@ public void TearDown()
|
|||
|
||||
private void GivenCommandQueue()
|
||||
{
|
||||
_commandQueue = new BlockingCollection<CommandModel>(new CommandQueue());
|
||||
_commandQueue = new CommandQueue();
|
||||
|
||||
Mocker.GetMock<IManageCommandQueue>()
|
||||
.Setup(s => s.Queue(It.IsAny<CancellationToken>()))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FluentAssertions;
|
||||
using Moq;
|
||||
|
|
@ -42,6 +43,10 @@ public void should_not_remove_commands_for_five_minutes_after_they_end()
|
|||
{
|
||||
var command = Subject.Push<CheckForFinishedDownloadCommand>(new CheckForFinishedDownloadCommand());
|
||||
|
||||
// Start the command to mimic CommandQueue's behaviour
|
||||
command.StartedAt = DateTime.Now;
|
||||
command.Status = CommandStatus.Started;
|
||||
|
||||
Subject.Start(command);
|
||||
Subject.Complete(command, "All done");
|
||||
Subject.CleanCommands();
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
using NzbDrone.Core.Messaging.Commands;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
|
||||
namespace NzbDrone.Core.Download
|
||||
{
|
||||
public class CheckForFinishedDownloadCommand : Command
|
||||
{
|
||||
|
||||
public override bool RequiresDiskAccess => true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ public class RenameArtistCommand : Command
|
|||
public List<int> ArtistIds { get; set; }
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
public override bool RequiresDiskAccess => true;
|
||||
|
||||
public RenameArtistCommand()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
|
||||
namespace NzbDrone.Core.MediaFiles.Commands
|
||||
|
|
@ -9,6 +9,7 @@ public class RenameFilesCommand : Command
|
|||
public List<int> Files { get; set; }
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
public override bool RequiresDiskAccess => true;
|
||||
|
||||
public RenameFilesCommand()
|
||||
{
|
||||
|
|
@ -20,4 +21,4 @@ public RenameFilesCommand(int artistId, List<int> files)
|
|||
Files = files;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ public class ManualImportCommand : Command
|
|||
public List<ManualImportFile> Files { get; set; }
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
public override bool RequiresDiskAccess => true;
|
||||
|
||||
public ImportMode ImportMode { get; set; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,8 +20,9 @@ public virtual bool SendUpdatesToClient
|
|||
}
|
||||
|
||||
public virtual bool UpdateScheduledTask => true;
|
||||
|
||||
public virtual string CompletionMessage => "Completed";
|
||||
public virtual bool RequiresDiskAccess => false;
|
||||
public virtual bool IsExclusive => false;
|
||||
|
||||
public string Name { get; private set; }
|
||||
public DateTime? LastExecutionTime { get; set; }
|
||||
|
|
|
|||
|
|
@ -1,27 +1,36 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
|
||||
namespace NzbDrone.Core.Messaging.Commands
|
||||
{
|
||||
public class CommandQueue : IProducerConsumerCollection<CommandModel>
|
||||
public class CommandQueue : IEnumerable
|
||||
{
|
||||
private object Mutex = new object();
|
||||
|
||||
private List<CommandModel> _items;
|
||||
private readonly object _mutex = new object();
|
||||
private readonly List<CommandModel> _items;
|
||||
|
||||
public CommandQueue()
|
||||
{
|
||||
_items = new List<CommandModel>();
|
||||
}
|
||||
|
||||
public int Count => _items.Count;
|
||||
|
||||
public void Add(CommandModel item)
|
||||
{
|
||||
lock (_mutex)
|
||||
{
|
||||
_items.Add(item);
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerator<CommandModel> GetEnumerator()
|
||||
{
|
||||
List<CommandModel> copy = null;
|
||||
|
||||
lock (Mutex)
|
||||
lock (_mutex)
|
||||
{
|
||||
copy = new List<CommandModel>(_items);
|
||||
}
|
||||
|
|
@ -34,77 +43,123 @@ IEnumerator IEnumerable.GetEnumerator()
|
|||
return GetEnumerator();
|
||||
}
|
||||
|
||||
public void CopyTo(Array array, int index)
|
||||
public List<CommandModel> All()
|
||||
{
|
||||
lock (Mutex)
|
||||
List<CommandModel> rval = null;
|
||||
|
||||
lock (_mutex)
|
||||
{
|
||||
((ICollection)_items).CopyTo(array, index);
|
||||
rval = _items;
|
||||
}
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
||||
public CommandModel Find(int id)
|
||||
{
|
||||
return All().FirstOrDefault(q => q.Id == id);
|
||||
}
|
||||
|
||||
public void RemoveMany(IEnumerable<CommandModel> commands)
|
||||
{
|
||||
lock (_mutex)
|
||||
{
|
||||
foreach (var command in commands)
|
||||
{
|
||||
_items.Remove(command);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public int Count => _items.Count;
|
||||
|
||||
public object SyncRoot => Mutex;
|
||||
|
||||
public bool IsSynchronized => true;
|
||||
|
||||
public void CopyTo(CommandModel[] array, int index)
|
||||
public List<CommandModel> QueuedOrStarted()
|
||||
{
|
||||
lock (Mutex)
|
||||
return All().Where(q => q.Status == CommandStatus.Queued || q.Status == CommandStatus.Started)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public IEnumerable<CommandModel> GetConsumingEnumerable()
|
||||
{
|
||||
return GetConsumingEnumerable(CancellationToken.None);
|
||||
}
|
||||
|
||||
public IEnumerable<CommandModel> GetConsumingEnumerable(CancellationToken cancellationToken)
|
||||
{
|
||||
while (!cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
_items.CopyTo(array, index);
|
||||
if (TryGet(out var command))
|
||||
{
|
||||
yield return command;
|
||||
}
|
||||
|
||||
Thread.Sleep(10);
|
||||
}
|
||||
}
|
||||
|
||||
public bool TryAdd(CommandModel item)
|
||||
public bool TryGet(out CommandModel item)
|
||||
{
|
||||
Add(item);
|
||||
return true;
|
||||
}
|
||||
var rval = true;
|
||||
item = default(CommandModel);
|
||||
|
||||
public bool TryTake(out CommandModel item)
|
||||
{
|
||||
bool rval = true;
|
||||
lock (Mutex)
|
||||
lock (_mutex)
|
||||
{
|
||||
if (_items.Count == 0)
|
||||
{
|
||||
item = default(CommandModel);
|
||||
rval = false;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
item = _items.Where(c => c.Status == CommandStatus.Queued)
|
||||
.OrderByDescending(c => c.Priority)
|
||||
.ThenBy(c => c.QueuedAt)
|
||||
.First();
|
||||
var startedCommands = _items.Where(c => c.Status == CommandStatus.Started)
|
||||
.ToList();
|
||||
|
||||
_items.Remove(item);
|
||||
var localItem = _items.Where(c =>
|
||||
{
|
||||
// If an executing command requires disk access don't return a command that
|
||||
// requires disk access. A lower priority or later queued task could be returned
|
||||
// instead, but that will allow other tasks to execute whiule waiting for disk access.
|
||||
if (startedCommands.Any(x => x.Body.RequiresDiskAccess))
|
||||
{
|
||||
return c.Status == CommandStatus.Queued &&
|
||||
!c.Body.RequiresDiskAccess;
|
||||
}
|
||||
|
||||
return c.Status == CommandStatus.Queued;
|
||||
})
|
||||
.OrderByDescending(c => c.Priority)
|
||||
.ThenBy(c => c.QueuedAt)
|
||||
.FirstOrDefault();
|
||||
|
||||
// Nothing queued that meets the requirements
|
||||
if (localItem == null)
|
||||
{
|
||||
rval = false;
|
||||
}
|
||||
|
||||
// If any executing command is exclusive don't want return another command until it completes.
|
||||
else if (startedCommands.Any(c => c.Body.IsExclusive))
|
||||
{
|
||||
rval = false;
|
||||
}
|
||||
|
||||
// If the next command to execute is exclusive wait for executing commands to complete.
|
||||
// This will prevent other tasks from starting so the exclusive task executes in the order it should.
|
||||
else if (localItem.Body.IsExclusive && startedCommands.Any())
|
||||
{
|
||||
rval = false;
|
||||
}
|
||||
|
||||
// A command ready to execute
|
||||
else
|
||||
{
|
||||
localItem.StartedAt = DateTime.Now;
|
||||
localItem.Status = CommandStatus.Started;
|
||||
|
||||
item = localItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
||||
public CommandModel[] ToArray()
|
||||
{
|
||||
CommandModel[] rval = null;
|
||||
|
||||
lock (Mutex)
|
||||
{
|
||||
rval = _items.ToArray();
|
||||
}
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
||||
public void Add(CommandModel item)
|
||||
{
|
||||
lock (Mutex)
|
||||
{
|
||||
_items.Add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using NLog;
|
||||
using NzbDrone.Common;
|
||||
using NzbDrone.Common.Cache;
|
||||
using NzbDrone.Common.EnsureThat;
|
||||
using NzbDrone.Common.Serializer;
|
||||
using NzbDrone.Core.Lifecycle;
|
||||
|
|
@ -35,20 +33,17 @@ public class CommandQueueManager : IManageCommandQueue, IHandle<ApplicationStart
|
|||
private readonly IServiceFactory _serviceFactory;
|
||||
private readonly Logger _logger;
|
||||
|
||||
private readonly ICached<CommandModel> _commandCache;
|
||||
private readonly BlockingCollection<CommandModel> _commandQueue;
|
||||
private readonly CommandQueue _commandQueue;
|
||||
|
||||
public CommandQueueManager(ICommandRepository repo,
|
||||
IServiceFactory serviceFactory,
|
||||
ICacheManager cacheManager,
|
||||
Logger logger)
|
||||
{
|
||||
_repo = repo;
|
||||
_serviceFactory = serviceFactory;
|
||||
_logger = logger;
|
||||
|
||||
_commandCache = cacheManager.GetCache<CommandModel>(GetType());
|
||||
_commandQueue = new BlockingCollection<CommandModel>(new CommandQueue());
|
||||
_commandQueue = new CommandQueue();
|
||||
}
|
||||
|
||||
public List<CommandModel> PushMany<TCommand>(List<TCommand> commands) where TCommand : Command
|
||||
|
|
@ -56,8 +51,7 @@ public List<CommandModel> PushMany<TCommand>(List<TCommand> commands) where TCom
|
|||
_logger.Trace("Publishing {0} commands", commands.Count);
|
||||
|
||||
var commandModels = new List<CommandModel>();
|
||||
var existingCommands = _commandCache.Values.Where(q => q.Status == CommandStatus.Queued ||
|
||||
q.Status == CommandStatus.Started).ToList();
|
||||
var existingCommands = _commandQueue.QueuedOrStarted();
|
||||
|
||||
foreach (var command in commands)
|
||||
{
|
||||
|
|
@ -86,7 +80,6 @@ public List<CommandModel> PushMany<TCommand>(List<TCommand> commands) where TCom
|
|||
|
||||
foreach (var commandModel in commandModels)
|
||||
{
|
||||
_commandCache.Set(commandModel.Id.ToString(), commandModel);
|
||||
_commandQueue.Add(commandModel);
|
||||
}
|
||||
|
||||
|
|
@ -124,7 +117,6 @@ public CommandModel Push<TCommand>(TCommand command, CommandPriority priority =
|
|||
_logger.Trace("Inserting new command: {0}", commandModel.Name);
|
||||
|
||||
_repo.Insert(commandModel);
|
||||
_commandCache.Set(commandModel.Id.ToString(), commandModel);
|
||||
_commandQueue.Add(commandModel);
|
||||
|
||||
return commandModel;
|
||||
|
|
@ -146,28 +138,31 @@ public IEnumerable<CommandModel> Queue(CancellationToken cancellationToken)
|
|||
|
||||
public CommandModel Get(int id)
|
||||
{
|
||||
return _commandCache.Get(id.ToString(), () => FindCommand(_repo.Get(id)));
|
||||
var command = _commandQueue.Find(id);
|
||||
|
||||
if (command == null)
|
||||
{
|
||||
command = _repo.Get(id);
|
||||
}
|
||||
|
||||
return command;
|
||||
}
|
||||
|
||||
public List<CommandModel> GetStarted()
|
||||
{
|
||||
_logger.Trace("Getting started commands");
|
||||
return _commandCache.Values.Where(c => c.Status == CommandStatus.Started).ToList();
|
||||
return _commandQueue.All().Where(c => c.Status == CommandStatus.Started).ToList();
|
||||
}
|
||||
|
||||
public void SetMessage(CommandModel command, string message)
|
||||
{
|
||||
command.Message = message;
|
||||
_commandCache.Set(command.Id.ToString(), command);
|
||||
}
|
||||
|
||||
public void Start(CommandModel command)
|
||||
{
|
||||
command.StartedAt = DateTime.UtcNow;
|
||||
command.Status = CommandStatus.Started;
|
||||
|
||||
// Marks the command as started in the DB, the queue takes care of marking it as started on it's own
|
||||
_logger.Trace("Marking command as started: {0}", command.Name);
|
||||
_commandCache.Set(command.Id.ToString(), command);
|
||||
_repo.Start(command);
|
||||
}
|
||||
|
||||
|
|
@ -195,12 +190,11 @@ public void CleanCommands()
|
|||
{
|
||||
_logger.Trace("Cleaning up old commands");
|
||||
|
||||
var old = _commandCache.Values.Where(c => c.EndedAt < DateTime.UtcNow.AddMinutes(-5));
|
||||
var commands = _commandQueue.All()
|
||||
.Where(c => c.EndedAt < DateTime.UtcNow.AddMinutes(-5))
|
||||
.ToList();
|
||||
|
||||
foreach (var command in old)
|
||||
{
|
||||
_commandCache.Remove(command.Id.ToString());
|
||||
}
|
||||
_commandQueue.RemoveMany(commands);
|
||||
|
||||
_repo.Trim();
|
||||
}
|
||||
|
|
@ -215,18 +209,6 @@ private dynamic GetCommand(string commandName)
|
|||
return Json.Deserialize("{}", commandType);
|
||||
}
|
||||
|
||||
private CommandModel FindCommand(CommandModel command)
|
||||
{
|
||||
var cachedCommand = _commandCache.Find(command.Id.ToString());
|
||||
|
||||
if (cachedCommand != null)
|
||||
{
|
||||
command.Message = cachedCommand.Message;
|
||||
}
|
||||
|
||||
return command;
|
||||
}
|
||||
|
||||
private void Update(CommandModel command, CommandStatus status, string message)
|
||||
{
|
||||
SetMessage(command, message);
|
||||
|
|
@ -236,15 +218,14 @@ private void Update(CommandModel command, CommandStatus status, string message)
|
|||
command.Status = status;
|
||||
|
||||
_logger.Trace("Updating command status");
|
||||
_commandCache.Set(command.Id.ToString(), command);
|
||||
_repo.End(command);
|
||||
}
|
||||
|
||||
private List<CommandModel> QueuedOrStarted(string name)
|
||||
{
|
||||
return _commandCache.Values.Where(q => q.Name == name &&
|
||||
(q.Status == CommandStatus.Queued ||
|
||||
q.Status == CommandStatus.Started)).ToList();
|
||||
return _commandQueue.QueuedOrStarted()
|
||||
.Where(q => q.Name == name)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public void Handle(ApplicationStartedEvent message)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ public class BulkMoveArtistCommand : Command
|
|||
public string DestinationRootFolder { get; set; }
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
public override bool RequiresDiskAccess => true;
|
||||
}
|
||||
|
||||
public class BulkMoveArtist : IEquatable<BulkMoveArtist>
|
||||
|
|
|
|||
|
|
@ -9,5 +9,6 @@ public class MoveArtistCommand : Command
|
|||
public string DestinationPath { get; set; }
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
public override bool RequiresDiskAccess => true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public MoveArtistService(IArtistService artistService,
|
|||
_logger = logger;
|
||||
}
|
||||
|
||||
private void MoveSingleArtist(Artist artist, string sourcePath, string destinationPath)
|
||||
private void MoveSingleArtist(Artist artist, string sourcePath, string destinationPath, int? index = null, int? total = null)
|
||||
{
|
||||
if (!_diskProvider.FolderExists(sourcePath))
|
||||
{
|
||||
|
|
@ -42,7 +42,14 @@ private void MoveSingleArtist(Artist artist, string sourcePath, string destinati
|
|||
return;
|
||||
}
|
||||
|
||||
_logger.ProgressInfo("Moving {0} from '{1}' to '{2}'", artist.Name, sourcePath, destinationPath);
|
||||
if (index != null && total != null)
|
||||
{
|
||||
_logger.ProgressInfo("Moving {0} from '{1}' to '{2}' ({3}/{4})", artist.Name, sourcePath, destinationPath, index + 1, total);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.ProgressInfo("Moving {0} from '{1}' to '{2}'", artist.Name, sourcePath, destinationPath);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
|
|
@ -81,12 +88,13 @@ public void Execute(BulkMoveArtistCommand message)
|
|||
|
||||
_logger.ProgressInfo("Moving {0} artist to '{1}'", artistToMove.Count, destinationRootFolder);
|
||||
|
||||
foreach (var s in artistToMove)
|
||||
for (var index = 0; index < artistToMove.Count; index++)
|
||||
{
|
||||
var s = artistToMove[index];
|
||||
var artist = _artistService.GetArtist(s.ArtistId);
|
||||
var destinationPath = Path.Combine(destinationRootFolder, _filenameBuilder.GetArtistFolder(artist));
|
||||
|
||||
MoveSingleArtist(artist, s.SourcePath, destinationPath);
|
||||
MoveSingleArtist(artist, s.SourcePath, destinationPath, index, artistToMove.Count);
|
||||
}
|
||||
|
||||
_logger.ProgressInfo("Finished moving {0} artist to '{1}'", artistToMove.Count, destinationRootFolder);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ namespace NzbDrone.Core.Update.Commands
|
|||
public class ApplicationUpdateCommand : Command
|
||||
{
|
||||
public override bool SendUpdatesToClient => true;
|
||||
public override bool IsExclusive => true;
|
||||
|
||||
public override string CompletionMessage => null;
|
||||
}
|
||||
|
|
|
|||
1
test.sh
1
test.sh
|
|
@ -1,3 +1,4 @@
|
|||
#! /bin/bash
|
||||
PLATFORM=$1
|
||||
TYPE=$2
|
||||
WHERE="cat != ManualTest"
|
||||
|
|
|
|||
Loading…
Reference in a new issue