Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-19 17:32:38 +01:00
Code Issues Releases Wiki Activity

New: Trakt ratings

Browse Source
This commit is contained in:
Bogdan 2024-09-23 10:18:45 +03:00
parent b8f1286abb
commit f735e31835
33 changed files with 317 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/App/State/MoviesAppState.ts
View File

@ -27,6 +27,7 @@ export interface MovieIndexAppState {
showTmdbRating: boolean;
showImdbRating: boolean;
showRottenTomatoesRating: boolean;
showTraktRating: boolean;
showTags: boolean;
showSearchAction: boolean;
};

5
frontend/src/Components/TraktRating.css Normal file
View File

@ -0,0 +1,5 @@
.image {
align-content: center;
margin-right: 5px;
vertical-align: -0.125em;
}

7
frontend/src/Components/TraktRating.css.d.ts vendored Normal file
View File

@ -0,0 +1,7 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
'image': string;
}
export const cssExports: CssExports;
export default cssExports;

46
frontend/src/Components/TraktRating.tsx Normal file
View File

@ -0,0 +1,46 @@
import React from 'react';
import Tooltip from 'Components/Tooltip/Tooltip';
import { kinds, tooltipPositions } from 'Helpers/Props';
import { Ratings } from 'Movie/Movie';
import translate from 'Utilities/String/translate';
import styles from './TraktRating.css';
interface TraktRatingProps {
ratings: Ratings;
iconSize?: number;
hideIcon?: boolean;
}
function TraktRating(props: TraktRatingProps) {
const { ratings, iconSize = 14, hideIcon = false } = props;
const traktImage =
'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTguMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiAgICAgdmlld0JveD0iMCAwIDE0NC44IDE0NC44IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNDQuOCAxNDQuOCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PGc+ICAgIDxwYXRoIGZpbGw9IiNFRDIyMjQiIGQ9Ik0yOS41LDExMS44YzEwLjYsMTEuNiwyNS45LDE4LjgsNDIuOSwxOC44YzguNywwLDE2LjktMS45LDI0LjMtNS4zTDU2LjMsODVMMjkuNSwxMTEuOHoiLz4gICAgPHBhdGggZmlsbD0iI0VEMjIyNCIgZD0iTTU2LjEsNjAuNkwyNS41LDkxLjFMMjEuNCw4N2wzMi4yLTMyLjJoMGwzNy42LTM3LjZjLTUuOS0yLTEyLjItMy4xLTE4LjgtMy4xYy0zMi4yLDAtNTguMywyNi4xLTU4LjMsNTguMyAgICAgICBjMCwxMy4xLDQuMywyNS4yLDExLjcsMzVsMzAuNS0zMC41bDIuMSwybDQzLjcsNDMuN2MwLjktMC41LDEuNy0xLDIuNS0xLjZMNTYuMyw3Mi43TDI3LDEwMmwtNC4xLTQuMWwzMy40LTMzLjRsMi4xLDJsNTEsNTAuOSAgICAgICBjMC44LTAuNiwxLjUtMS4zLDIuMi0xLjlsLTU1LTU1TDU2LjEsNjAuNnoiLz4gICAgPHBhdGggZmlsbD0iI0VEMUMyNCIgZD0iTTExNS43LDExMS40YzkuMy0xMC4zLDE1LTI0LDE1LTM5YzAtMjMuNC0xMy44LTQzLjUtMzMuNi01Mi44TDYwLjQsNTYuMkwxMTUuNywxMTEuNHogTTc0LjUsNjYuOGwtNC4xLTQuMSAgICAgICBsMjguOS0yOC45bDQuMSw0LjFMNzQuNSw2Ni44eiBNMTAxLjksMjcuMUw2OC42LDYwLjRsLTQuMS00LjFMOTcuOCwyM0wxMDEuOSwyNy4xeiIvPiAgICA8Zz4gICAgICAgPGc+ICAgICAgICAgIDxwYXRoIGZpbGw9IiNFRDIyMjQiIGQ9Ik03Mi40LDE0NC44QzMyLjUsMTQ0LjgsMCwxMTIuMywwLDcyLjRDMCwzMi41LDMyLjUsMCw3Mi40LDBzNzIuNCwzMi41LDcyLjQsNzIuNCAgICAgICAgICAgICBDMTQ0LjgsMTEyLjMsMTEyLjMsMTQ0LjgsNzIuNCwxNDQuOHogTTcyLjQsNy4zQzM2LjUsNy4zLDcuMywzNi41LDcuMyw3Mi40czI5LjIsNjUuMSw2NS4xLDY1LjFzNjUuMS0yOS4yLDY1LjEtNjUuMSAgICAgICAgICAgICBTMTA4LjMsNy4zLDcyLjQsNy4zeiIvPiAgICAgICA8L2c+ICAgIDwvZz48L2c+PC9zdmc+';
const { value = 0, votes = 0 } = ratings.trakt;
return (
<Tooltip
anchor={
<span>
{!hideIcon && (
<img
className={styles.image}
alt={translate('TraktRating')}
src={traktImage}
style={{
height: `${iconSize}px`,
}}
/>
)}
{(value * 10).toFixed()}%
</span>
}
tooltip={translate('CountVotes', { votes })}
kind={kinds.INVERSE}
position={tooltipPositions.TOP}
/>
);
}
export default TraktRating;

9
frontend/src/DiscoverMovie/Menus/DiscoverMovieSortMenu.js
View File

@ -110,6 +110,15 @@ function DiscoverMovieSortMenu(props) {
{translate('RottenTomatoesRating')}
</SortMenuItem>
<SortMenuItem
name="traktRating"
sortKey={sortKey}
sortDirection={sortDirection}
onPress={onSortSelect}
>
{translate('TraktRating')}
</SortMenuItem>
<SortMenuItem
name="certification"
sortKey={sortKey}

10
frontend/src/DiscoverMovie/Posters/DiscoverMoviePoster.js
View File

@ -9,6 +9,7 @@ import Link from 'Components/Link/Link';
import RottenTomatoRating from 'Components/RottenTomatoRating';
import TmdbRating from 'Components/TmdbRating';
import Popover from 'Components/Tooltip/Popover';
import TraktRating from 'Components/TraktRating';
import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal';
import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal';
import { icons } from 'Helpers/Props';
@ -92,6 +93,7 @@ class DiscoverMoviePoster extends Component {
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
ratings,
isExisting,
isExcluded,
@ -223,6 +225,12 @@ class DiscoverMoviePoster extends Component {
</div>
) : null}
{showTraktRating && !!ratings.trakt ? (
<div className={styles.title}>
<TraktRating ratings={ratings} iconSize={12} />
</div>
) : null}
<DiscoverMoviePosterInfo
showRelativeDates={showRelativeDates}
shortDateFormat={shortDateFormat}
@ -232,6 +240,7 @@ class DiscoverMoviePoster extends Component {
showTmdbRating={showTmdbRating}
showImdbRating={showImdbRating}
showRottenTomatoesRating={showRottenTomatoesRating}
showTraktRating={showTraktRating}
{...otherProps}
/>
@ -274,6 +283,7 @@ DiscoverMoviePoster.propTypes = {
showTmdbRating: PropTypes.bool.isRequired,
showImdbRating: PropTypes.bool.isRequired,
showRottenTomatoesRating: PropTypes.bool.isRequired,
showTraktRating: PropTypes.bool.isRequired,
ratings: PropTypes.object.isRequired,
showRelativeDates: PropTypes.bool.isRequired,
shortDateFormat: PropTypes.string.isRequired,

15
frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js
View File

@ -4,6 +4,7 @@ import Icon from 'Components/Icon';
import ImdbRating from 'Components/ImdbRating';
import RottenTomatoRating from 'Components/RottenTomatoRating';
import TmdbRating from 'Components/TmdbRating';
import TraktRating from 'Components/TraktRating';
import { icons } from 'Helpers/Props';
import getMovieStatusDetails from 'Movie/getMovieStatusDetails';
import formatRuntime from 'Utilities/Date/formatRuntime';
@ -28,7 +29,8 @@ function DiscoverMoviePosterInfo(props) {
movieRuntimeFormat,
showTmdbRating,
showImdbRating,
showRottenTomatoesRating
showRottenTomatoesRating,
showTraktRating
} = props;
if (sortKey === 'status' && status) {
@ -141,6 +143,14 @@ function DiscoverMoviePosterInfo(props) {
);
}
if (!showTraktRating && sortKey === 'traktRating' && !!ratings.trakt) {
return (
<div className={styles.info}>
<TraktRating ratings={ratings} iconSize={12} />
</div>
);
}
return null;
}
@ -160,7 +170,8 @@ DiscoverMoviePosterInfo.propTypes = {
movieRuntimeFormat: PropTypes.string.isRequired,
showTmdbRating: PropTypes.bool.isRequired,
showImdbRating: PropTypes.bool.isRequired,
showRottenTomatoesRating: PropTypes.bool.isRequired
showRottenTomatoesRating: PropTypes.bool.isRequired,
showTraktRating: PropTypes.bool.isRequired
};
export default DiscoverMoviePosterInfo;

16
frontend/src/DiscoverMovie/Posters/DiscoverMoviePosters.js
View File

@ -39,7 +39,8 @@ function calculateRowHeight(posterHeight, sortKey, isSmallScreen, posterOptions)
showTitle,
showTmdbRating,
showImdbRating,
showRottenTomatoesRating
showRottenTomatoesRating,
showTraktRating
} = posterOptions;
const heights = [
@ -64,6 +65,10 @@ function calculateRowHeight(posterHeight, sortKey, isSmallScreen, posterOptions)
heights.push(19);
}
if (showTraktRating) {
heights.push(19);
}
switch (sortKey) {
case 'studio':
case 'inCinemas':
@ -88,6 +93,11 @@ function calculateRowHeight(posterHeight, sortKey, isSmallScreen, posterOptions)
heights.push(19);
}
break;
case 'traktRating':
if (!showTraktRating) {
heights.push(19);
}
break;
default:
// No need to add a height of 0
}
@ -219,7 +229,8 @@ class DiscoverMoviePosters extends Component {
showTitle,
showTmdbRating,
showImdbRating,
showRottenTomatoesRating
showRottenTomatoesRating,
showTraktRating
} = posterOptions;
const movieIdx = rowIndex * columnCount + columnIndex;
@ -248,6 +259,7 @@ class DiscoverMoviePosters extends Component {
showTmdbRating={showTmdbRating}
showImdbRating={showImdbRating}
showRottenTomatoesRating={showRottenTomatoesRating}
showTraktRating={showTraktRating}
showRelativeDates={showRelativeDates}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}

20
frontend/src/DiscoverMovie/Posters/Options/DiscoverMoviePosterOptionsModalContent.js
View File

@ -48,6 +48,7 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
showTmdbRating: props.showTmdbRating,
showImdbRating: props.showImdbRating,
showRottenTomatoesRating: props.showRottenTomatoesRating,
showTraktRating: props.showTraktRating,
includeRecommendations: props.includeRecommendations,
includeTrending: props.includeTrending,
includePopular: props.includePopular
@ -61,6 +62,7 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
includeRecommendations,
includeTrending,
includePopular
@ -88,6 +90,10 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
state.showRottenTomatoesRating = showRottenTomatoesRating;
}
if (showTraktRating !== prevProps.showTraktRating) {
state.showTraktRating = showTraktRating;
}
if (includeRecommendations !== prevProps.includeRecommendations) {
state.includeRecommendations = includeRecommendations;
}
@ -140,6 +146,7 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
includeRecommendations,
includeTrending,
includePopular
@ -248,6 +255,18 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
onChange={this.onChangePosterOption}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('ShowTraktRating')}</FormLabel>
<FormInputGroup
type={inputTypes.CHECK}
name="showTraktRating"
value={showTraktRating}
helpText={translate('ShowTraktRatingPosterHelpText')}
onChange={this.onChangePosterOption}
/>
</FormGroup>
</Form>
</ModalBody>
@ -269,6 +288,7 @@ DiscoverMoviePosterOptionsModalContent.propTypes = {
showTmdbRating: PropTypes.bool.isRequired,
showImdbRating: PropTypes.bool.isRequired,
showRottenTomatoesRating: PropTypes.bool.isRequired,
showTraktRating: PropTypes.bool.isRequired,
includeRecommendations: PropTypes.bool.isRequired,
includeTrending: PropTypes.bool.isRequired,
includePopular: PropTypes.bool.isRequired,

1
frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css
View File

@ -35,6 +35,7 @@
.tmdbRating,
.imdbRating,
.rottenTomatoesRating,
.traktRating,
.runtime {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

1
frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css.d.ts vendored
View File

@ -21,6 +21,7 @@ interface CssExports {
'status': string;
'studio': string;
'tmdbRating': string;
'traktRating': string;
}
export const cssExports: CssExports;
export default cssExports;

1
frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css
View File

@ -60,6 +60,7 @@
.tmdbRating,
.imdbRating,
.rottenTomatoesRating,
.traktRating,
.runtime {
composes: cell;

1
frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css.d.ts vendored
View File

@ -27,6 +27,7 @@ interface CssExports {
'statusIcon': string;
'studio': string;
'tmdbRating': string;
'traktRating': string;
}
export const cssExports: CssExports;
export default cssExports;

12
frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
View File

@ -11,6 +11,7 @@ import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
import TmdbRating from 'Components/TmdbRating';
import Popover from 'Components/Tooltip/Popover';
import TraktRating from 'Components/TraktRating';
import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal';
import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal';
import { icons } from 'Helpers/Props';
@ -291,6 +292,17 @@ class DiscoverMovieRow extends Component {
);
}
if (name === 'traktRating') {
return (
<VirtualTableRowCell
key={name}
className={styles[name]}
>
{ratings.trakt ? <TraktRating ratings={ratings} /> : null}
</VirtualTableRowCell>
);
}
if (name === 'popularity') {
return (
<VirtualTableRowCell key={name} className={styles[name]}>

26
frontend/src/Movie/Details/MovieDetails.js
View File

@ -20,6 +20,7 @@ import RottenTomatoRating from 'Components/RottenTomatoRating';
import TmdbRating from 'Components/TmdbRating';
import Popover from 'Components/Tooltip/Popover';
import Tooltip from 'Components/Tooltip/Tooltip';
import TraktRating from 'Components/TraktRating';
import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
@ -497,31 +498,44 @@ class MovieDetails extends Component {
<div className={styles.details}>
{
!!ratings.tmdb &&
ratings.tmdb ?
<span className={styles.rating}>
<TmdbRating
ratings={ratings}
iconSize={20}
/>
</span>
</span> :
null
}
{
!!ratings.imdb &&
ratings.imdb ?
<span className={styles.rating}>
<ImdbRating
ratings={ratings}
iconSize={20}
/>
</span>
</span> :
null
}
{
!!ratings.rottenTomatoes &&
ratings.rottenTomatoes ?
<span className={styles.rating}>
<RottenTomatoRating
ratings={ratings}
iconSize={20}
/>
</span>
</span> :
null
}
{
ratings.trakt ?
<span className={styles.rating}>
<TraktRating
ratings={ratings}
iconSize={20}
/>
</span> :
null
}
</div>

9
frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
View File

@ -136,6 +136,15 @@ function MovieIndexSortMenu(props: MovieIndexSortMenuProps) {
{translate('RottenTomatoesRating')}
</SortMenuItem>
<SortMenuItem
name="traktRating"
sortKey={sortKey}
sortDirection={sortDirection}
onPress={onSortSelect}
>
{translate('TraktRating')}
</SortMenuItem>
<SortMenuItem
name="popularity"
sortKey={sortKey}

9
frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx
View File

@ -11,6 +11,7 @@ import RottenTomatoRating from 'Components/RottenTomatoRating';
import TagListConnector from 'Components/TagListConnector';
import TmdbRating from 'Components/TmdbRating';
import Popover from 'Components/Tooltip/Popover';
import TraktRating from 'Components/TraktRating';
import { icons } from 'Helpers/Props';
import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
@ -54,6 +55,7 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
showTags,
showSearchAction,
} = useSelector(selectPosterOptions);
@ -310,6 +312,12 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
</div>
) : null}
{showTraktRating && !!ratings.trakt ? (
<div className={styles.title}>
<TraktRating ratings={ratings} iconSize={12} />
</div>
) : null}
{showTags && tags.length ? (
<div className={styles.tags}>
<div className={styles.tagsList}>
@ -347,6 +355,7 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
showTmdbRating={showTmdbRating}
showImdbRating={showImdbRating}
showRottenTomatoesRating={showRottenTomatoesRating}
showTraktRating={showTraktRating}
showTags={showTags}
/>

11
frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx
View File

@ -4,6 +4,7 @@ import ImdbRating from 'Components/ImdbRating';
import RottenTomatoRating from 'Components/RottenTomatoRating';
import TagListConnector from 'Components/TagListConnector';
import TmdbRating from 'Components/TmdbRating';
import TraktRating from 'Components/TraktRating';
import { icons } from 'Helpers/Props';
import Language from 'Language/Language';
import { Ratings } from 'Movie/Movie';
@ -43,6 +44,7 @@ interface MovieIndexPosterInfoProps {
showTmdbRating: boolean;
showImdbRating: boolean;
showRottenTomatoesRating: boolean;
showTraktRating: boolean;
showTags: boolean;
}
@ -76,6 +78,7 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
showTags,
} = props;
@ -221,6 +224,14 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
);
}
if (!showTraktRating && sortKey === 'traktRating' && !!ratings.trakt) {
return (
<div className={styles.info}>
<TraktRating ratings={ratings} iconSize={12} />
</div>
);
}
if (!showTags && sortKey === 'tags' && tags.length) {
return (
<div className={styles.tags}>

10
frontend/src/Movie/Index/Posters/MovieIndexPosters.tsx
View File

@ -150,6 +150,7 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
showTags,
} = posterOptions;
@ -199,6 +200,10 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
heights.push(19);
}
if (showTraktRating) {
heights.push(19);
}
if (showTags) {
heights.push(21);
}
@ -253,6 +258,11 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
heights.push(19);
}
break;
case 'traktRating':
if (!showTraktRating) {
heights.push(19);
}
break;
case 'tags':
if (!showTags) {
heights.push(21);

13
frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.tsx
View File

@ -59,6 +59,7 @@ function MovieIndexPosterOptionsModalContent(
showTmdbRating,
showImdbRating,
showRottenTomatoesRating,
showTraktRating,
showTags,
showSearchAction,
} = posterOptions;
@ -222,6 +223,18 @@ function MovieIndexPosterOptionsModalContent(
/>
</FormGroup>
<FormGroup size={sizes.MEDIUM}>
<FormLabel>{translate('ShowTraktRating')}</FormLabel>
<FormInputGroup
type={inputTypes.CHECK}
name="showTraktRating"
value={showTraktRating}
helpText={translate('ShowTraktRatingPosterHelpText')}
onChange={onPosterOptionChange}
/>
</FormGroup>
<FormGroup size={sizes.MEDIUM}>
<FormLabel>{translate('ShowTags')}</FormLabel>

3
frontend/src/Movie/Index/Table/MovieIndexRow.css
View File

@ -92,7 +92,8 @@
.imdbRating,
.tmdbRating,
.rottenTomatoesRating {
.rottenTomatoesRating,
.traktRating {
composes: cell;
flex: 0 0 80px;

1
frontend/src/Movie/Index/Table/MovieIndexRow.css.d.ts vendored
View File

@ -30,6 +30,7 @@ interface CssExports {
'studio': string;
'tags': string;
'tmdbRating': string;
'traktRating': string;
'year': string;
}
export const cssExports: CssExports;

9
frontend/src/Movie/Index/Table/MovieIndexRow.tsx
View File

@ -14,6 +14,7 @@ import Column from 'Components/Table/Column';
import TagListConnector from 'Components/TagListConnector';
import TmdbRating from 'Components/TmdbRating';
import Tooltip from 'Components/Tooltip/Tooltip';
import TraktRating from 'Components/TraktRating';
import { icons, kinds } from 'Helpers/Props';
import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
@ -387,6 +388,14 @@ function MovieIndexRow(props: MovieIndexRowProps) {
);
}
if (name === 'traktRating') {
return (
<VirtualTableRowCell key={name} className={styles[name]}>
{ratings.trakt ? <TraktRating ratings={ratings} /> : null}
</VirtualTableRowCell>
);
}
if (name === 'popularity') {
return (
<VirtualTableRowCell key={name} className={styles[name]}>

3
frontend/src/Movie/Index/Table/MovieIndexTableHeader.css
View File

@ -82,7 +82,8 @@
.imdbRating,
.tmdbRating,
.rottenTomatoesRating {
.rottenTomatoesRating,
.traktRating {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
flex: 0 0 80px;

1
frontend/src/Movie/Index/Table/MovieIndexTableHeader.css.d.ts vendored
View File

@ -27,6 +27,7 @@ interface CssExports {
'studio': string;
'tags': string;
'tmdbRating': string;
'traktRating': string;
'year': string;
}
export const cssExports: CssExports;

1
frontend/src/Movie/Movie.ts
View File

@ -37,6 +37,7 @@ export interface Ratings {
tmdb: RatingValues;
metacritic: RatingValues;
rottenTomatoes: RatingValues;
trakt: RatingValues;
}
export interface AlternativeTitle extends ModelBase {

23
frontend/src/Store/Actions/discoverMovieActions.js
View File

@ -61,7 +61,8 @@ export const defaultState = {
showTitle: false,
showTmdbRating: false,
showImdbRating: false,
showRottenTomatoesRating: false
showRottenTomatoesRating: false,
showTraktRating: false
},
overviewOptions: {
@ -180,6 +181,12 @@ export const defaultState = {
isSortable: true,
isVisible: false
},
{
name: 'traktRating',
label: () => translate('TraktRating'),
isSortable: true,
isVisible: false
},
{
name: 'popularity',
label: () => translate('Popularity'),
@ -293,6 +300,10 @@ export const defaultState = {
rottenTomatoesRating: function({ ratings = {} }) {
return ratings.rottenTomatoes ? ratings.rottenTomatoes.value : -1;
},
traktRating: function({ ratings = {} }) {
return ratings.trakt ? ratings.trakt.value : 0;
}
},
@ -482,6 +493,16 @@ export const defaultState = {
label: () => translate('ImdbVotes'),
type: filterBuilderTypes.NUMBER
},
{
name: 'traktRating',
label: () => translate('TraktRating'),
type: filterBuilderTypes.NUMBER
},
{
name: 'traktVotes',
label: () => translate('TraktVotes'),
type: filterBuilderTypes.NUMBER
},
{
name: 'popularity',
label: () => translate('Popularity'),

36
frontend/src/Store/Actions/movieActions.js
View File

@ -156,42 +156,58 @@ export const filterPredicates = {
return dateFilterPredicate(item.digitalRelease, filterValue, type);
},
tmdbRating: function(item, filterValue, type) {
tmdbRating: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = item.ratings.tmdb ? item.ratings.tmdb.value : 0;
const rating = ratings.tmdb ? ratings.tmdb.value : 0;
return predicate(rating * 10, filterValue);
},
tmdbVotes: function(item, filterValue, type) {
tmdbVotes: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = item.ratings.tmdb ? item.ratings.tmdb.votes : 0;
const rating = ratings.tmdb ? ratings.tmdb.votes : 0;
return predicate(rating, filterValue);
},
imdbRating: function(item, filterValue, type) {
imdbRating: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = item.ratings.imdb ? item.ratings.imdb.value : 0;
const rating = ratings.imdb ? ratings.imdb.value : 0;
return predicate(rating, filterValue);
},
rottenTomatoesRating: function(item, filterValue, type) {
imdbVotes: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = item.ratings.rottenTomatoes ? item.ratings.rottenTomatoes.value : 0;
const rating = ratings.imdb ? ratings.imdb.votes : 0;
return predicate(rating, filterValue);
},
imdbVotes: function(item, filterValue, type) {
rottenTomatoesRating: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = item.ratings.imdb ? item.ratings.imdb.votes : 0;
const rating = ratings.rottenTomatoes ? ratings.rottenTomatoes.value : 0;
return predicate(rating, filterValue);
},
traktRating: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = ratings.trakt ? ratings.trakt.value : 0;
return predicate(rating * 10, filterValue);
},
traktVotes: function({ ratings = {} }, filterValue, type) {
const predicate = filterTypePredicates[type];
const rating = ratings.trakt ? ratings.trakt.votes : 0;
return predicate(rating, filterValue);
},

27
frontend/src/Store/Actions/movieIndexActions.js
View File

@ -40,6 +40,7 @@ export const defaultState = {
showTmdbRating: false,
showImdbRating: false,
showRottenTomatoesRating: false,
showTraktRating: false,
showTags: false,
showSearchAction: false
},
@ -158,7 +159,7 @@ export const defaultState = {
},
{
name: 'minimumAvailability',
label: () => translate('MinAvailability'),
label: () => translate('MinimumAvailability'),
isSortable: true,
isVisible: false
},
@ -204,6 +205,12 @@ export const defaultState = {
isSortable: true,
isVisible: false
},
{
name: 'traktRating',
label: () => translate('TraktRating'),
isSortable: true,
isVisible: false
},
{
name: 'popularity',
label: () => translate('Popularity'),
@ -278,6 +285,10 @@ export const defaultState = {
rottenTomatoesRating: function({ ratings = {} }) {
return ratings.rottenTomatoes ? ratings.rottenTomatoes.value : -1;
},
traktRating: function({ ratings = {} }) {
return ratings.trakt ? ratings.trakt.value : 0;
}
},
@ -492,14 +503,24 @@ export const defaultState = {
type: filterBuilderTypes.NUMBER,
numberFractionDigits: 1
},
{
name: 'imdbVotes',
label: () => translate('ImdbVotes'),
type: filterBuilderTypes.NUMBER
},
{
name: 'rottenTomatoesRating',
label: () => translate('RottenTomatoesRating'),
type: filterBuilderTypes.NUMBER
},
{
name: 'imdbVotes',
label: () => translate('ImdbVotes'),
name: 'traktRating',
label: () => translate('TraktRating'),
type: filterBuilderTypes.NUMBER
},
{
name: 'traktVotes',
label: () => translate('TraktVotes'),
type: filterBuilderTypes.NUMBER
},
{

4
src/NzbDrone.Core/Localization/Core/en.json
View File

@ -1616,6 +1616,8 @@
"ShowTitleHelpText": "Show movie title under poster",
"ShowTmdbRating": "Show TMDb Rating",
"ShowTmdbRatingHelpText": "Show TMDb rating under poster",
"ShowTraktRating": "Show Trakt Rating",
"ShowTraktRatingPosterHelpText": "Show Trakt rating under poster",
"ShowUnknownMovieItems": "Show Unknown Movie Items",
"ShowUnknownMovieItemsHelpText": "Show items without a movie in the queue. This could include removed movies or anything else in {appName}'s category",
"ShowYear": "Show Year",
@ -1731,6 +1733,8 @@
"Trace": "Trace",
"Trailer": "Trailer",
"Trakt": "Trakt",
"TraktRating": "Trakt Rating",
"TraktVotes": "Trakt Votes",
"Trending": "Trending",
"Trigger": "Trigger",
"True": "True",

1
src/NzbDrone.Core/MetadataSource/SkyHook/Resource/RatingResource.cs
View File

@ -6,6 +6,7 @@ public class RatingResource
public RatingItem Imdb { get; set; }
public RatingItem Metacritic { get; set; }
public RatingItem RottenTomatoes { get; set; }
public RatingItem Trakt { get; set; }
}
public class RatingItem

10
src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
View File

@ -670,6 +670,16 @@ private static Ratings MapRatings(RatingResource ratings)
};
}
if (ratings.Trakt != null)
{
mappedRatings.Trakt = new RatingChild
{
Type = (RatingType)Enum.Parse(typeof(RatingType), ratings.Trakt.Type),
Value = ratings.Trakt.Value,
Votes = ratings.Trakt.Count
};
}
return mappedRatings;
}

1
src/NzbDrone.Core/Movies/Ratings.cs
View File

@ -9,6 +9,7 @@ public class Ratings : MemberwiseEquatable<Ratings>, IEmbeddedDocument
public RatingChild Tmdb { get; set; }
public RatingChild Metacritic { get; set; }
public RatingChild RottenTomatoes { get; set; }
public RatingChild Trakt { get; set; }
}
public class RatingChild