github-mirrors/sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2025-04-23 13:57:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

New: Quality limits are part of Quality Profile

Browse source 
Closes #613
This commit is contained in:
Mark McDowall 2024-04-27 14:49:15 -07:00
parent cde0a31ff0
commit 572bdc979c
No known key found for this signature in database
45 changed files with 1196 additions and 657 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/App/State/AppSectionState.ts
View file

@ -62,6 +62,14 @@ export interface AppSectionItemState<T> {
item: T;
}
export interface AppSectionListState<T> {
isFetching: boolean;
isPopulated: boolean;
error: Error;
items: T[];
pendingChanges: Partial<T>[];
}
export interface AppSectionProviderState<T>
extends AppSectionDeleteState,
AppSectionSaveState {

2
frontend/src/App/State/SettingsAppState.ts
View file

@ -2,6 +2,7 @@ import AppSectionState, {
AppSectionDeleteState,
AppSectionItemSchemaState,
AppSectionItemState,
AppSectionListState,
AppSectionSaveState,
AppSectionSchemaState,
PagedAppSectionState,
@ -17,6 +18,7 @@ import ImportListOptionsSettings from 'typings/ImportListOptionsSettings';
import Indexer from 'typings/Indexer';
import IndexerFlag from 'typings/IndexerFlag';
import Notification from 'typings/Notification';
import QualityDefinition from 'typings/QualityDefinition';
import QualityProfile from 'typings/QualityProfile';
import General from 'typings/Settings/General';
import NamingConfig from 'typings/Settings/NamingConfig';

2
frontend/src/Settings/Profiles/Quality/EditQualityProfileModal.js
View file

@ -21,7 +21,7 @@ class EditQualityProfileModal extends Component {
// Listeners
onContentHeightChange = (height) => {
if (this.state.height === 'auto' || height > this.state.height) {
if (this.state.height === 'auto' || height !== 0) {
this.setState({ height });
}
};

21
frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
View file

@ -44,6 +44,9 @@ class EditQualityProfileModalContent extends Component {
this.state = {
headerHeight: 0,
bodyHeight: 0,
defaultBodyHeight: 0,
editGroupsBodyHeight: 0,
editSizesBodyHeight: 0,
footerHeight: 0
};
}
@ -51,17 +54,18 @@ class EditQualityProfileModalContent extends Component {
componentDidUpdate(prevProps, prevState) {
const {
headerHeight,
bodyHeight,
footerHeight
} = this.state;
const bodyHeight = this.state[`${this.props.mode}BodyHeight`];
if (
headerHeight > 0 &&
bodyHeight > 0 &&
footerHeight > 0 &&
(
headerHeight !== prevState.headerHeight ||
bodyHeight !== prevState.bodyHeight ||
bodyHeight !== prevState[`${prevProps.mode}BodyHeight`] ||
footerHeight !== prevState.footerHeight
)
) {
@ -77,15 +81,16 @@ class EditQualityProfileModalContent extends Component {
// Listeners
onHeaderMeasure = ({ height }) => {
if (height > this.state.headerHeight) {
if (height !== this.state.headerHeight) {
this.setState({ headerHeight: height });
}
};
onBodyMeasure = ({ height }) => {
const heightKey = `${this.props.mode}BodyHeight`;
if (height > this.state.bodyHeight) {
this.setState({ bodyHeight: height });
if (height !== this.state[heightKey]) {
this.setState({ [heightKey]: height });
}
};
@ -100,7 +105,7 @@ class EditQualityProfileModalContent extends Component {
render() {
const {
editGroups,
mode,
isFetching,
error,
isSaving,
@ -271,7 +276,7 @@ class EditQualityProfileModalContent extends Component {
<div className={styles.formGroupWrapper}>
<QualityProfileItems
editGroups={editGroups}
mode={mode}
qualityProfileItems={items.value}
errors={items.errors}
warnings={items.warnings}
@ -338,7 +343,7 @@ class EditQualityProfileModalContent extends Component {
}
EditQualityProfileModalContent.propTypes = {
editGroups: PropTypes.bool.isRequired,
mode: PropTypes.string.isRequired,
isFetching: PropTypes.bool.isRequired,
error: PropTypes.object,
isSaving: PropTypes.bool.isRequired,

52
frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
View file

@ -126,7 +126,7 @@ class EditQualityProfileModalContentConnector extends Component {
dragQualityIndex: null,
dropQualityIndex: null,
dropPosition: null,
editGroups: false
mode: 'default' // default, editGroups, editSizes
};
}
@ -256,6 +256,49 @@ class EditQualityProfileModalContentConnector extends Component {
});
};
onSizeChange = ({ id, minSize, maxSize, preferredSize }) => {
const qualityProfile = _.cloneDeep(this.props.item);
const items = qualityProfile.items.value;
let quality = null;
// eslint-disable-next-line guard-for-in
for (const index in items) {
const item = items[index];
if (item.quality?.id === id) {
quality = item;
break;
}
// eslint-disable-next-line guard-for-in
for (const i in item.items) {
const nestedItem = items[i];
if (nestedItem.quality?.id === id) {
quality = nestedItem;
break;
}
}
if (quality) {
break;
}
}
if (!quality) {
return;
}
quality.minSize = minSize;
quality.maxSize = maxSize;
quality.preferredSize = preferredSize;
this.props.setQualityProfileValue({
name: 'items',
value: items
});
};
onCreateGroupPress = (id) => {
const qualityProfile = _.cloneDeep(this.props.item);
const items = qualityProfile.items.value;
@ -439,8 +482,8 @@ class EditQualityProfileModalContentConnector extends Component {
});
};
onToggleEditGroupsMode = () => {
this.setState({ editGroups: !this.state.editGroups });
onChangeMode = (mode) => {
this.setState({ mode });
};
//
@ -466,7 +509,8 @@ class EditQualityProfileModalContentConnector extends Component {
onQualityProfileItemDragMove={this.onQualityProfileItemDragMove}
onQualityProfileItemDragEnd={this.onQualityProfileItemDragEnd}
onQualityProfileFormatItemScoreChange={this.onQualityProfileFormatItemScoreChange}
onToggleEditGroupsMode={this.onToggleEditGroupsMode}
onChangeMode={this.onChangeMode}
onSizeChange={this.onSizeChange}
/>
);
}

9
frontend/src/Settings/Profiles/Quality/QualityProfileItem.css
View file

@ -9,6 +9,11 @@
&.isInGroup {
border-style: dashed;
}
&.editSizes {
flex-direction: column;
padding: 10px;
}
}
.checkInputContainer {
@ -32,6 +37,10 @@
font-weight: normal;
line-height: $qualityProfileItemHeight;
cursor: pointer;
&.editSizes {
cursor: default;
}
}
.qualityName {

1
frontend/src/Settings/Profiles/Quality/QualityProfileItem.css.d.ts vendored
View file

@ -6,6 +6,7 @@ interface CssExports {
'createGroupButton': string;
'dragHandle': string;
'dragIcon': string;
'editSizes': string;
'isDragging': string;
'isInGroup': string;
'isPreview': string;

62
frontend/src/Settings/Profiles/Quality/QualityProfileItem.js
View file

@ -6,6 +6,7 @@ import Icon from 'Components/Icon';
import IconButton from 'Components/Link/IconButton';
import { icons } from 'Helpers/Props';
import translate from 'Utilities/String/translate';
import QualityProfileItemSize from './QualityProfileItemSize';
import styles from './QualityProfileItem.css';
class QualityProfileItem extends Component {
@ -36,20 +37,26 @@ class QualityProfileItem extends Component {
render() {
const {
editGroups,
mode,
isPreview,
qualityId,
groupId,
name,
allowed,
minSize,
maxSize,
preferredSize,
isDragging,
isOverCurrent,
connectDragSource
connectDragSource,
onSizeChange
} = this.props;
return (
<div
className={classNames(
styles.qualityProfileItem,
mode === 'editSizes' && styles.editSizes,
isDragging && styles.isDragging,
isPreview && styles.isPreview,
isOverCurrent && styles.isOverCurrent,
@ -57,10 +64,13 @@ class QualityProfileItem extends Component {
)}
>
<label
className={styles.qualityNameContainer}
className={classNames(
styles.qualityNameContainer,
mode === 'editSizes' && styles.editSizes
)}
>
{
editGroups && !groupId && !isPreview &&
mode === 'editGroups' && !groupId && !isPreview &&
<IconButton
className={styles.createGroupButton}
name={icons.GROUP}
@ -70,7 +80,7 @@ class QualityProfileItem extends Component {
}
{
!editGroups &&
mode === 'default' &&
<CheckInput
className={styles.checkInput}
containerClassName={styles.checkInputContainer}
@ -83,7 +93,7 @@ class QualityProfileItem extends Component {
<div className={classNames(
styles.qualityName,
groupId && styles.isInGroup,
groupId && mode !== 'editSizes' && styles.isInGroup,
!allowed && styles.notAllowed
)}
>
@ -92,15 +102,30 @@ class QualityProfileItem extends Component {
</label>
{
connectDragSource(
<div className={styles.dragHandle}>
<Icon
className={styles.dragIcon}
title={translate('CreateGroup')}
name={icons.REORDER}
mode === 'editSizes' && qualityId != null ?
<div>
<QualityProfileItemSize
id={qualityId}
minSize={minSize}
maxSize={maxSize}
preferredSize={preferredSize}
onSizeChange={onSizeChange}
/>
</div>
)
</div> :
null
}
{
mode === 'editSizes' ? null :
connectDragSource(
<div className={styles.dragHandle}>
<Icon
className={styles.dragIcon}
title={translate('CreateGroup')}
name={icons.REORDER}
/>
</div>
)
}
</div>
);
@ -108,21 +133,26 @@ class QualityProfileItem extends Component {
}
QualityProfileItem.propTypes = {
editGroups: PropTypes.bool,
mode: PropTypes.string.isRequired,
isPreview: PropTypes.bool,
groupId: PropTypes.number,
qualityId: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
allowed: PropTypes.bool.isRequired,
minSize: PropTypes.number,
maxSize: PropTypes.number,
preferredSize: PropTypes.number,
isDragging: PropTypes.bool.isRequired,
isOverCurrent: PropTypes.bool.isRequired,
isInGroup: PropTypes.bool,
connectDragSource: PropTypes.func,
onCreateGroupPress: PropTypes.func,
onQualityProfileItemAllowedChange: PropTypes.func
onQualityProfileItemAllowedChange: PropTypes.func,
onSizeChange: PropTypes.func
};
QualityProfileItem.defaultProps = {
mode: 'default',
isPreview: false,
isOverCurrent: false,
// The drag preview will not connect the drag handle.

29
frontend/src/Settings/Profiles/Quality/QualityProfileItemDragSource.js
View file

@ -11,7 +11,7 @@ import styles from './QualityProfileItemDragSource.css';
const qualityProfileItemDragSource = {
beginDrag(props) {
const {
editGroups,
mode,
qualityIndex,
groupId,
qualityId,
@ -20,7 +20,7 @@ const qualityProfileItemDragSource = {
} = props;
return {
editGroups,
mode,
qualityIndex,
groupId,
qualityId,
@ -110,12 +110,15 @@ class QualityProfileItemDragSource extends Component {
render() {
const {
editGroups,
mode,
groupId,
qualityId,
name,
allowed,
items,
minSize,
maxSize,
preferredSize,
qualityIndex,
isDragging,
isDraggingUp,
@ -129,7 +132,8 @@ class QualityProfileItemDragSource extends Component {
onItemGroupAllowedChange,
onItemGroupNameChange,
onQualityProfileItemDragMove,
onQualityProfileItemDragEnd
onQualityProfileItemDragEnd,
onSizeChange
} = this.props;
const isBefore = !isDragging && isDraggingUp && isOverCurrent;
@ -156,7 +160,7 @@ class QualityProfileItemDragSource extends Component {
{
!!groupId && qualityId == null &&
<QualityProfileItemGroup
editGroups={editGroups}
mode={mode}
groupId={groupId}
name={name}
allowed={allowed}
@ -172,23 +176,28 @@ class QualityProfileItemDragSource extends Component {
onItemGroupNameChange={onItemGroupNameChange}
onQualityProfileItemDragMove={onQualityProfileItemDragMove}
onQualityProfileItemDragEnd={onQualityProfileItemDragEnd}
onSizeChange={onSizeChange}
/>
}
{
qualityId != null &&
<QualityProfileItem
editGroups={editGroups}
mode={mode}
groupId={groupId}
qualityId={qualityId}
name={name}
allowed={allowed}
minSize={minSize}
maxSize={maxSize}
preferredSize={preferredSize}
qualityIndex={qualityIndex}
isDragging={isDragging}
isOverCurrent={isOverCurrent}
connectDragSource={connectDragSource}
onCreateGroupPress={onCreateGroupPress}
onQualityProfileItemAllowedChange={onQualityProfileItemAllowedChange}
onSizeChange={onSizeChange}
/>
}
@ -207,12 +216,15 @@ class QualityProfileItemDragSource extends Component {
}
QualityProfileItemDragSource.propTypes = {
editGroups: PropTypes.bool.isRequired,
mode: PropTypes.string.isRequired,
groupId: PropTypes.number,
qualityId: PropTypes.number,
name: PropTypes.string.isRequired,
allowed: PropTypes.bool.isRequired,
items: PropTypes.arrayOf(PropTypes.object),
minSize: PropTypes.number,
maxSize: PropTypes.number,
preferredSize: PropTypes.number,
qualityIndex: PropTypes.string.isRequired,
isDragging: PropTypes.bool,
isDraggingUp: PropTypes.bool,
@ -227,7 +239,8 @@ QualityProfileItemDragSource.propTypes = {
onItemGroupAllowedChange: PropTypes.func,
onItemGroupNameChange: PropTypes.func,
onQualityProfileItemDragMove: PropTypes.func.isRequired,
onQualityProfileItemDragEnd: PropTypes.func.isRequired
onQualityProfileItemDragEnd: PropTypes.func.isRequired,
onSizeChange: PropTypes.func.isRequired
};
export default DropTarget(

8
frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css
View file

@ -7,6 +7,10 @@
&.editGroups {
background: var(--inputBackgroundColor);
}
&.editSizes {
padding: 10px;
}
}
.qualityProfileItemGroupInfo {
@ -70,6 +74,10 @@
cursor: pointer;
}
.editSizesQualityNameLabel {
composes: qualityNameContainer;
}
.deleteGroupButton {
composes: buton from '~Components/Link/IconButton.css';

2
frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css.d.ts vendored
View file

@ -7,6 +7,8 @@ interface CssExports {
'dragHandle': string;
'dragIcon': string;
'editGroups': string;
'editSizes': string;
'editSizesQualityNameLabel': string;
'groupQualities': string;
'isDragging': string;
'items': string;

65
frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js
View file

@ -48,7 +48,7 @@ class QualityProfileItemGroup extends Component {
render() {
const {
editGroups,
mode,
groupId,
name,
allowed,
@ -60,20 +60,22 @@ class QualityProfileItemGroup extends Component {
connectDragSource,
onQualityProfileItemAllowedChange,
onQualityProfileItemDragMove,
onQualityProfileItemDragEnd
onQualityProfileItemDragEnd,
onSizeChange
} = this.props;
return (
<div
className={classNames(
styles.qualityProfileItemGroup,
editGroups && styles.editGroups,
mode === 'editGroups' && styles.editGroups,
mode === 'editSizes' && styles.editSizes,
isDragging && styles.isDragging
)}
>
<div className={styles.qualityProfileItemGroupInfo}>
{
editGroups &&
mode === 'editGroups' &&
<div className={styles.qualityNameContainer}>
<IconButton
className={styles.deleteGroupButton}
@ -92,7 +94,7 @@ class QualityProfileItemGroup extends Component {
}
{
!editGroups &&
mode === 'default' &&
<label
className={styles.qualityNameLabel}
>
@ -129,31 +131,53 @@ class QualityProfileItemGroup extends Component {
}
{
connectDragSource(
<div className={styles.dragHandle}>
<Icon
className={styles.dragIcon}
name={icons.REORDER}
title={translate('Reorder')}
/>
</div>
)
mode === 'editSizes' &&
<label
className={styles.editSizesQualityNameLabel}
>
<div className={styles.nameContainer}>
<div className={classNames(
styles.name,
!allowed && styles.notAllowed
)}
>
{name}
</div>
</div>
</label>
}
{
mode === 'editSizes' ? null :
connectDragSource(
<div className={styles.dragHandle}>
<Icon
className={styles.dragIcon}
name={icons.REORDER}
title={translate('Reorder')}
/>
</div>
)
}
</div>
{
editGroups &&
<div className={styles.items}>
mode === 'default' ?
null :
<div className={mode === 'editGroups' ? styles.items : undefined}>
{
items.map(({ quality }, index) => {
return (
<QualityProfileItemDragSource
key={quality.id}
editGroups={editGroups}
mode={mode}
groupId={groupId}
qualityId={quality.id}
name={quality.name}
allowed={allowed}
minSize={quality.minSize}
maxSize={quality.maxSize}
preferredSize={quality.preferredSize}
items={items}
qualityIndex={`${qualityIndex}.${index + 1}`}
isDragging={isDragging}
@ -163,6 +187,7 @@ class QualityProfileItemGroup extends Component {
onQualityProfileItemAllowedChange={onQualityProfileItemAllowedChange}
onQualityProfileItemDragMove={onQualityProfileItemDragMove}
onQualityProfileItemDragEnd={onQualityProfileItemDragEnd}
onSizeChange={onSizeChange}
/>
);
}).reverse()
@ -175,7 +200,7 @@ class QualityProfileItemGroup extends Component {
}
QualityProfileItemGroup.propTypes = {
editGroups: PropTypes.bool,
mode: PropTypes.string.isRequired,
groupId: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
allowed: PropTypes.bool.isRequired,
@ -190,10 +215,12 @@ QualityProfileItemGroup.propTypes = {
onItemGroupNameChange: PropTypes.func.isRequired,
onDeleteGroupPress: PropTypes.func.isRequired,
onQualityProfileItemDragMove: PropTypes.func.isRequired,
onQualityProfileItemDragEnd: PropTypes.func.isRequired
onQualityProfileItemDragEnd: PropTypes.func.isRequired,
onSizeChange: PropTypes.func
};
QualityProfileItemGroup.defaultProps = {
mode: 'default',
// The drag preview will not connect the drag handle.
connectDragSource: (node) => node
};

60
frontend/src/Settings/Profiles/Quality/QualityProfileItemSize.css Normal file
View file

@ -0,0 +1,60 @@
.sizeLimit {
flex: 0 1 500px;
}
.slider {
width: 100%;
height: 20px;
}
.track {
top: 9px;
margin: 0 5px;
height: 3px;
background-color: var(--sliderAccentColor);
box-shadow: 0 0 0 #000;
&:nth-child(3n + 1) {
background-color: #ddd;
}
}
.thumb {
top: 1px;
z-index: 0 !important;
width: 18px;
height: 18px;
border: 3px solid var(--sliderAccentColor);
border-radius: 50%;
background-color: var(--white);
text-align: center;
cursor: pointer;
}
.sizes {
display: flex;
justify-content: space-between;
}
.megabytesPerMinuteContainer {
display: flex;
justify-content: space-between;
flex: 0 0 400px;
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid var(--borderColor);
}
.megabytesPerMinute {
display: flex;
flex-direction: column;
}
.sizeInput {
composes: input from '~Components/Form/TextInput.css';
display: inline-block;
flex-grow: 1;
margin-bottom: 2px;
padding: 6px;
}

14
frontend/src/Settings/Profiles/Quality/QualityProfileItemSize.css.d.ts vendored Normal file
View file

@ -0,0 +1,14 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
'megabytesPerMinute': string;
'megabytesPerMinuteContainer': string;
'sizeInput': string;
'sizeLimit': string;
'sizes': string;
'slider': string;
'thumb': string;
'track': string;
}
export const cssExports: CssExports;
export default cssExports;

295
frontend/src/Settings/Profiles/Quality/QualityProfileItemSize.tsx Normal file
View file

@ -0,0 +1,295 @@
import React, { HTMLProps, useCallback, useState } from 'react';
import ReactSlider from 'react-slider';
import NumberInput from 'Components/Form/NumberInput';
import Label from 'Components/Label';
import Popover from 'Components/Tooltip/Popover';
import { kinds, tooltipPositions } from 'Helpers/Props';
import QualityDefinitionLimits from 'Settings/Quality/Definition/QualityDefinitionLimits';
import { InputChanged } from 'typings/inputs';
import formatBytes from 'Utilities/Number/formatBytes';
import roundNumber from 'Utilities/Number/roundNumber';
import translate from 'Utilities/String/translate';
import styles from './QualityProfileItemSize.css';
const MIN = 0;
const MAX = 400;
const STEP_SIZE = 0.1;
const MIN_DISTANCE = 3;
const SLIDER_MAX = roundNumber(Math.pow(MAX, 1 / 1.1));
interface SizeProps {
minSize: number | null;
preferredSize: number | null;
maxSize: number | null;
}
export interface OnSizeChangeArguments extends SizeProps {
id: number;
}
export interface QualityProfileItemSizeProps extends OnSizeChangeArguments {
onSizeChange: (props: OnSizeChangeArguments) => void;
}
function trackRenderer(props: HTMLProps<HTMLDivElement>) {
return <div {...props} className={styles.track} />;
}
function thumbRenderer(props: HTMLProps<HTMLDivElement>) {
return <div {...props} className={styles.thumb} />;
}
function getSliderValue(value: number | null, defaultValue: number): number {
const sliderValue = value ? Math.pow(value, 1 / 1.1) : defaultValue;
return roundNumber(sliderValue);
}
export default function QualityProfileItemSize(
props: QualityProfileItemSizeProps
) {
const { id, minSize, maxSize, preferredSize, onSizeChange } = props;
const [sizes, setSizes] = useState<SizeProps>({
minSize: getSliderValue(minSize, MIN),
preferredSize: getSliderValue(preferredSize, SLIDER_MAX - MIN_DISTANCE),
maxSize: getSliderValue(maxSize, SLIDER_MAX),
});
const handleSliderChange = useCallback(
([sliderMinSize, sliderPreferredSize, sliderMaxSize]: [
number,
number,
number
]) => {
// console.log('Sizes:', sliderMinSize, sliderPreferredSize, sliderMaxSize);
console.log(
'Min Sizes: ',
sliderMinSize,
roundNumber(Math.pow(sliderMinSize, 1.1))
);
setSizes({
minSize: sliderMinSize,
preferredSize: sliderPreferredSize,
maxSize: sliderMaxSize,
});
onSizeChange({
id,
minSize: roundNumber(Math.pow(sliderMinSize, 1.1)),
preferredSize:
sliderPreferredSize === MAX - MIN_DISTANCE
? null
: roundNumber(Math.pow(sliderPreferredSize, 1.1)),
maxSize:
sliderMaxSize === MAX
? null
: roundNumber(Math.pow(sliderMaxSize, 1.1)),
});
},
[id, setSizes, onSizeChange]
);
const handleMinSizeChange = useCallback(
({ value }: InputChanged<number>) => {
setSizes({
minSize: value,
preferredSize: sizes.preferredSize,
maxSize: sizes.maxSize,
});
onSizeChange({
id,
minSize: value,
preferredSize: sizes.preferredSize,
maxSize: sizes.maxSize,
});
},
[id, sizes, setSizes, onSizeChange]
);
const handlePreferredSizeChange = useCallback(
({ value }: InputChanged<number>) => {
setSizes({
minSize: sizes.minSize,
preferredSize: value,
maxSize: sizes.maxSize,
});
onSizeChange({
id,
minSize: sizes.minSize,
preferredSize: value,
maxSize: sizes.maxSize,
});
},
[id, sizes, setSizes, onSizeChange]
);
const handleMaxSizeChange = useCallback(
({ value }: InputChanged<number>) => {
setSizes({
minSize: sizes.minSize,
preferredSize: sizes.preferredSize,
maxSize: value,
});
onSizeChange({
id,
minSize: sizes.minSize,
preferredSize: sizes.preferredSize,
maxSize: value,
});
},
[id, sizes, setSizes, onSizeChange]
);
const handleAfterSliderChange = useCallback(() => {
setSizes({
minSize: getSliderValue(minSize, MIN),
maxSize: getSliderValue(maxSize, MAX),
preferredSize: getSliderValue(preferredSize, MAX - MIN_DISTANCE),
});
}, [minSize, maxSize, preferredSize, setSizes]);
const minBytes = (sizes.minSize || 0) * 1024 * 1024;
const minSixty = `${formatBytes(minBytes * 60)}/${translate(
'HourShorthand'
)}`;
const preferredBytes = (sizes.preferredSize || 0) * 1024 * 1024;
const preferredSixty = preferredBytes
? `${formatBytes(preferredBytes * 60)}/${translate('HourShorthand')}`
: translate('Unlimited');
const maxBytes = maxSize && maxSize * 1024 * 1024;
const maxSixty = maxBytes
? `${formatBytes(maxBytes * 60)}/${translate('HourShorthand')}`
: translate('Unlimited');
return (
<div className={styles.sizeLimit}>
{/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
{/* @ts-ignore React version mismatch */}
<ReactSlider
className={styles.slider}
min={MIN}
max={SLIDER_MAX}
step={STEP_SIZE}
minDistance={3}
value={[sizes.minSize, sizes.preferredSize, sizes.maxSize]}
withTracks={true}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore allowCross is still available in the version currently used
allowCross={false}
snapDragDisabled={true}
renderThumb={thumbRenderer}
renderTrack={trackRenderer}
onChange={handleSliderChange}
onAfterChange={handleAfterSliderChange}
/>
<div className={styles.sizes}>
<div>
<Popover
anchor={<Label kind={kinds.INFO}>{minSixty}</Label>}
title={translate('MinimumLimits')}
body={
<QualityDefinitionLimits
bytes={minBytes}
message={translate('NoMinimumForAnyRuntime')}
/>
}
position={tooltipPositions.BOTTOM}
/>
</div>
<div>
<Popover
anchor={<Label kind={kinds.SUCCESS}>{preferredSixty}</Label>}
title={translate('PreferredSize')}
body={
<QualityDefinitionLimits
bytes={preferredBytes}
message={translate('NoLimitForAnyRuntime')}
/>
}
position={tooltipPositions.BOTTOM}
/>
</div>
<div>
<Popover
anchor={<Label kind={kinds.WARNING}>{maxSixty}</Label>}
title={translate('MaximumLimits')}
body={
<QualityDefinitionLimits
bytes={maxBytes}
message={translate('NoLimitForAnyRuntime')}
/>
}
position={tooltipPositions.BOTTOM}
/>
</div>
</div>
<div className={styles.megabytesPerMinuteContainer}>
<div className={styles.megabytesPerMinute}>
<NumberInput
className={styles.sizeInput}
name={`${id}.min`}
value={minSize || MIN}
min={MIN}
max={preferredSize ? preferredSize - 5 : MAX - 5}
step={0.1}
isFloat={true}
// @ts-expect-error - Typngs are too loose
onChange={handleMinSizeChange}
/>
<Label kind={kinds.INFO}>
{translate('Minimum')} MiB/
{translate('MinuteShorthand')}
</Label>
</div>
<div className={styles.megabytesPerMinute}>
<NumberInput
className={styles.sizeInput}
name={`${id}.min`}
value={preferredSize || MAX - 5}
min={MIN}
max={maxSize ? maxSize - 5 : MAX - 5}
step={0.1}
isFloat={true}
// @ts-expect-error - Typngs are too loose
onChange={handlePreferredSizeChange}
/>
<Label kind={kinds.SUCCESS}>
{translate('Preferred')} MiB/
{translate('MinuteShorthand')}
</Label>
</div>
<div className={styles.megabytesPerMinute}>
<NumberInput
className={styles.sizeInput}
name={`${id}.max`}
value={maxSize || MAX}
min={(preferredSize || 0) + STEP_SIZE}
max={MAX}
step={0.1}
isFloat={true}
// @ts-expect-error - Typngs are too loose
onChange={handleMaxSizeChange}
/>
<Label kind={kinds.WARNING}>
{translate('Maximum')} MiB/
{translate('MinuteShorthand')}
</Label>
</div>
</div>
</div>
);
}

9
frontend/src/Settings/Profiles/Quality/QualityProfileItems.css
View file

@ -4,7 +4,14 @@
margin-top: 10px;
}
.editGroupsButtonIcon {
.editSizesButton {
composes: button from '~Components/Link/Button.css';
margin-top: 10px;
margin-left: 10px;
}
.editButtonIcon {
margin-right: 8px;
}

3
frontend/src/Settings/Profiles/Quality/QualityProfileItems.css.d.ts vendored
View file

@ -1,8 +1,9 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
'editButtonIcon': string;
'editGroupsButton': string;
'editGroupsButtonIcon': string;
'editSizesButton': string;
'qualities': string;
}
export const cssExports: CssExports;

76
frontend/src/Settings/Profiles/Quality/QualityProfileItems.js
View file

@ -21,8 +21,9 @@ class QualityProfileItems extends Component {
super(props, context);
this.state = {
qualitiesHeight: 0,
qualitiesHeightEditGroups: 0
defaultHeight: 0,
editGroupsHeight: 0,
editSizesHeight: 0
};
}
@ -30,17 +31,23 @@ class QualityProfileItems extends Component {
// Listeners
onMeasure = ({ height }) => {
if (this.props.editGroups) {
this.setState({
qualitiesHeightEditGroups: height
});
} else {
this.setState({ qualitiesHeight: height });
}
const heightKey = `${this.props.mode}Height`;
this.setState({
[heightKey]: height
});
};
onToggleEditGroupsMode = () => {
this.props.onToggleEditGroupsMode();
onEditGroupsPress = () => {
this.props.onChangeMode('editGroups');
};
onEditSizesPress = () => {
this.props.onChangeMode('editSizes');
};
onDefaultModePress = () => {
this.props.onChangeMode('default');
};
//
@ -48,7 +55,7 @@ class QualityProfileItems extends Component {
render() {
const {
editGroups,
mode,
dropQualityIndex,
dropPosition,
qualityProfileItems,
@ -57,15 +64,10 @@ class QualityProfileItems extends Component {
...otherProps
} = this.props;
const {
qualitiesHeight,
qualitiesHeightEditGroups
} = this.state;
const isDragging = dropQualityIndex !== null;
const isDraggingUp = isDragging && dropPosition === 'above';
const isDraggingDown = isDragging && dropPosition === 'below';
const minHeight = editGroups ? qualitiesHeightEditGroups : qualitiesHeight;
const height = this.state[`${mode}Height`];
return (
<FormGroup size={sizes.EXTRA_SMALL}>
@ -107,16 +109,33 @@ class QualityProfileItems extends Component {
<Button
className={styles.editGroupsButton}
kind={kinds.PRIMARY}
onPress={this.onToggleEditGroupsMode}
onPress={mode === 'editGroups' ? this.onDefaultModePress : this.onEditGroupsPress}
>
<div>
<Icon
className={styles.editGroupsButtonIcon}
name={editGroups ? icons.REORDER : icons.GROUP}
className={styles.editButtonIcon}
name={mode === 'editGroups' ? icons.REORDER : icons.GROUP}
/>
{
editGroups ? translate('DoneEditingGroups') : translate('EditGroups')
mode === 'editGroups' ? translate('DoneEditingGroups') : translate('EditGroups')
}
</div>
</Button>
<Button
className={styles.editSizesButton}
kind={kinds.PRIMARY}
onPress={mode === 'editSizes' ? this.onDefaultModePress : this.onEditSizesPress}
>
<div>
<Icon
className={styles.editButtonIcon}
name={mode === 'editSizes' ? icons.REORDER : icons.FILE}
/>
{
mode === 'editSizes' ? translate('DoneEditingSizes') : translate('EditSizes')
}
</div>
</Button>
@ -128,21 +147,24 @@ class QualityProfileItems extends Component {
>
<div
className={styles.qualities}
style={{ minHeight: `${minHeight}px` }}
style={{ height: `${height}px` }}
>
{
qualityProfileItems.map(({ id, name, allowed, quality, items }, index) => {
qualityProfileItems.map(({ id, name, allowed, quality, items, minSize, maxSize, preferredSize }, index) => {
const identifier = quality ? quality.id : id;
return (
<QualityProfileItemDragSource
key={identifier}
editGroups={editGroups}
mode={mode}
groupId={id}
qualityId={quality && quality.id}
name={quality ? quality.name : name}
allowed={allowed}
items={items}
minSize={minSize}
maxSize={maxSize}
preferredSize={preferredSize}
qualityIndex={`${index + 1}`}
isInGroup={false}
isDragging={isDragging}
@ -164,14 +186,14 @@ class QualityProfileItems extends Component {
}
QualityProfileItems.propTypes = {
editGroups: PropTypes.bool.isRequired,
mode: PropTypes.string.isRequired,
dragQualityIndex: PropTypes.string,
dropQualityIndex: PropTypes.string,
dropPosition: PropTypes.string,
qualityProfileItems: PropTypes.arrayOf(PropTypes.object).isRequired,
errors: PropTypes.arrayOf(PropTypes.object),
warnings: PropTypes.arrayOf(PropTypes.object),
onToggleEditGroupsMode: PropTypes.func.isRequired
onChangeMode: PropTypes.func.isRequired
};
QualityProfileItems.defaultProps = {

58
frontend/src/Settings/Quality/Definition/QualityDefinition.css
View file

@ -14,60 +14,6 @@
line-height: 40px;
}
.sizeLimit {
flex: 0 1 500px;
padding-right: 30px;
}
.slider {
width: 100%;
height: 20px;
}
.track {
top: 9px;
margin: 0 5px;
height: 3px;
background-color: var(--sliderAccentColor);
box-shadow: 0 0 0 #000;
&:nth-child(3n+1) {
background-color: #ddd;
}
}
.thumb {
top: 1px;
z-index: 0 !important;
width: 18px;
height: 18px;
border: 3px solid var(--sliderAccentColor);
border-radius: 50%;
background-color: var(--white);
text-align: center;
cursor: pointer;
}
.sizes {
display: flex;
justify-content: space-between;
}
.megabytesPerMinute {
display: flex;
justify-content: space-between;
flex: 0 0 400px;
}
.sizeInput {
composes: input from '~Components/Form/TextInput.css';
display: inline-block;
margin-left: 5px;
padding: 6px;
width: 75px;
}
@media only screen and (max-width: $breakpointSmall) {
.qualityDefinition {
flex-wrap: wrap;
@ -86,8 +32,4 @@
font-weight: bold;
line-height: inherit;
}
.sizeLimit {
margin-top: 10px;
}
}

7
frontend/src/Settings/Quality/Definition/QualityDefinition.css.d.ts vendored
View file

@ -1,16 +1,9 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
'megabytesPerMinute': string;
'quality': string;
'qualityDefinition': string;
'sizeInput': string;
'sizeLimit': string;
'sizes': string;
'slider': string;
'thumb': string;
'title': string;
'track': string;
}
export const cssExports: CssExports;
export default cssExports;

346
frontend/src/Settings/Quality/Definition/QualityDefinition.js
View file

@ -1,346 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import ReactSlider from 'react-slider';
import NumberInput from 'Components/Form/NumberInput';
import TextInput from 'Components/Form/TextInput';
import Label from 'Components/Label';
import Popover from 'Components/Tooltip/Popover';
import { kinds, tooltipPositions } from 'Helpers/Props';
import formatBytes from 'Utilities/Number/formatBytes';
import roundNumber from 'Utilities/Number/roundNumber';
import translate from 'Utilities/String/translate';
import QualityDefinitionLimits from './QualityDefinitionLimits';
import styles from './QualityDefinition.css';
const MIN = 0;
const MAX = 1000;
const MIN_DISTANCE = 1;
const slider = {
min: MIN,
max: roundNumber(Math.pow(MAX, 1 / 1.1)),
step: 0.1
};
function getValue(inputValue) {
if (inputValue < MIN) {
return MIN;
}
if (inputValue > MAX) {
return MAX;
}
return roundNumber(inputValue);
}
function getSliderValue(value, defaultValue) {
const sliderValue = value ? Math.pow(value, 1 / 1.1) : defaultValue;
return roundNumber(sliderValue);
}
class QualityDefinition extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this._forceUpdateTimeout = null;
this.state = {
sliderMinSize: getSliderValue(props.minSize, slider.min),
sliderMaxSize: getSliderValue(props.maxSize, slider.max),
sliderPreferredSize: getSliderValue(props.preferredSize, (slider.max - 3))
};
}
componentDidMount() {
// A hack to deal with a bug in the slider component until a fix for it
// lands and an updated version is available.
// See: https://github.com/mpowaga/react-slider/issues/115
this._forceUpdateTimeout = setTimeout(() => this.forceUpdate(), 1);
}
componentWillUnmount() {
if (this._forceUpdateTimeout) {
clearTimeout(this._forceUpdateTimeout);
}
}
//
// Control
trackRenderer(props, state) {
return (
<div
{...props}
className={styles.track}
/>
);
}
thumbRenderer(props, state) {
return (
<div
{...props}
className={styles.thumb}
/>
);
}
//
// Listeners
onSliderChange = ([sliderMinSize, sliderPreferredSize, sliderMaxSize]) => {
this.setState({
sliderMinSize,
sliderMaxSize,
sliderPreferredSize
});
this.props.onSizeChange({
minSize: roundNumber(Math.pow(sliderMinSize, 1.1)),
preferredSize: sliderPreferredSize === (slider.max - 3) ? null : roundNumber(Math.pow(sliderPreferredSize, 1.1)),
maxSize: sliderMaxSize === slider.max ? null : roundNumber(Math.pow(sliderMaxSize, 1.1))
});
};
onAfterSliderChange = () => {
const {
minSize,
maxSize,
preferredSize
} = this.props;
this.setState({
sliderMiSize: getSliderValue(minSize, slider.min),
sliderMaxSize: getSliderValue(maxSize, slider.max),
sliderPreferredSize: getSliderValue(preferredSize, (slider.max - 3)) // fix
});
};
onMinSizeChange = ({ value }) => {
const minSize = getValue(value);
this.setState({
sliderMinSize: getSliderValue(minSize, slider.min)
});
this.props.onSizeChange({
minSize,
maxSize: this.props.maxSize,
preferredSize: this.props.preferredSize
});
};
onPreferredSizeChange = ({ value }) => {
const preferredSize = value === (MAX - 3) ? null : getValue(value);
this.setState({
sliderPreferredSize: getSliderValue(preferredSize, slider.preferred)
});
this.props.onSizeChange({
minSize: this.props.minSize,
maxSize: this.props.maxSize,
preferredSize
});
};
onMaxSizeChange = ({ value }) => {
const maxSize = value === MAX ? null : getValue(value);
this.setState({
sliderMaxSize: getSliderValue(maxSize, slider.max)
});
this.props.onSizeChange({
minSize: this.props.minSize,
maxSize,
preferredSize: this.props.preferredSize
});
};
//
// Render
render() {
const {
id,
quality,
title,
minSize,
maxSize,
preferredSize,
advancedSettings,
onTitleChange
} = this.props;
const {
sliderMinSize,
sliderMaxSize,
sliderPreferredSize
} = this.state;
const minBytes = minSize * 1024 * 1024;
const minSixty = `${formatBytes(minBytes * 60)}/${translate('HourShorthand')}`;
const preferredBytes = preferredSize * 1024 * 1024;
const preferredSixty = preferredBytes ? `${formatBytes(preferredBytes * 60)}/${translate('HourShorthand')}` : translate('Unlimited');
const maxBytes = maxSize && maxSize * 1024 * 1024;
const maxSixty = maxBytes ? `${formatBytes(maxBytes * 60)}/${translate('HourShorthand')}` : translate('Unlimited');
return (
<div className={styles.qualityDefinition}>
<div className={styles.quality}>
{quality.name}
</div>
<div className={styles.title}>
<TextInput
name={`${id}.${title}`}
value={title}
onChange={onTitleChange}
/>
</div>
<div className={styles.sizeLimit}>
<ReactSlider
className={styles.slider}
min={slider.min}
max={slider.max}
step={slider.step}
minDistance={3}
value={[sliderMinSize, sliderPreferredSize, sliderMaxSize]}
withTracks={true}
allowCross={false}
snapDragDisabled={true}
renderThumb={this.thumbRenderer}
renderTrack={this.trackRenderer}
onChange={this.onSliderChange}
onAfterChange={this.onAfterSliderChange}
/>
<div className={styles.sizes}>
<div>
<Popover
anchor={
<Label kind={kinds.INFO}>{minSixty}</Label>
}
title={translate('MinimumLimits')}
body={
<QualityDefinitionLimits
bytes={minBytes}
message={translate('NoMinimumForAnyRuntime')}
/>
}
position={tooltipPositions.BOTTOM}
/>
</div>
<div>
<Popover
anchor={
<Label kind={kinds.SUCCESS}>{preferredSixty}</Label>
}
title={translate('PreferredSize')}
body={
<QualityDefinitionLimits
bytes={preferredBytes}
message={translate('NoLimitForAnyRuntime')}
/>
}
position={tooltipPositions.BOTTOM}
/>
</div>
<div>
<Popover
anchor={
<Label kind={kinds.WARNING}>{maxSixty}</Label>
}
title={translate('MaximumLimits')}
body={
<QualityDefinitionLimits
bytes={maxBytes}
message={translate('NoLimitForAnyRuntime')}
/>
}
position={tooltipPositions.BOTTOM}
/>
</div>
</div>
</div>
{
advancedSettings &&
<div className={styles.megabytesPerMinute}>
<div>
{translate('Min')}
<NumberInput
className={styles.sizeInput}
name={`${id}.min`}
value={minSize || MIN}
min={MIN}
max={preferredSize ? preferredSize - 5 : MAX - 5}
step={0.1}
isFloat={true}
onChange={this.onMinSizeChange}
/>
</div>
<div>
{translate('Preferred')}
<NumberInput
className={styles.sizeInput}
name={`${id}.min`}
value={preferredSize || MAX - 5}
min={MIN}
max={maxSize ? maxSize - 5 : MAX - 5}
step={0.1}
isFloat={true}
onChange={this.onPreferredSizeChange}
/>
</div>
<div>
{translate('Max')}
<NumberInput
className={styles.sizeInput}
name={`${id}.max`}
value={maxSize || MAX}
min={minSize + MIN_DISTANCE}
max={MAX}
step={0.1}
isFloat={true}
onChange={this.onMaxSizeChange}
/>
</div>
</div>
}
</div>
);
}
}
QualityDefinition.propTypes = {
id: PropTypes.number.isRequired,
quality: PropTypes.object.isRequired,
title: PropTypes.string.isRequired,
minSize: PropTypes.number,
maxSize: PropTypes.number,
preferredSize: PropTypes.number,
advancedSettings: PropTypes.bool.isRequired,
onTitleChange: PropTypes.func.isRequired,
onSizeChange: PropTypes.func.isRequired
};
export default QualityDefinition;

46
frontend/src/Settings/Quality/Definition/QualityDefinition.tsx Normal file
View file

@ -0,0 +1,46 @@
import React, { useCallback } from 'react';
import { useDispatch } from 'react-redux';
import TextInput from 'Components/Form/TextInput';
import Quality from 'Quality/Quality';
import { setQualityDefinitionValue } from 'Store/Actions/settingsActions';
import styles from './QualityDefinition.css';
interface QualityDefinitionProps {
id: number;
quality: Quality;
title: string;
}
function QualityDefinition(props: QualityDefinitionProps) {
const { id, quality, title } = props;
const dispatch = useDispatch();
const handleTitleChange = useCallback(
({ value }: { value: string }) => {
dispatch(
setQualityDefinitionValue({
id,
name: 'title',
value,
})
);
},
[id, dispatch]
);
return (
<div className={styles.qualityDefinition}>
<div className={styles.quality}>{quality.name}</div>
<div className={styles.title}>
<TextInput
name={`${id}.${title}`}
value={title}
onChange={handleTitleChange}
/>
</div>
</div>
);
}
export default QualityDefinition;

71
frontend/src/Settings/Quality/Definition/QualityDefinitionConnector.js
View file

@ -1,71 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { clearPendingChanges } from 'Store/Actions/baseActions';
import { setQualityDefinitionValue } from 'Store/Actions/settingsActions';
import QualityDefinition from './QualityDefinition';
const mapDispatchToProps = {
setQualityDefinitionValue,
clearPendingChanges
};
class QualityDefinitionConnector extends Component {
componentWillUnmount() {
this.props.clearPendingChanges({ section: 'settings.qualityDefinitions' });
}
//
// Listeners
onTitleChange = ({ value }) => {
this.props.setQualityDefinitionValue({ id: this.props.id, name: 'title', value });
};
onSizeChange = ({ minSize, maxSize, preferredSize }) => {
const {
id,
minSize: currentMinSize,
maxSize: currentMaxSize,
preferredSize: currentPreferredSize
} = this.props;
if (minSize !== currentMinSize) {
this.props.setQualityDefinitionValue({ id, name: 'minSize', value: minSize });
}
if (maxSize !== currentMaxSize) {
this.props.setQualityDefinitionValue({ id, name: 'maxSize', value: maxSize });
}
if (preferredSize !== currentPreferredSize) {
this.props.setQualityDefinitionValue({ id, name: 'preferredSize', value: preferredSize });
}
};
//
// Render
render() {
return (
<QualityDefinition
{...this.props}
onTitleChange={this.onTitleChange}
onSizeChange={this.onSizeChange}
/>
);
}
}
QualityDefinitionConnector.propTypes = {
id: PropTypes.number.isRequired,
advancedSettings: PropTypes.bool.isRequired,
minSize: PropTypes.number,
maxSize: PropTypes.number,
preferredSize: PropTypes.number,
setQualityDefinitionValue: PropTypes.func.isRequired,
clearPendingChanges: PropTypes.func.isRequired
};
export default connect(null, mapDispatchToProps)(QualityDefinitionConnector);

21
frontend/src/Settings/Quality/Definition/QualityDefinitions.css
View file

@ -8,24 +8,11 @@
flex: 0 1 250px;
}
.sizeLimit {
flex: 0 1 500px;
}
.notice {
composes: alert from '~Components/Alert.css';
.megabytesPerMinute {
flex: 0 0 250px;
}
.sizeLimitHelpTextContainer {
display: flex;
justify-content: flex-end;
margin-top: 20px;
max-width: 1000px;
}
.sizeLimitHelpText {
max-width: 500px;
color: var(--helpTextColor);
margin: 0;
margin-bottom: 20px;
}
@media only screen and (max-width: $breakpointSmall) {

5
frontend/src/Settings/Quality/Definition/QualityDefinitions.css.d.ts vendored
View file

@ -3,11 +3,8 @@
interface CssExports {
'definitions': string;
'header': string;
'megabytesPerMinute': string;
'notice': string;
'quality': string;
'sizeLimit': string;
'sizeLimitHelpText': string;
'sizeLimitHelpTextContainer': string;
'title': string;
}
export const cssExports: CssExports;

105
frontend/src/Settings/Quality/Quality.js Normal file
View file

@ -0,0 +1,105 @@
import PropTypes from 'prop-types';
import React, { Component, Fragment } from 'react';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
import { icons } from 'Helpers/Props';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import translate from 'Utilities/String/translate';
import QualityDefinitions from './Definition/QualityDefinitions';
import ResetQualityDefinitionsModal from './Reset/ResetQualityDefinitionsModal';
class Quality extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this._saveCallback = null;
this.state = {
isSaving: false,
hasPendingChanges: false,
isConfirmQualityDefinitionResetModalOpen: false
};
}
//
// Listeners
onChildMounted = (saveCallback) => {
this._saveCallback = saveCallback;
};
onChildStateChange = (payload) => {
this.setState(payload);
};
onResetQualityDefinitionsPress = () => {
this.setState({ isConfirmQualityDefinitionResetModalOpen: true });
};
onCloseResetQualityDefinitionsModal = () => {
this.setState({ isConfirmQualityDefinitionResetModalOpen: false });
};
onSavePress = () => {
if (this._saveCallback) {
this._saveCallback();
}
};
//
// Render
render() {
const {
isSaving,
isResettingQualityDefinitions,
hasPendingChanges
} = this.state;
return (
<PageContent title={translate('QualitySettings')}>
<SettingsToolbarConnector
isSaving={isSaving}
hasPendingChanges={hasPendingChanges}
additionalButtons={
<Fragment>
<PageToolbarSeparator />
<PageToolbarButton
label={translate('ResetDefinitions')}
iconName={icons.REFRESH}
isSpinning={isResettingQualityDefinitions}
onPress={this.onResetQualityDefinitionsPress}
/>
</Fragment>
}
onSavePress={this.onSavePress}
/>
<PageContentBody>
<QualityDefinitions
onChildMounted={this.onChildMounted}
onChildStateChange={this.onChildStateChange}
/>
</PageContentBody>
<ResetQualityDefinitionsModal
isOpen={this.state.isConfirmQualityDefinitionResetModalOpen}
onModalClose={this.onCloseResetQualityDefinitionsModal}
/>
</PageContent>
);
}
}
Quality.propTypes = {
isResettingQualityDefinitions: PropTypes.bool.isRequired
};
export default Quality;

10
frontend/src/typings/QualityDefinition.ts Normal file
View file

@ -0,0 +1,10 @@
import Quality from 'Quality/Quality';
interface QualityDefinition {
id: number;
quality: Quality;
title: string;
weight: number;
}
export default QualityDefinition;

1
package.json
View file

@ -99,6 +99,7 @@
"@types/react-google-recaptcha": "2.1.9",
"@types/react-lazyload": "3.2.3",
"@types/react-router-dom": "5.3.3",
"@types/react-slider": "1.3.6",
"@types/react-text-truncate": "0.19.0",
"@types/react-window": "1.8.8",
"@types/redux-actions": "2.6.5",

78
src/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
View file

@ -5,8 +5,10 @@ using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.DecisionEngine.Specifications;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Profiles.Qualities;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
@ -22,13 +24,49 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
private RemoteEpisode _parseResultSingle;
private Series _series;
private List<Episode> _episodes;
private QualityDefinition _qualityType;
[SetUp]
public void Setup()
{
_series = Builder<Series>.CreateNew()
.With(s => s.Seasons = Builder<Season>.CreateListOfSize(2).Build().ToList())
.With(c => c.QualityProfile = (LazyLoaded<QualityProfile>)new QualityProfile
{
Cutoff = Quality.SDTV.Id, Items = new List<QualityProfileQualityItem>
{
new QualityProfileQualityItem
{
Quality = Quality.SDTV,
MinSize = 2,
MaxSize = 10
},
new QualityProfileQualityItem
{
Quality = Quality.RAWHD,
MinSize = 2,
MaxSize = null
},
new QualityProfileQualityItem
{
Name = "WEB 720p",
Items = new List<QualityProfileQualityItem>
{
new QualityProfileQualityItem
{
Quality = Quality.WEBDL720p,
MinSize = 2,
MaxSize = 20,
},
new QualityProfileQualityItem
{
Quality = Quality.WEBRip720p,
MinSize = 2,
MaxSize = 20,
}
}
}
}
})
.Build();
_episodes = Builder<Episode>.CreateListOfSize(10)
@ -80,19 +118,17 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
.Setup(v => v.Get(It.IsAny<Quality>()))
.Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
_qualityType = Builder<QualityDefinition>.CreateNew()
.With(q => q.MinSize = 2)
.With(q => q.MaxSize = 10)
.With(q => q.Quality = Quality.SDTV)
.Build();
Mocker.GetMock<IQualityDefinitionService>().Setup(s => s.Get(Quality.SDTV)).Returns(_qualityType);
Mocker.GetMock<IEpisodeService>().Setup(
s => s.GetEpisodesBySeason(It.IsAny<int>(), It.IsAny<int>()))
.Returns(_episodes);
}
private void WithSize(int? minSize, int? maxSize)
{
_series.QualityProfile.Value.Items[0].MinSize = minSize;
_series.QualityProfile.Value.Items[0].MaxSize = maxSize;
}
[TestCase(30, 50, false)]
[TestCase(30, 250, true)]
[TestCase(30, 500, false)]
@ -175,12 +211,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
[Test]
public void should_return_true_if_size_is_zero()
{
WithSize(10, 20);
_series.Runtime = 30;
_parseResultSingle.Series = _series;
_parseResultSingle.Release.Size = 0;
_parseResultSingle.Episodes.First().Runtime = 30;
_qualityType.MinSize = 10;
_qualityType.MaxSize = 20;
Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
}
@ -188,11 +224,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
[Test]
public void should_return_true_if_unlimited_30_minute()
{
WithSize(2, null);
_series.Runtime = 30;
_parseResultSingle.Series = _series;
_parseResultSingle.Release.Size = 18457280000;
_parseResultSingle.Episodes.First().Runtime = 30;
_qualityType.MaxSize = null;
Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
}
@ -200,11 +237,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
[Test]
public void should_return_true_if_unlimited_60_minute()
{
WithSize(2, null);
_series.Runtime = 60;
_parseResultSingle.Series = _series;
_parseResultSingle.Release.Size = 36857280000;
_parseResultSingle.Episodes.First().Runtime = 60;
_qualityType.MaxSize = null;
Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
}
@ -218,7 +256,19 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
_parseResultSingle.Release.Size = 300.Megabytes();
_parseResultSingle.Episodes.First().Runtime = 60;
_qualityType.MaxSize = 10;
Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
}
[Test]
public void should_use_grouped_quality_limits()
{
_parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL720p);
_series.Runtime = 30;
_parseResultSingle.Series = _series;
_parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
_parseResultSingle.Release.Size = 500.Megabytes();
_parseResultSingle.Episodes.First().Runtime = 30;
Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
}

40
src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
View file

@ -22,21 +22,35 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
[TestFixture]
public class PrioritizeDownloadDecisionFixture : CoreTest<DownloadDecisionPriorizationService>
{
private Series _series;
[SetUp]
public void Setup()
{
GivenPreferredDownloadProtocol(DownloadProtocol.Usenet);
Mocker.GetMock<IQualityDefinitionService>()
.Setup(s => s.Get(It.IsAny<Quality>()))
.Returns(new QualityDefinition { PreferredSize = null });
_series = Builder<Series>.CreateNew()
.With(e => e.Runtime = 60)
.With(e => e.QualityProfile = new QualityProfile
{
Items = Qualities.QualityFixture.GetDefaultQualities()
})
.Build();
}
private void GivenPreferredSize(double? size)
private void GivenPreferredSize(QualityProfile qualityProfile, double? size)
{
Mocker.GetMock<IQualityDefinitionService>()
.Setup(s => s.Get(It.IsAny<Quality>()))
.Returns(new QualityDefinition { PreferredSize = size });
foreach (var qualityOrGroup in qualityProfile.Items)
{
if (qualityOrGroup.Quality != null)
{
qualityOrGroup.PreferredSize = size;
}
else
{
qualityOrGroup.Items.ForEach(i => i.PreferredSize = size);
}
}
}
private Episode GivenEpisode(int id)
@ -63,13 +77,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
remoteEpisode.Release.DownloadProtocol = downloadProtocol;
remoteEpisode.Release.IndexerPriority = indexerPriority;
remoteEpisode.Series = Builder<Series>.CreateNew()
.With(e => e.Runtime = 60)
.With(e => e.QualityProfile = new QualityProfile
{
Items = Qualities.QualityFixture.GetDefaultQualities()
})
.Build();
remoteEpisode.Series = _series;
return remoteEpisode;
}
@ -176,7 +184,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
public void should_order_by_closest_to_preferred_size_if_both_under()
{
// 200 MB/Min * 60 Min Runtime = 12000 MB
GivenPreferredSize(200);
GivenPreferredSize(_series.QualityProfile.Value, 200);
var remoteEpisodeSmall = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), Language.English, size: 1200.Megabytes(), age: 1);
var remoteEpisodeLarge = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), Language.English, size: 10000.Megabytes(), age: 1);
@ -193,7 +201,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
public void should_order_by_closest_to_preferred_size_if_preferred_is_in_between()
{
// 46 MB/Min * 60 Min Runtime = 6900 MB
GivenPreferredSize(46);
GivenPreferredSize(_series.QualityProfile.Value, 46);
var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), Language.English, size: 500.Megabytes(), age: 1);
var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), Language.English, size: 2000.Megabytes(), age: 1);

182
src/NzbDrone.Core/Datastore/Migration/207_add_size_to_quality_profiles.cs Normal file
View file

@ -0,0 +1,182 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Dapper;
using FluentMigrator;
using Newtonsoft.Json;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Datastore.Migration.Framework;
namespace NzbDrone.Core.Datastore.Migration
{
[Migration(207)]
public class add_size_to_quality_profiles : NzbDroneMigrationBase
{
protected override void MainDbUpgrade()
{
Execute.WithConnection(ConvertProfile);
Delete.Column("MinSize").FromTable("QualityDefinitions");
Delete.Column("MaxSize").FromTable("QualityDefinitions");
Delete.Column("PreferredSize").FromTable("QualityDefinitions");
}
private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
{
var updater = new ProfileUpdater207(conn, tran);
updater.SetSizes();
updater.Commit();
}
}
public class Definition207
{
public double? MinSize { get; set; }
public double? MaxSize { get; set; }
public double? PreferredSize { get; set; }
}
public class Profile207
{
public int Id { get; set; }
public List<ProfileItem207> Items { get; set; }
}
public class ProfileItem207
{
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
public int Id { get; set; }
public string Name { get; set; }
public int? Quality { get; set; }
public List<ProfileItem207> Items { get; set; }
public bool Allowed { get; set; }
public double? MinSize { get; set; }
public double? MaxSize { get; set; }
public double? PreferredSize { get; set; }
}
public class ProfileUpdater207
{
private readonly IDbConnection _connection;
private readonly IDbTransaction _transaction;
private List<Profile207> _profiles;
private Dictionary<int, Definition207> _sizes;
private HashSet<Profile207> _changedProfiles = new HashSet<Profile207>();
public ProfileUpdater207(IDbConnection conn, IDbTransaction tran)
{
_connection = conn;
_transaction = tran;
_profiles = GetProfiles();
_sizes = GetSizes();
}
public void Commit()
{
var profilesToUpdate = _changedProfiles.Select(p => new
{
Id = p.Id,
Items = p.Items.ToJson()
});
var updateSql = $"UPDATE \"QualityProfiles\" SET \"Items\" = @Items WHERE \"Id\" = @Id";
_connection.Execute(updateSql, profilesToUpdate, transaction: _transaction);
_changedProfiles.Clear();
}
public void SetSizes()
{
foreach (var profile in _profiles)
{
foreach (var item in profile.Items)
{
if (item.Quality.HasValue)
{
if (_sizes.TryGetValue(item.Quality.Value, out var sizes))
{
item.MinSize = sizes.MinSize;
item.MaxSize = sizes.MaxSize;
item.PreferredSize = sizes.PreferredSize;
}
}
foreach (var groupedItem in item.Items)
{
if (groupedItem.Quality.HasValue)
{
if (_sizes.TryGetValue(groupedItem.Quality.Value, out var sizes))
{
groupedItem.MinSize = sizes.MinSize;
groupedItem.MaxSize = sizes.MaxSize;
groupedItem.PreferredSize = sizes.PreferredSize;
}
}
}
}
_changedProfiles.Add(profile);
}
}
private List<Profile207> GetProfiles()
{
var profiles = new List<Profile207>();
using (var getProfilesCmd = _connection.CreateCommand())
{
getProfilesCmd.Transaction = _transaction;
getProfilesCmd.CommandText = "SELECT \"Id\", \"Items\" FROM \"QualityProfiles\"";
using (var profileReader = getProfilesCmd.ExecuteReader())
{
while (profileReader.Read())
{
profiles.Add(new Profile207
{
Id = profileReader.GetInt32(0),
Items = Json.Deserialize<List<ProfileItem207>>(profileReader.GetString(1))
});
}
}
}
return profiles;
}
private Dictionary<int, Definition207> GetSizes()
{
var sizes = new Dictionary<int, Definition207>();
using (var getDefinitionsCmd = _connection.CreateCommand())
{
getDefinitionsCmd.Transaction = _transaction;
getDefinitionsCmd.CommandText = "SELECT \"Id\", \"MinSize\", \"MaxSize\", \"PreferredSize\" FROM \"QualityDefinitions\"";
using (var reader = getDefinitionsCmd.ExecuteReader())
{
while (reader.Read())
{
var id = reader.GetInt32(0);
double.TryParse(reader.GetValue(1).ToString(), out var minSize);
double.TryParse(reader.GetValue(2).ToString(), out var maxSize);
double.TryParse(reader.GetValue(3).ToString(), out var preferredSize);
sizes.Add(id, new Definition207
{
MinSize = minSize,
MaxSize = maxSize,
PreferredSize = preferredSize
});
}
}
}
return sizes;
}
}
}

5
src/NzbDrone.Core/Datastore/TableMapping.cs
View file

@ -133,7 +133,10 @@ namespace NzbDrone.Core.Datastore
Mapper.Entity<QualityDefinition>("QualityDefinitions").RegisterModel()
.Ignore(d => d.GroupName)
.Ignore(d => d.Weight);
.Ignore(d => d.Weight)
.Ignore(d => d.MinSize)
.Ignore(d => d.MaxSize)
.Ignore(d => d.PreferredSize);
Mapper.Entity<CustomFormat>("CustomFormats").RegisterModel();

14
src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
View file

@ -15,16 +15,14 @@ namespace NzbDrone.Core.DecisionEngine
{
private readonly IConfigService _configService;
private readonly IDelayProfileService _delayProfileService;
private readonly IQualityDefinitionService _qualityDefinitionService;
public delegate int CompareDelegate(DownloadDecision x, DownloadDecision y);
public delegate int CompareDelegate<TSubject, TValue>(DownloadDecision x, DownloadDecision y);
public DownloadDecisionComparer(IConfigService configService, IDelayProfileService delayProfileService, IQualityDefinitionService qualityDefinitionService)
public DownloadDecisionComparer(IConfigService configService, IDelayProfileService delayProfileService)
{
_configService = configService;
_delayProfileService = delayProfileService;
_qualityDefinitionService = qualityDefinitionService;
}
public int Compare(DownloadDecision x, DownloadDecision y)
@ -185,15 +183,19 @@ namespace NzbDrone.Core.DecisionEngine
{
var sizeCompare = CompareBy(x.RemoteEpisode, y.RemoteEpisode, remoteEpisode =>
{
var preferredSize = _qualityDefinitionService.Get(remoteEpisode.ParsedEpisodeInfo.Quality.Quality).PreferredSize;
var qualityProfile = remoteEpisode.Series.QualityProfile.Value;
var qualityIndex = qualityProfile.GetIndex(remoteEpisode.ParsedEpisodeInfo.Quality.Quality, true);
var qualityOrGroup = qualityProfile.Items[qualityIndex.Index];
var item = qualityOrGroup.Quality == null ? qualityOrGroup.Items[qualityIndex.GroupIndex] : qualityOrGroup;
var preferredSize = item.PreferredSize;
// If no value for preferred it means unlimited so fallback to sort largest is best
if (preferredSize.HasValue && remoteEpisode.Series.Runtime > 0)
{
var preferredMovieSize = remoteEpisode.Series.Runtime * preferredSize.Value.Megabytes();
var preferredEpisodeSize = remoteEpisode.Series.Runtime * preferredSize.Value.Megabytes();
// Calculate closest to the preferred size
return Math.Abs((remoteEpisode.Release.Size - preferredMovieSize).Round(200.Megabytes())) * (-1);
return Math.Abs((remoteEpisode.Release.Size - preferredEpisodeSize).Round(200.Megabytes())) * (-1);
}
else
{

7
src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs
View file

@ -2,7 +2,6 @@ using System.Collections.Generic;
using System.Linq;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Profiles.Delay;
using NzbDrone.Core.Qualities;
namespace NzbDrone.Core.DecisionEngine
{
@ -15,13 +14,11 @@ namespace NzbDrone.Core.DecisionEngine
{
private readonly IConfigService _configService;
private readonly IDelayProfileService _delayProfileService;
private readonly IQualityDefinitionService _qualityDefinitionService;
public DownloadDecisionPriorizationService(IConfigService configService, IDelayProfileService delayProfileService, IQualityDefinitionService qualityDefinitionService)
public DownloadDecisionPriorizationService(IConfigService configService, IDelayProfileService delayProfileService)
{
_configService = configService;
_delayProfileService = delayProfileService;
_qualityDefinitionService = qualityDefinitionService;
}
public List<DownloadDecision> PrioritizeDecisions(List<DownloadDecision> decisions)
@ -29,7 +26,7 @@ namespace NzbDrone.Core.DecisionEngine
return decisions.Where(c => c.RemoteEpisode.Series != null)
.GroupBy(c => c.RemoteEpisode.Series.Id, (seriesId, downloadDecisions) =>
{
return downloadDecisions.OrderByDescending(decision => decision, new DownloadDecisionComparer(_configService, _delayProfileService, _qualityDefinitionService));
return downloadDecisions.OrderByDescending(decision => decision, new DownloadDecisionComparer(_configService, _delayProfileService));
})
.SelectMany(c => c)
.Union(decisions.Where(c => c.RemoteEpisode.Series == null))

18
src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
View file

@ -3,20 +3,17 @@ using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.DecisionEngine.Specifications
{
public class AcceptableSizeSpecification : IDownloadDecisionEngineSpecification
{
private readonly IQualityDefinitionService _qualityDefinitionService;
private readonly IEpisodeService _episodeService;
private readonly Logger _logger;
public AcceptableSizeSpecification(IQualityDefinitionService qualityDefinitionService, IEpisodeService episodeService, Logger logger)
public AcceptableSizeSpecification(IEpisodeService episodeService, Logger logger)
{
_qualityDefinitionService = qualityDefinitionService;
_episodeService = episodeService;
_logger = logger;
}
@ -78,11 +75,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
return DownloadSpecDecision.Reject(DownloadRejectionReason.UnknownRuntime, "Runtime of all episodes is 0, unable to validate size until it is available");
}
var qualityDefinition = _qualityDefinitionService.Get(quality);
var qualityProfile = subject.Series.QualityProfile.Value;
var qualityIndex = qualityProfile.GetIndex(quality, true);
var qualityOrGroup = qualityProfile.Items[qualityIndex.Index];
var item = qualityOrGroup.Quality == null ? qualityOrGroup.Items[qualityIndex.GroupIndex] : qualityOrGroup;
if (qualityDefinition.MinSize.HasValue)
if (item.MinSize.HasValue)
{
var minSize = qualityDefinition.MinSize.Value.Megabytes();
var minSize = item.MinSize.Value.Megabytes();
// Multiply maxSize by runtime of all episodes
minSize *= runtime;
@ -97,13 +97,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
}
}
if (!qualityDefinition.MaxSize.HasValue || qualityDefinition.MaxSize.Value == 0)
if (!item.MaxSize.HasValue || item.MaxSize.Value == 0)
{
_logger.Debug("Max size is unlimited, skipping size check");
}
else
{
var maxSize = qualityDefinition.MaxSize.Value.Megabytes();
var maxSize = item.MaxSize.Value.Megabytes();
// Multiply maxSize by runtime of all episodes
maxSize *= runtime;

11
src/NzbDrone.Core/Localization/Core/en.json
View file

@ -420,6 +420,7 @@
"Donate": "Donate",
"Donations": "Donations",
"DoneEditingGroups": "Done Editing Groups",
"DoneEditingSizes": "Done Editing Sizes",
"DotNetVersion": ".NET",
"Download": "Download",
"DownloadClient": "Download Client",
@ -606,6 +607,7 @@
"EditSelectedSeries": "Edit Selected Series",
"EditSeries": "Edit Series",
"EditSeriesModalHeader": "Edit - {title}",
"EditSizes": "Edit Sizes",
"Enable": "Enable",
"EnableAutomaticAdd": "Enable Automatic Add",
"EnableAutomaticAddSeriesHelpText": "Add series from this list to {appName} when syncs are performed via the UI or by {appName}",
@ -1144,7 +1146,7 @@
"MatchedToEpisodes": "Matched to Episodes",
"MatchedToSeason": "Matched to Season",
"MatchedToSeries": "Matched to Series",
"Max": "Max",
"Maximum": "Maximum",
"MaximumLimits": "Maximum Limits",
"MaximumSingleEpisodeAge": "Maximum Single Episode Age",
"MaximumSingleEpisodeAgeHelpText": "During a full season search only season packs will be allowed when the season's last episode is older than this setting. Standard series only. Use 0 to disable.",
@ -1158,7 +1160,6 @@
"MediaManagementSettingsLoadError": "Unable to load Media Management settings",
"MediaManagementSettingsSummary": "Naming, file management settings and root folders",
"Medium": "Medium",
"MegabytesPerMinute": "Megabytes Per Minute",
"Menu": "Menu",
"Message": "Message",
"Metadata": "Metadata",
@ -1188,7 +1189,7 @@
"MetadataXmbcSettingsSeriesMetadataHelpText": "tvshow.nfo with full series metadata",
"MetadataXmbcSettingsSeriesMetadataUrlHelpText": "Include TheTVDB show URL in tvshow.nfo (can be combined with 'Series Metadata')",
"MidseasonFinale": "Midseason Finale",
"Min": "Min",
"Minimum": "Minimum",
"MinimumAge": "Minimum Age",
"MinimumAgeHelpText": "Usenet only: Minimum age in minutes of NZBs before they are grabbed. Use this to give new releases time to propagate to your usenet provider.",
"MinimumCustomFormatScore": "Minimum Custom Format Score",
@ -1198,6 +1199,8 @@
"MinimumFreeSpace": "Minimum Free Space",
"MinimumFreeSpaceHelpText": "Prevent import if it would leave less than this amount of disk space available",
"MinimumLimits": "Minimum Limits",
"Minute": "minute",
"MinuteShorthand": "m",
"MinutesFortyFive": "45 Minutes: {fortyFive}",
"MinutesSixty": "60 Minutes: {sixty}",
"MinutesThirty": "30 Minutes: {thirty}",
@ -1618,7 +1621,7 @@
"QualityCutoffNotMet": "Quality cutoff has not been met",
"QualityDefinitions": "Quality Definitions",
"QualityDefinitionsLoadError": "Unable to load Quality Definitions",
"QualityLimitsSeriesRuntimeHelpText": "Limits are automatically adjusted for the series runtime and number of episodes in the file.",
"QualityDefinitionsSizeNotice": "Size restrictions have been moved to Quality Profiles",
"QualityProfile": "Quality Profile",
"QualityProfileInUseSeriesListCollection": "Can't delete a quality profile that is attached to a series, list, or collection",
"QualityProfiles": "Quality Profiles",

3
src/NzbDrone.Core/Profiles/Qualities/QualityProfileQualityItem.cs
View file

@ -16,6 +16,9 @@ namespace NzbDrone.Core.Profiles.Qualities
public Quality Quality { get; set; }
public List<QualityProfileQualityItem> Items { get; set; }
public bool Allowed { get; set; }
public double? MinSize { get; set; }
public double? MaxSize { get; set; }
public double? PreferredSize { get; set; }
public QualityProfileQualityItem()
{

36
src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs
View file

@ -21,6 +21,7 @@ namespace NzbDrone.Core.Profiles.Qualities
QualityProfile Get(int id);
bool Exists(int id);
QualityProfile GetDefaultProfile(string name, Quality cutoff = null, params Quality[] allowed);
void UpdateALlSizeLimits(params QualityProfileSizeLimit[] sizeLimits);
}
public class QualityProfileService : IQualityProfileService,
@ -198,7 +199,14 @@ namespace NzbDrone.Core.Profiles.Qualities
{
var quality = group.First().Quality;
items.Add(new QualityProfileQualityItem { Quality = group.First().Quality, Allowed = allowed.Contains(quality) });
items.Add(new QualityProfileQualityItem
{
Quality = group.First().Quality,
Allowed = allowed.Contains(quality),
MinSize = group.First().MinSize,
MaxSize = group.First().MaxSize,
PreferredSize = group.First().PreferredSize
});
continue;
}
@ -211,7 +219,10 @@ namespace NzbDrone.Core.Profiles.Qualities
Items = group.Select(g => new QualityProfileQualityItem
{
Quality = g.Quality,
Allowed = groupAllowed
Allowed = groupAllowed,
MinSize = g.MinSize,
MaxSize = g.MaxSize,
PreferredSize = g.PreferredSize
}).ToList(),
Allowed = groupAllowed
});
@ -244,6 +255,27 @@ namespace NzbDrone.Core.Profiles.Qualities
return qualityProfile;
}
public void UpdateALlSizeLimits(params QualityProfileSizeLimit[] sizeLimits)
{
var all = All();
foreach (var qualityProfile in all)
{
foreach (var sizeLimit in sizeLimits)
{
var qualityIndex = qualityProfile.GetIndex(sizeLimit.Quality, true);
var qualityOrGroup = qualityProfile.Items[qualityIndex.Index];
var item = qualityOrGroup.Quality == null ? qualityOrGroup.Items[qualityIndex.GroupIndex] : qualityOrGroup;
item.MinSize = sizeLimit.MinSize;
item.MaxSize = sizeLimit.MaxSize;
item.PreferredSize = sizeLimit.PreferredSize;
}
}
_qualityProfileRepository.UpdateMany(all);
}
private QualityProfile AddDefaultProfile(string name, Quality cutoff, params Quality[] allowed)
{
var profile = GetDefaultProfile(name, cutoff, allowed);

19
src/NzbDrone.Core/Profiles/Qualities/QualityProfileSizeLimit.cs Normal file
View file

@ -0,0 +1,19 @@
using NzbDrone.Core.Qualities;
namespace NzbDrone.Core.Profiles.Qualities;
public class QualityProfileSizeLimit
{
public Quality Quality { get; set; }
public double? MinSize { get; set; }
public double? MaxSize { get; set; }
public double? PreferredSize { get; set; }
public QualityProfileSizeLimit(QualityDefinition qualityDefinition)
{
Quality = qualityDefinition.Quality;
MinSize = qualityDefinition.MinSize;
MaxSize = qualityDefinition.MaxSize;
PreferredSize = qualityDefinition.PreferredSize;
}
}

2
src/NzbDrone.Core/Qualities/Commands/ResetQualityDefinitionsCommand.cs
View file

@ -1,4 +1,4 @@
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.Qualities.Commands
{

4
src/NzbDrone.Core/Qualities/QualityDefinitionService.cs
View file

@ -47,6 +47,7 @@ namespace NzbDrone.Core.Qualities
public void UpdateMany(List<QualityDefinition> qualityDefinitions)
{
_repo.UpdateMany(qualityDefinitions);
_cache.Clear();
}
public List<QualityDefinition> All()
@ -119,9 +120,6 @@ namespace NzbDrone.Core.Qualities
{
var existing = existingDefinitions.SingleOrDefault(d => d.Quality == definition.Quality);
existing.MinSize = definition.MinSize;
existing.MaxSize = definition.MaxSize;
existing.PreferredSize = definition.PreferredSize;
existing.Title = message.ResetTitles ? definition.Title : existing.Title;
updateList.Add(existing);

13
src/Sonarr.Api.V3/Profiles/Quality/QualityProfileResource.cs
View file

@ -25,6 +25,9 @@ namespace Sonarr.Api.V3.Profiles.Quality
public NzbDrone.Core.Qualities.Quality Quality { get; set; }
public List<QualityProfileQualityItemResource> Items { get; set; }
public bool Allowed { get; set; }
public double? MinSize { get; set; }
public double? MaxSize { get; set; }
public double? PreferredSize { get; set; }
public QualityProfileQualityItemResource()
{
@ -75,7 +78,10 @@ namespace Sonarr.Api.V3.Profiles.Quality
Name = model.Name,
Quality = model.Quality,
Items = model.Items.ConvertAll(ToResource),
Allowed = model.Allowed
Allowed = model.Allowed,
MinSize = model.MinSize,
MaxSize = model.MaxSize,
PreferredSize = model.PreferredSize
};
}
@ -123,7 +129,10 @@ namespace Sonarr.Api.V3.Profiles.Quality
Name = resource.Name,
Quality = resource.Quality != null ? (NzbDrone.Core.Qualities.Quality)resource.Quality.Id : null,
Items = resource.Items.ConvertAll(ToModel),
Allowed = resource.Allowed
Allowed = resource.Allowed,
MinSize = resource.MinSize,
MaxSize = resource.MaxSize,
PreferredSize = resource.PreferredSize
};
}

20
src/Sonarr.Api.V3/Qualities/QualityDefinitionController.cs
View file

@ -3,6 +3,7 @@ using System.Linq;
using Microsoft.AspNetCore.Mvc;
using NzbDrone.Core.Datastore.Events;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Profiles.Qualities;
using NzbDrone.Core.Qualities;
using NzbDrone.SignalR;
using Sonarr.Http;
@ -17,13 +18,16 @@ namespace Sonarr.Api.V3.Qualities
IHandle<CommandExecutedEvent>
{
private readonly IQualityDefinitionService _qualityDefinitionService;
private readonly IQualityProfileService _qualityProfileService;
public QualityDefinitionController(
IQualityDefinitionService qualityDefinitionService,
IQualityProfileService qualityProfileService,
IBroadcastSignalRMessage signalRBroadcaster)
: base(signalRBroadcaster)
{
_qualityDefinitionService = qualityDefinitionService;
_qualityProfileService = qualityProfileService;
SharedValidator.RuleFor(c => c)
.SetValidator(new QualityDefinitionResourceValidator());
@ -34,6 +38,12 @@ namespace Sonarr.Api.V3.Qualities
{
var model = resource.ToModel();
_qualityDefinitionService.Update(model);
if (model.MinSize.HasValue || model.MaxSize.HasValue || model.PreferredSize.HasValue)
{
_qualityProfileService.UpdateALlSizeLimits(new QualityProfileSizeLimit(model));
}
return Accepted(model.Id);
}
@ -56,6 +66,16 @@ namespace Sonarr.Api.V3.Qualities
_qualityDefinitionService.UpdateMany(qualityDefinitions);
var toUpdate = qualityDefinitions
.Where(q => q.MinSize.HasValue || q.MaxSize.HasValue || q.PreferredSize.HasValue)
.Select(q => new QualityProfileSizeLimit(q))
.ToArray();
if (toUpdate.Any())
{
_qualityProfileService.UpdateALlSizeLimits(toUpdate);
}
return Accepted(_qualityDefinitionService.All()
.ToResource());
}

6
src/Sonarr.Api.V3/Qualities/QualityDefinitionResource.cs
View file

@ -8,11 +8,7 @@ namespace Sonarr.Api.V3.Qualities
public class QualityDefinitionResource : RestResource
{
public Quality Quality { get; set; }
public string Title { get; set; }
public int Weight { get; set; }
public double? MinSize { get; set; }
public double? MaxSize { get; set; }
public double? PreferredSize { get; set; }
@ -32,7 +28,6 @@ namespace Sonarr.Api.V3.Qualities
Id = model.Id,
Quality = model.Quality,
Title = model.Title,
Weight = model.Weight,
MinSize = model.MinSize,
MaxSize = model.MaxSize,
PreferredSize = model.PreferredSize
@ -51,7 +46,6 @@ namespace Sonarr.Api.V3.Qualities
Id = resource.Id,
Quality = resource.Quality,
Title = resource.Title,
Weight = resource.Weight,
MinSize = resource.MinSize,
MaxSize = resource.MaxSize,
PreferredSize = resource.PreferredSize

7
yarn.lock
View file

@ -1465,6 +1465,13 @@
"@types/history" "^4.7.11"
"@types/react" "*"
"@types/react-slider@1.3.6":
version "1.3.6"
resolved "https://registry.yarnpkg.com/@types/react-slider/-/react-slider-1.3.6.tgz#6f5602be93ab1cb3d273428c87aa227ad2ff68ff"
integrity sha512-RS8XN5O159YQ6tu3tGZIQz1/9StMLTg/FCIPxwqh2gwVixJnlfIodtVx+fpXVMZHe7A58lAX1Q4XTgAGOQaCQg==
dependencies:
"@types/react" "*"
"@types/react-text-truncate@0.19.0":
version "0.19.0"
resolved "https://registry.yarnpkg.com/@types/react-text-truncate/-/react-text-truncate-0.19.0.tgz#322dd718dcbe1267a9d1279f8ac4dc844c322a13"