Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-12-09 18:03:07 +01:00
Code Issues Projects Releases Wiki Activity

New: Original Language and Title sort and filter options

Browse source 
Fixes #7019
Fixes #5438
This commit is contained in:
Qstick 2022-03-06 18:47:45 -06:00
parent ccd561eb24
commit ff7f95a0ab
8 changed files with 102 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js
View file

@ -136,6 +136,24 @@ function MovieIndexSortMenu(props) {
>
{translate('Certification')}
</SortMenuItem>
<SortMenuItem
name="originalTitle"
sortKey={sortKey}
sortDirection={sortDirection}
onPress={onSortSelect}
>
{translate('OriginalTitle')}
</SortMenuItem>
<SortMenuItem
name="originalLanguage"
sortKey={sortKey}
sortDirection={sortDirection}
onPress={onSortSelect}
>
{translate('OriginalLanguage')}
</SortMenuItem>
</MenuContent>
</SortMenu>
);

2
frontend/src/Movie/Index/Table/MovieIndexHeader.css
View file

@ -5,6 +5,7 @@
}
.collection,
.originalTitle,
.sortTitle {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
@ -23,6 +24,7 @@
flex: 2 0 90px;
}
.originalLanguage,
.qualityProfileId {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

2
frontend/src/Movie/Index/Table/MovieIndexRow.css
View file

@ -12,6 +12,7 @@
}
.collection,
.originalTitle,
.sortTitle {
composes: cell;
@ -30,6 +31,7 @@
flex: 2 0 90px;
}
.originalLanguage,
.qualityProfileId {
composes: cell;

26
frontend/src/Movie/Index/Table/MovieIndexRow.js
View file

@ -80,6 +80,8 @@ class MovieIndexRow extends Component {
year,
inCinemas,
physicalRelease,
originalLanguage,
originalTitle,
digitalRelease,
runtime,
minimumAvailability,
@ -184,6 +186,28 @@ class MovieIndexRow extends Component {
);
}
if (name === 'originalLanguage') {
return (
<VirtualTableRowCell
key={name}
className={styles[name]}
>
{originalLanguage.name}
</VirtualTableRowCell>
);
}
if (name === 'originalTitle') {
return (
<VirtualTableRowCell
key={name}
className={styles[name]}
>
{originalTitle}
</VirtualTableRowCell>
);
}
if (name === 'qualityProfileId') {
return (
<VirtualTableRowCell
@ -442,6 +466,8 @@ MovieIndexRow.propTypes = {
status: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
titleSlug: PropTypes.string.isRequired,
originalTitle: PropTypes.string.isRequired,
originalLanguage: PropTypes.object.isRequired,
studio: PropTypes.string,
collection: PropTypes.object,
qualityProfile: PropTypes.object.isRequired,

7
frontend/src/Store/Actions/movieActions.js
View file

@ -119,6 +119,13 @@ export const filterPredicates = {
return predicate(collection ? collection.name : '', filterValue);
},
originalLanguage: function(item, filterValue, type) {
const predicate = filterTypePredicates[type];
const { originalLanguage } = item;
return predicate(originalLanguage ? originalLanguage.name : '', filterValue);
},
inCinemas: function(item, filterValue, type) {
return dateFilterPredicate(item.inCinemas, filterValue, type);
},

42
frontend/src/Store/Actions/movieIndexActions.js
View file

@ -81,6 +81,12 @@ export const defaultState = {
isVisible: true,
isModifiable: false
},
{
name: 'originalTitle',
label: translate('OriginalTitle'),
isSortable: true,
isVisible: false
},
{
name: 'collection',
label: translate('Collection'),
@ -99,6 +105,12 @@ export const defaultState = {
isSortable: true,
isVisible: true
},
{
name: 'originalLanguage',
label: translate('OriginalLanguage'),
isSortable: true,
isVisible: false
},
{
name: 'added',
label: translate('Added'),
@ -206,6 +218,12 @@ export const defaultState = {
return collection.name;
},
originalLanguage: function(item) {
const { originalLanguage ={} } = item;
return originalLanguage.name;
},
ratings: function(item) {
const { ratings = {} } = item;
@ -242,6 +260,30 @@ export const defaultState = {
label: translate('Title'),
type: filterBuilderTypes.STRING
},
{
name: 'originalTitle',
label: translate('OriginalTitle'),
type: filterBuilderTypes.STRING
},
{
name: 'originalLanguage',
label: translate('OriginalLanguage'),
type: filterBuilderTypes.EXACT,
optionsSelector: function(items) {
const collectionList = items.reduce((acc, movie) => {
if (movie.originalLanguage) {
acc.push({
id: movie.originalLanguage.name,
name: movie.originalLanguage.name
});
}
return acc;
}, []);
return collectionList.sort(sortByName);
}
},
{
name: 'status',
label: translate('ReleaseStatus'),

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

@ -645,6 +645,8 @@
"OpenThisModal": "Open This Modal",
"Options": "Options",
"Organize": "Organize",
"OriginalTitle": "Original Title",
"OriginalLanguage": "Original Language",
"OrganizeAndRename": "Organize & Rename",
"OrganizeConfirm": "Are you sure you want to organize all files in the {0} selected movie(s)?",
"OrganizeModalAllPathsRelative": "All paths are relative to:",

3
src/Radarr.Api.V3/Movies/MovieResource.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using NzbDrone.Core.DecisionEngine.Specifications;
using NzbDrone.Core.Languages;
using NzbDrone.Core.MediaCover;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Movies.Translations;
@ -26,6 +27,7 @@ public MovieResource()
//View Only
public string Title { get; set; }
public string OriginalTitle { get; set; }
public Language OriginalLanguage { get; set; }
public List<AlternativeTitleResource> AlternateTitles { get; set; }
public int? SecondaryYear { get; set; }
public int SecondaryYearSourceId { get; set; }
@ -96,6 +98,7 @@ public static MovieResource ToResource(this Movie model, int availDelay, MovieTr
TmdbId = model.TmdbId,
Title = translatedTitle,
OriginalTitle = model.OriginalTitle,
OriginalLanguage = model.OriginalLanguage,
SortTitle = translatedTitle.NormalizeTitle(),
InCinemas = model.InCinemas,
PhysicalRelease = model.PhysicalRelease,