parent
c331c8bd11
commit
e1b937e8d5
|
@ -21,6 +21,7 @@ function createCleanSeriesSelector() {
|
||||||
tvdbId,
|
tvdbId,
|
||||||
tvMazeId,
|
tvMazeId,
|
||||||
imdbId,
|
imdbId,
|
||||||
|
tmdbId,
|
||||||
tags = []
|
tags = []
|
||||||
} = series;
|
} = series;
|
||||||
|
|
||||||
|
@ -33,6 +34,7 @@ function createCleanSeriesSelector() {
|
||||||
tvdbId,
|
tvdbId,
|
||||||
tvMazeId,
|
tvMazeId,
|
||||||
imdbId,
|
imdbId,
|
||||||
|
tmdbId,
|
||||||
firstCharacter: title.charAt(0).toLowerCase(),
|
firstCharacter: title.charAt(0).toLowerCase(),
|
||||||
tags: tags.reduce((acc, id) => {
|
tags: tags.reduce((acc, id) => {
|
||||||
const matchingTag = allTags.find((tag) => tag.id === id);
|
const matchingTag = allTags.find((tag) => tag.id === id);
|
||||||
|
|
|
@ -14,6 +14,7 @@ function SeriesSearchResult(props) {
|
||||||
tvdbId,
|
tvdbId,
|
||||||
tvMazeId,
|
tvMazeId,
|
||||||
imdbId,
|
imdbId,
|
||||||
|
tmdbId,
|
||||||
tags
|
tags
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
|
@ -73,6 +74,14 @@ function SeriesSearchResult(props) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
match.key === 'tmdbId' && tmdbId ?
|
||||||
|
<div className={styles.alternateTitle}>
|
||||||
|
TmdbId: {tmdbId}
|
||||||
|
</div> :
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
tag ?
|
tag ?
|
||||||
<div className={styles.tagContainer}>
|
<div className={styles.tagContainer}>
|
||||||
|
@ -97,6 +106,7 @@ SeriesSearchResult.propTypes = {
|
||||||
tvdbId: PropTypes.number,
|
tvdbId: PropTypes.number,
|
||||||
tvMazeId: PropTypes.number,
|
tvMazeId: PropTypes.number,
|
||||||
imdbId: PropTypes.string,
|
imdbId: PropTypes.string,
|
||||||
|
tmdbId: PropTypes.number,
|
||||||
tags: PropTypes.arrayOf(PropTypes.object).isRequired,
|
tags: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
match: PropTypes.object.isRequired
|
match: PropTypes.object.isRequired
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,6 +13,7 @@ const fuseOptions = {
|
||||||
'tvdbId',
|
'tvdbId',
|
||||||
'tvMazeId',
|
'tvMazeId',
|
||||||
'imdbId',
|
'imdbId',
|
||||||
|
'tmdbId',
|
||||||
'tags.label'
|
'tags.label'
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
|
@ -175,6 +175,7 @@ class SeriesDetails extends Component {
|
||||||
tvdbId,
|
tvdbId,
|
||||||
tvMazeId,
|
tvMazeId,
|
||||||
imdbId,
|
imdbId,
|
||||||
|
tmdbId,
|
||||||
title,
|
title,
|
||||||
runtime,
|
runtime,
|
||||||
ratings,
|
ratings,
|
||||||
|
@ -566,6 +567,7 @@ class SeriesDetails extends Component {
|
||||||
tvdbId={tvdbId}
|
tvdbId={tvdbId}
|
||||||
tvMazeId={tvMazeId}
|
tvMazeId={tvMazeId}
|
||||||
imdbId={imdbId}
|
imdbId={imdbId}
|
||||||
|
tmdbId={tmdbId}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
kind={kinds.INVERSE}
|
kind={kinds.INVERSE}
|
||||||
|
@ -719,6 +721,7 @@ SeriesDetails.propTypes = {
|
||||||
tvdbId: PropTypes.number.isRequired,
|
tvdbId: PropTypes.number.isRequired,
|
||||||
tvMazeId: PropTypes.number,
|
tvMazeId: PropTypes.number,
|
||||||
imdbId: PropTypes.string,
|
imdbId: PropTypes.string,
|
||||||
|
tmdbId: PropTypes.number,
|
||||||
title: PropTypes.string.isRequired,
|
title: PropTypes.string.isRequired,
|
||||||
runtime: PropTypes.number.isRequired,
|
runtime: PropTypes.number.isRequired,
|
||||||
ratings: PropTypes.object.isRequired,
|
ratings: PropTypes.object.isRequired,
|
||||||
|
|
|
@ -9,7 +9,8 @@ function SeriesDetailsLinks(props) {
|
||||||
const {
|
const {
|
||||||
tvdbId,
|
tvdbId,
|
||||||
tvMazeId,
|
tvMazeId,
|
||||||
imdbId
|
imdbId,
|
||||||
|
tmdbId
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -71,6 +72,22 @@ function SeriesDetailsLinks(props) {
|
||||||
</Label>
|
</Label>
|
||||||
</Link>
|
</Link>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
!!tmdbId &&
|
||||||
|
<Link
|
||||||
|
className={styles.link}
|
||||||
|
to={`https://www.themoviedb.org/tv/${tmdbId}`}
|
||||||
|
>
|
||||||
|
<Label
|
||||||
|
className={styles.linkLabel}
|
||||||
|
kind={kinds.INFO}
|
||||||
|
size={sizes.LARGE}
|
||||||
|
>
|
||||||
|
TMDB
|
||||||
|
</Label>
|
||||||
|
</Link>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -78,7 +95,8 @@ function SeriesDetailsLinks(props) {
|
||||||
SeriesDetailsLinks.propTypes = {
|
SeriesDetailsLinks.propTypes = {
|
||||||
tvdbId: PropTypes.number.isRequired,
|
tvdbId: PropTypes.number.isRequired,
|
||||||
tvMazeId: PropTypes.number,
|
tvMazeId: PropTypes.number,
|
||||||
imdbId: PropTypes.string
|
imdbId: PropTypes.string,
|
||||||
|
tmdbId: PropTypes.number
|
||||||
};
|
};
|
||||||
|
|
||||||
export default SeriesDetailsLinks;
|
export default SeriesDetailsLinks;
|
||||||
|
|
|
@ -70,6 +70,7 @@ interface Series extends ModelBase {
|
||||||
tvdbId: number;
|
tvdbId: number;
|
||||||
tvMazeId: number;
|
tvMazeId: number;
|
||||||
tvRageId: number;
|
tvRageId: number;
|
||||||
|
tmdbId: number;
|
||||||
useSceneNumbering: boolean;
|
useSceneNumbering: boolean;
|
||||||
year: number;
|
year: number;
|
||||||
isSaving?: boolean;
|
isSaving?: boolean;
|
||||||
|
|
|
@ -99,6 +99,7 @@ const seriesTokens = [
|
||||||
const seriesIdTokens = [
|
const seriesIdTokens = [
|
||||||
{ token: '{ImdbId}', example: 'tt12345' },
|
{ token: '{ImdbId}', example: 'tt12345' },
|
||||||
{ token: '{TvdbId}', example: '12345' },
|
{ token: '{TvdbId}', example: '12345' },
|
||||||
|
{ token: '{TmdbId}', example: '11223' },
|
||||||
{ token: '{TvMazeId}', example: '54321' }
|
{ token: '{TvMazeId}', example: '54321' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
|
||||||
|
|
||||||
_singleEpisodeSearchCriteria = new SingleEpisodeSearchCriteria
|
_singleEpisodeSearchCriteria = new SingleEpisodeSearchCriteria
|
||||||
{
|
{
|
||||||
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
|
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
|
||||||
SceneTitles = new List<string> { "Monkey Island" },
|
SceneTitles = new List<string> { "Monkey Island" },
|
||||||
SeasonNumber = 1,
|
SeasonNumber = 1,
|
||||||
EpisodeNumber = 2
|
EpisodeNumber = 2
|
||||||
|
@ -44,14 +44,14 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
|
||||||
|
|
||||||
_seasonSearchCriteria = new SeasonSearchCriteria
|
_seasonSearchCriteria = new SeasonSearchCriteria
|
||||||
{
|
{
|
||||||
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
|
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
|
||||||
SceneTitles = new List<string> { "Monkey Island" },
|
SceneTitles = new List<string> { "Monkey Island" },
|
||||||
SeasonNumber = 1,
|
SeasonNumber = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
_animeSearchCriteria = new AnimeEpisodeSearchCriteria()
|
_animeSearchCriteria = new AnimeEpisodeSearchCriteria()
|
||||||
{
|
{
|
||||||
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
|
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
|
||||||
SceneTitles = new List<string>() { "Monkey+Island" },
|
SceneTitles = new List<string>() { "Monkey+Island" },
|
||||||
AbsoluteEpisodeNumber = 100,
|
AbsoluteEpisodeNumber = 100,
|
||||||
SeasonNumber = 5,
|
SeasonNumber = 5,
|
||||||
|
@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
|
||||||
|
|
||||||
_animeSeasonSearchCriteria = new AnimeSeasonSearchCriteria()
|
_animeSeasonSearchCriteria = new AnimeSeasonSearchCriteria()
|
||||||
{
|
{
|
||||||
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
|
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
|
||||||
SceneTitles = new List<string> { "Monkey Island" },
|
SceneTitles = new List<string> { "Monkey Island" },
|
||||||
SeasonNumber = 3,
|
SeasonNumber = 3,
|
||||||
};
|
};
|
||||||
|
@ -268,6 +268,19 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
|
||||||
page.Url.Query.Should().Contain("imdbid=t40");
|
page.Url.Query.Should().Contain("imdbid=t40");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_search_by_tmdb_if_supported()
|
||||||
|
{
|
||||||
|
_capabilities.SupportedTvSearchParameters = new[] { "q", "tmdbid", "season", "ep" };
|
||||||
|
|
||||||
|
var results = Subject.GetSearchRequests(_singleEpisodeSearchCriteria);
|
||||||
|
results.GetTier(0).Should().HaveCount(1);
|
||||||
|
|
||||||
|
var page = results.GetAllTiers().First().First();
|
||||||
|
|
||||||
|
page.Url.Query.Should().Contain("tmdbid=50");
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void should_prefer_search_by_tvdbid_if_rid_supported()
|
public void should_prefer_search_by_tvdbid_if_rid_supported()
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,5 +56,14 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
|
||||||
Subject.GetSeriesFolder(_series)
|
Subject.GetSeriesFolder(_series)
|
||||||
.Should().Be($"Series Title ({_series.TvMazeId})");
|
.Should().Be($"Series Title ({_series.TvMazeId})");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_add_tmdb_id()
|
||||||
|
{
|
||||||
|
_namingConfig.SeriesFolderFormat = "{Series Title} ({TmdbId})";
|
||||||
|
|
||||||
|
Subject.GetSeriesFolder(_series)
|
||||||
|
.Should().Be($"Series Title ({_series.TmdbId})");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,6 +137,20 @@ namespace NzbDrone.Core.Test.TvTests
|
||||||
.Verify(v => v.UpdateSeries(It.Is<Series>(s => s.TvMazeId == newSeriesInfo.TvMazeId), It.IsAny<bool>(), It.IsAny<bool>()));
|
.Verify(v => v.UpdateSeries(It.Is<Series>(s => s.TvMazeId == newSeriesInfo.TvMazeId), It.IsAny<bool>(), It.IsAny<bool>()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_update_tmdb_id_if_changed()
|
||||||
|
{
|
||||||
|
var newSeriesInfo = _series.JsonClone();
|
||||||
|
newSeriesInfo.TmdbId = _series.TmdbId + 1;
|
||||||
|
|
||||||
|
GivenNewSeriesInfo(newSeriesInfo);
|
||||||
|
|
||||||
|
Subject.Execute(new RefreshSeriesCommand(new List<int> { _series.Id }));
|
||||||
|
|
||||||
|
Mocker.GetMock<ISeriesService>()
|
||||||
|
.Verify(v => v.UpdateSeries(It.Is<Series>(s => s.TmdbId == newSeriesInfo.TmdbId), It.IsAny<bool>(), It.IsAny<bool>()));
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void should_log_error_if_tvdb_id_not_found()
|
public void should_log_error_if_tvdb_id_not_found()
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
using FluentMigrator;
|
||||||
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
|
{
|
||||||
|
[Migration(206)]
|
||||||
|
public class add_tmdbid : NzbDroneMigrationBase
|
||||||
|
{
|
||||||
|
protected override void MainDbUpgrade()
|
||||||
|
{
|
||||||
|
Alter.Table("Series").AddColumn("TmdbId").AsInt32().WithDefaultValue(0);
|
||||||
|
Create.Index().OnTable("Series").OnColumn("TmdbId");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -29,6 +29,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
|
||||||
Tvdb = series.TvdbId.ToString();
|
Tvdb = series.TvdbId.ToString();
|
||||||
TvMaze = series.TvMazeId > 0 ? series.TvMazeId.ToString() : null;
|
TvMaze = series.TvMazeId > 0 ? series.TvMazeId.ToString() : null;
|
||||||
TvRage = series.TvRageId > 0 ? series.TvMazeId.ToString() : null;
|
TvRage = series.TvRageId > 0 ? series.TvMazeId.ToString() : null;
|
||||||
|
Tmdb = series.TmdbId > 0 ? series.TmdbId.ToString() : null;
|
||||||
Imdb = series.ImdbId;
|
Imdb = series.ImdbId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,12 +119,23 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool SupportsTmdbSearch
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
|
||||||
|
|
||||||
|
return capabilities.SupportedTvSearchParameters != null &&
|
||||||
|
capabilities.SupportedTvSearchParameters.Contains("tmdbid");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Combines all ID based searches
|
// Combines all ID based searches
|
||||||
private bool SupportsTvIdSearches
|
private bool SupportsTvIdSearches
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return SupportsTvdbSearch || SupportsImdbSearch || SupportsTvRageSearch || SupportsTvMazeSearch;
|
return SupportsTvdbSearch || SupportsImdbSearch || SupportsTvRageSearch || SupportsTvMazeSearch || SupportsTmdbSearch;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -484,8 +495,9 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||||
var includeImdbSearch = SupportsImdbSearch && searchCriteria.Series.ImdbId.IsNotNullOrWhiteSpace();
|
var includeImdbSearch = SupportsImdbSearch && searchCriteria.Series.ImdbId.IsNotNullOrWhiteSpace();
|
||||||
var includeTvRageSearch = SupportsTvRageSearch && searchCriteria.Series.TvRageId > 0;
|
var includeTvRageSearch = SupportsTvRageSearch && searchCriteria.Series.TvRageId > 0;
|
||||||
var includeTvMazeSearch = SupportsTvMazeSearch && searchCriteria.Series.TvMazeId > 0;
|
var includeTvMazeSearch = SupportsTvMazeSearch && searchCriteria.Series.TvMazeId > 0;
|
||||||
|
var includeTmdbSearch = SupportsTmdbSearch && searchCriteria.Series.TmdbId > 0;
|
||||||
|
|
||||||
if (SupportsAggregatedIdSearch && (includeTvdbSearch || includeTvRageSearch || includeTvMazeSearch))
|
if (SupportsAggregatedIdSearch && (includeTvdbSearch || includeTvRageSearch || includeTvMazeSearch || includeTmdbSearch))
|
||||||
{
|
{
|
||||||
var ids = "";
|
var ids = "";
|
||||||
|
|
||||||
|
@ -509,6 +521,11 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||||
ids += "&tvmazeid=" + searchCriteria.Series.TvMazeId;
|
ids += "&tvmazeid=" + searchCriteria.Series.TvMazeId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeTmdbSearch)
|
||||||
|
{
|
||||||
|
ids += "&tmdbid=" + searchCriteria.Series.TmdbId;
|
||||||
|
}
|
||||||
|
|
||||||
chain.Add(GetPagedRequests(MaxPages, categories, "tvsearch", ids + parameters));
|
chain.Add(GetPagedRequests(MaxPages, categories, "tvsearch", ids + parameters));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -541,6 +558,13 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||||
"tvsearch",
|
"tvsearch",
|
||||||
$"&tvmazeid={searchCriteria.Series.TvMazeId}{parameters}"));
|
$"&tvmazeid={searchCriteria.Series.TvMazeId}{parameters}"));
|
||||||
}
|
}
|
||||||
|
else if (includeTmdbSearch)
|
||||||
|
{
|
||||||
|
chain.Add(GetPagedRequests(MaxPages,
|
||||||
|
categories,
|
||||||
|
"tvsearch",
|
||||||
|
$"&tmdbid={searchCriteria.Series.TmdbId}{parameters}"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,6 +137,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_OriginalLanguage", IsoLanguages.Get(series.OriginalLanguage).ThreeLetterCode);
|
environmentVariables.Add("Sonarr_Series_OriginalLanguage", IsoLanguages.Get(series.OriginalLanguage).ThreeLetterCode);
|
||||||
|
|
|
@ -23,6 +23,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
|
||||||
public string LastAired { get; set; }
|
public string LastAired { get; set; }
|
||||||
public int? TvRageId { get; set; }
|
public int? TvRageId { get; set; }
|
||||||
public int? TvMazeId { get; set; }
|
public int? TvMazeId { get; set; }
|
||||||
|
public int? TmdbId { get; set; }
|
||||||
|
|
||||||
public string Status { get; set; }
|
public string Status { get; set; }
|
||||||
public int? Runtime { get; set; }
|
public int? Runtime { get; set; }
|
||||||
|
|
|
@ -188,6 +188,11 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||||
series.TvMazeId = show.TvMazeId.Value;
|
series.TvMazeId = show.TvMazeId.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (show.TmdbId.HasValue)
|
||||||
|
{
|
||||||
|
series.TmdbId = show.TmdbId.Value;
|
||||||
|
}
|
||||||
|
|
||||||
series.ImdbId = show.ImdbId;
|
series.ImdbId = show.ImdbId;
|
||||||
series.Title = show.Title;
|
series.Title = show.Title;
|
||||||
series.CleanTitle = Parser.Parser.CleanSeriesTitle(show.Title);
|
series.CleanTitle = Parser.Parser.CleanSeriesTitle(show.Title);
|
||||||
|
|
|
@ -69,6 +69,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_TitleSlug", series.TitleSlug);
|
environmentVariables.Add("Sonarr_Series_TitleSlug", series.TitleSlug);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
@ -116,6 +117,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
@ -181,6 +183,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
@ -213,6 +216,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
@ -252,6 +256,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
@ -276,6 +281,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
@ -345,6 +351,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
||||||
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
environmentVariables.Add("Sonarr_Series_Path", series.Path);
|
||||||
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
environmentVariables.Add("Sonarr_Series_TvMazeId", series.TvMazeId.ToString());
|
||||||
|
environmentVariables.Add("Sonarr_Series_TmdbId", series.TmdbId.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
environmentVariables.Add("Sonarr_Series_ImdbId", series.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString());
|
||||||
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
|
||||||
|
|
|
@ -20,6 +20,7 @@ namespace NzbDrone.Core.Notifications.Emby
|
||||||
public string Imdb { get; set; }
|
public string Imdb { get; set; }
|
||||||
public int Tvdb { get; set; }
|
public int Tvdb { get; set; }
|
||||||
public int TvMaze { get; set; }
|
public int TvMaze { get; set; }
|
||||||
|
public int Tmdb { get; set; }
|
||||||
public int TvRage { get; set; }
|
public int TvRage { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,11 @@ namespace NzbDrone.Core.Notifications.Emby
|
||||||
return MediaBrowserMatchQuality.Id;
|
return MediaBrowserMatchQuality.Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item is { ProviderIds.Tmdb: int tmdbid } && tmdbid != 0 && tmdbid == series.TmdbId)
|
||||||
|
{
|
||||||
|
return MediaBrowserMatchQuality.Id;
|
||||||
|
}
|
||||||
|
|
||||||
if (item is { ProviderIds.TvRage: int tvrageid } && tvrageid != 0 && tvrageid == series.TvRageId)
|
if (item is { ProviderIds.TvRage: int tvrageid } && tvrageid != 0 && tvrageid == series.TvRageId)
|
||||||
{
|
{
|
||||||
return MediaBrowserMatchQuality.Id;
|
return MediaBrowserMatchQuality.Id;
|
||||||
|
|
|
@ -12,6 +12,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
||||||
public string Path { get; set; }
|
public string Path { get; set; }
|
||||||
public int TvdbId { get; set; }
|
public int TvdbId { get; set; }
|
||||||
public int TvMazeId { get; set; }
|
public int TvMazeId { get; set; }
|
||||||
|
public int TmdbId { get; set; }
|
||||||
public string ImdbId { get; set; }
|
public string ImdbId { get; set; }
|
||||||
public SeriesTypes Type { get; set; }
|
public SeriesTypes Type { get; set; }
|
||||||
public int Year { get; set; }
|
public int Year { get; set; }
|
||||||
|
@ -31,6 +32,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
||||||
Path = series.Path;
|
Path = series.Path;
|
||||||
TvdbId = series.TvdbId;
|
TvdbId = series.TvdbId;
|
||||||
TvMazeId = series.TvMazeId;
|
TvMazeId = series.TvMazeId;
|
||||||
|
TmdbId = series.TmdbId;
|
||||||
ImdbId = series.ImdbId;
|
ImdbId = series.ImdbId;
|
||||||
Type = series.SeriesType;
|
Type = series.SeriesType;
|
||||||
Year = series.Year;
|
Year = series.Year;
|
||||||
|
|
|
@ -715,6 +715,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
tokenHandlers["{ImdbId}"] = m => series.ImdbId ?? string.Empty;
|
tokenHandlers["{ImdbId}"] = m => series.ImdbId ?? string.Empty;
|
||||||
tokenHandlers["{TvdbId}"] = m => series.TvdbId.ToString();
|
tokenHandlers["{TvdbId}"] = m => series.TvdbId.ToString();
|
||||||
tokenHandlers["{TvMazeId}"] = m => series.TvMazeId > 0 ? series.TvMazeId.ToString() : string.Empty;
|
tokenHandlers["{TvMazeId}"] = m => series.TvMazeId > 0 ? series.TvMazeId.ToString() : string.Empty;
|
||||||
|
tokenHandlers["{TmdbId}"] = m => series.TmdbId > 0 ? series.TmdbId.ToString() : string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetCustomFormatsToken(List<CustomFormat> customFormats, string filter)
|
private string GetCustomFormatsToken(List<CustomFormat> customFormats, string filter)
|
||||||
|
|
|
@ -48,7 +48,8 @@ namespace NzbDrone.Core.Organizer
|
||||||
Year = 2010,
|
Year = 2010,
|
||||||
ImdbId = "tt12345",
|
ImdbId = "tt12345",
|
||||||
TvdbId = 12345,
|
TvdbId = 12345,
|
||||||
TvMazeId = 54321
|
TvMazeId = 54321,
|
||||||
|
TmdbId = 11223
|
||||||
};
|
};
|
||||||
|
|
||||||
_dailySeries = new Series
|
_dailySeries = new Series
|
||||||
|
@ -58,7 +59,8 @@ namespace NzbDrone.Core.Organizer
|
||||||
Year = 2010,
|
Year = 2010,
|
||||||
ImdbId = "tt12345",
|
ImdbId = "tt12345",
|
||||||
TvdbId = 12345,
|
TvdbId = 12345,
|
||||||
TvMazeId = 54321
|
TvMazeId = 54321,
|
||||||
|
TmdbId = 11223
|
||||||
};
|
};
|
||||||
|
|
||||||
_animeSeries = new Series
|
_animeSeries = new Series
|
||||||
|
@ -68,7 +70,8 @@ namespace NzbDrone.Core.Organizer
|
||||||
Year = 2010,
|
Year = 2010,
|
||||||
ImdbId = "tt12345",
|
ImdbId = "tt12345",
|
||||||
TvdbId = 12345,
|
TvdbId = 12345,
|
||||||
TvMazeId = 54321
|
TvMazeId = 54321,
|
||||||
|
TmdbId = 11223
|
||||||
};
|
};
|
||||||
|
|
||||||
_episode1 = new Episode
|
_episode1 = new Episode
|
||||||
|
|
|
@ -92,6 +92,7 @@ namespace NzbDrone.Core.Tv
|
||||||
series.TitleSlug = seriesInfo.TitleSlug;
|
series.TitleSlug = seriesInfo.TitleSlug;
|
||||||
series.TvRageId = seriesInfo.TvRageId;
|
series.TvRageId = seriesInfo.TvRageId;
|
||||||
series.TvMazeId = seriesInfo.TvMazeId;
|
series.TvMazeId = seriesInfo.TvMazeId;
|
||||||
|
series.TmdbId = seriesInfo.TmdbId;
|
||||||
series.ImdbId = seriesInfo.ImdbId;
|
series.ImdbId = seriesInfo.ImdbId;
|
||||||
series.AirTime = seriesInfo.AirTime;
|
series.AirTime = seriesInfo.AirTime;
|
||||||
series.Overview = seriesInfo.Overview;
|
series.Overview = seriesInfo.Overview;
|
||||||
|
|
|
@ -23,6 +23,7 @@ namespace NzbDrone.Core.Tv
|
||||||
public int TvRageId { get; set; }
|
public int TvRageId { get; set; }
|
||||||
public int TvMazeId { get; set; }
|
public int TvMazeId { get; set; }
|
||||||
public string ImdbId { get; set; }
|
public string ImdbId { get; set; }
|
||||||
|
public int TmdbId { get; set; }
|
||||||
public string Title { get; set; }
|
public string Title { get; set; }
|
||||||
public string CleanTitle { get; set; }
|
public string CleanTitle { get; set; }
|
||||||
public string SortTitle { get; set; }
|
public string SortTitle { get; set; }
|
||||||
|
|
|
@ -51,6 +51,7 @@ namespace Sonarr.Api.V3.Series
|
||||||
public int TvdbId { get; set; }
|
public int TvdbId { get; set; }
|
||||||
public int TvRageId { get; set; }
|
public int TvRageId { get; set; }
|
||||||
public int TvMazeId { get; set; }
|
public int TvMazeId { get; set; }
|
||||||
|
public int TmdbId { get; set; }
|
||||||
public DateTime? FirstAired { get; set; }
|
public DateTime? FirstAired { get; set; }
|
||||||
public DateTime? LastAired { get; set; }
|
public DateTime? LastAired { get; set; }
|
||||||
public SeriesTypes SeriesType { get; set; }
|
public SeriesTypes SeriesType { get; set; }
|
||||||
|
@ -123,6 +124,7 @@ namespace Sonarr.Api.V3.Series
|
||||||
TvdbId = model.TvdbId,
|
TvdbId = model.TvdbId,
|
||||||
TvRageId = model.TvRageId,
|
TvRageId = model.TvRageId,
|
||||||
TvMazeId = model.TvMazeId,
|
TvMazeId = model.TvMazeId,
|
||||||
|
TmdbId = model.TmdbId,
|
||||||
FirstAired = model.FirstAired,
|
FirstAired = model.FirstAired,
|
||||||
LastAired = model.LastAired,
|
LastAired = model.LastAired,
|
||||||
SeriesType = model.SeriesType,
|
SeriesType = model.SeriesType,
|
||||||
|
@ -187,6 +189,7 @@ namespace Sonarr.Api.V3.Series
|
||||||
TvdbId = resource.TvdbId,
|
TvdbId = resource.TvdbId,
|
||||||
TvRageId = resource.TvRageId,
|
TvRageId = resource.TvRageId,
|
||||||
TvMazeId = resource.TvMazeId,
|
TvMazeId = resource.TvMazeId,
|
||||||
|
TmdbId = resource.TmdbId,
|
||||||
FirstAired = resource.FirstAired,
|
FirstAired = resource.FirstAired,
|
||||||
SeriesType = resource.SeriesType,
|
SeriesType = resource.SeriesType,
|
||||||
CleanTitle = resource.CleanTitle,
|
CleanTitle = resource.CleanTitle,
|
||||||
|
|
|
@ -11585,6 +11585,10 @@
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int32"
|
"format": "int32"
|
||||||
},
|
},
|
||||||
|
"tmdbId": {
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int32"
|
||||||
|
},
|
||||||
"firstAired": {
|
"firstAired": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"format": "date-time",
|
"format": "date-time",
|
||||||
|
|
Loading…
Reference in New Issue