tedkulp/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-18 21:35:27 -04:00
Code Issues Projects Releases Wiki Activity

New: Add TMDB ID support

Browse Source 
Closes #6866
This commit is contained in:
Stephan Sundermann
2024-06-18 05:38:41 +02:00
committed by GitHub
parent c331c8bd11
commit e1b937e8d5
26 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs
+17 -4
View File
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
_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" },
SeasonNumber = 1,
EpisodeNumber = 2
@@ -44,14 +44,14 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
_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" },
SeasonNumber = 1,
};
_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" },
AbsoluteEpisodeNumber = 100,
SeasonNumber = 5,
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
_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" },
SeasonNumber = 3,
};
@@ -268,6 +268,19 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
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]
public void should_prefer_search_by_tvdbid_if_rid_supported()
{
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/IdFixture.cs
+9
View File
@@ -56,5 +56,14 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
Subject.GetSeriesFolder(_series)
.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})");
}
}
}
src/NzbDrone.Core.Test/TvTests/RefreshSeriesServiceFixture.cs
+14
View File
@@ -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>()));
}
[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]
public void should_log_error_if_tvdb_id_not_found()
{
src/NzbDrone.Core/Datastore/Migration/206_add_tmdbid.cs
+15
View File
@@ -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");
}
}
}
src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/KodiEpisodeGuide.cs
+1
View File
@@ -29,6 +29,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
Tvdb = series.TvdbId.ToString();
TvMaze = series.TvMazeId > 0 ? series.TvMazeId.ToString() : null;
TvRage = series.TvRageId > 0 ? series.TvMazeId.ToString() : null;
Tmdb = series.TmdbId > 0 ? series.TmdbId.ToString() : null;
Imdb = series.ImdbId;
}
}
src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
+26 -2
View File
@@ -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
private bool SupportsTvIdSearches
{
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 includeTvRageSearch = SupportsTvRageSearch && searchCriteria.Series.TvRageId > 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 = "";
@@ -509,6 +521,11 @@ namespace NzbDrone.Core.Indexers.Newznab
ids += "&tvmazeid=" + searchCriteria.Series.TvMazeId;
}
if (includeTmdbSearch)
{
ids += "&tmdbid=" + searchCriteria.Series.TmdbId;
}
chain.Add(GetPagedRequests(MaxPages, categories, "tvsearch", ids + parameters));
}
else
@@ -541,6 +558,13 @@ namespace NzbDrone.Core.Indexers.Newznab
"tvsearch",
$"&tvmazeid={searchCriteria.Series.TvMazeId}{parameters}"));
}
else if (includeTmdbSearch)
{
chain.Add(GetPagedRequests(MaxPages,
categories,
"tvsearch",
$"&tmdbid={searchCriteria.Series.TmdbId}{parameters}"));
}
}
}
src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs
+1
View File
@@ -137,6 +137,7 @@ namespace NzbDrone.Core.MediaFiles
environmentVariables.Add("Sonarr_Series_Path", series.Path);
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.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_Type", series.SeriesType.ToString());
environmentVariables.Add("Sonarr_Series_OriginalLanguage", IsoLanguages.Get(series.OriginalLanguage).ThreeLetterCode);
src/NzbDrone.Core/MetadataSource/SkyHook/Resource/ShowResource.cs
+1
View File
@@ -23,6 +23,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
public string LastAired { get; set; }
public int? TvRageId { get; set; }
public int? TvMazeId { get; set; }
public int? TmdbId { get; set; }
public string Status { get; set; }
public int? Runtime { get; set; }
src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
+5
View File
@@ -188,6 +188,11 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
series.TvMazeId = show.TvMazeId.Value;
}
if (show.TmdbId.HasValue)
{
series.TmdbId = show.TmdbId.Value;
}
series.ImdbId = show.ImdbId;
series.Title = show.Title;
series.CleanTitle = Parser.Parser.CleanSeriesTitle(show.Title);
src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+7
View File
@@ -69,6 +69,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Sonarr_Series_TitleSlug", series.TitleSlug);
environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.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_Type", series.SeriesType.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_TvdbId", series.TvdbId.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_Type", series.SeriesType.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_TvdbId", series.TvdbId.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_Type", series.SeriesType.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_TvdbId", series.TvdbId.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_Type", series.SeriesType.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_TvdbId", series.TvdbId.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_Type", series.SeriesType.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_TvdbId", series.TvdbId.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_Type", series.SeriesType.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_TvdbId", series.TvdbId.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_Type", series.SeriesType.ToString());
environmentVariables.Add("Sonarr_Series_Year", series.Year.ToString());
src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserItems.cs
+1
View File
@@ -20,6 +20,7 @@ namespace NzbDrone.Core.Notifications.Emby
public string Imdb { get; set; }
public int Tvdb { get; set; }
public int TvMaze { get; set; }
public int Tmdb { get; set; }
public int TvRage { get; set; }
}
src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs
+5
View File
@@ -68,6 +68,11 @@ namespace NzbDrone.Core.Notifications.Emby
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)
{
return MediaBrowserMatchQuality.Id;
src/NzbDrone.Core/Notifications/Webhook/WebhookSeries.cs
+2
View File
@@ -12,6 +12,7 @@ namespace NzbDrone.Core.Notifications.Webhook
public string Path { get; set; }
public int TvdbId { get; set; }
public int TvMazeId { get; set; }
public int TmdbId { get; set; }
public string ImdbId { get; set; }
public SeriesTypes Type { get; set; }
public int Year { get; set; }
@@ -31,6 +32,7 @@ namespace NzbDrone.Core.Notifications.Webhook
Path = series.Path;
TvdbId = series.TvdbId;
TvMazeId = series.TvMazeId;
TmdbId = series.TmdbId;
ImdbId = series.ImdbId;
Type = series.SeriesType;
Year = series.Year;
src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+1
View File
@@ -715,6 +715,7 @@ namespace NzbDrone.Core.Organizer
tokenHandlers["{ImdbId}"] = m => series.ImdbId ?? string.Empty;
tokenHandlers["{TvdbId}"] = m => series.TvdbId.ToString();
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)
src/NzbDrone.Core/Organizer/FileNameSampleService.cs
+6 -3
View File
@@ -48,7 +48,8 @@ namespace NzbDrone.Core.Organizer
Year = 2010,
ImdbId = "tt12345",
TvdbId = 12345,
TvMazeId = 54321
TvMazeId = 54321,
TmdbId = 11223
};
_dailySeries = new Series
@@ -58,7 +59,8 @@ namespace NzbDrone.Core.Organizer
Year = 2010,
ImdbId = "tt12345",
TvdbId = 12345,
TvMazeId = 54321
TvMazeId = 54321,
TmdbId = 11223
};
_animeSeries = new Series
@@ -68,7 +70,8 @@ namespace NzbDrone.Core.Organizer
Year = 2010,
ImdbId = "tt12345",
TvdbId = 12345,
TvMazeId = 54321
TvMazeId = 54321,
TmdbId = 11223
};
_episode1 = new Episode
src/NzbDrone.Core/Tv/RefreshSeriesService.cs
+1
View File
@@ -92,6 +92,7 @@ namespace NzbDrone.Core.Tv
series.TitleSlug = seriesInfo.TitleSlug;
series.TvRageId = seriesInfo.TvRageId;
series.TvMazeId = seriesInfo.TvMazeId;
series.TmdbId = seriesInfo.TmdbId;
series.ImdbId = seriesInfo.ImdbId;
series.AirTime = seriesInfo.AirTime;
series.Overview = seriesInfo.Overview;
src/NzbDrone.Core/Tv/Series.cs
+1
View File
@@ -23,6 +23,7 @@ namespace NzbDrone.Core.Tv
public int TvRageId { get; set; }
public int TvMazeId { get; set; }
public string ImdbId { get; set; }
public int TmdbId { get; set; }
public string Title { get; set; }
public string CleanTitle { get; set; }
public string SortTitle { get; set; }
src/Sonarr.Api.V3/Series/SeriesResource.cs
+3
View File
@@ -51,6 +51,7 @@ namespace Sonarr.Api.V3.Series
public int TvdbId { get; set; }
public int TvRageId { get; set; }
public int TvMazeId { get; set; }
public int TmdbId { get; set; }
public DateTime? FirstAired { get; set; }
public DateTime? LastAired { get; set; }
public SeriesTypes SeriesType { get; set; }
@@ -123,6 +124,7 @@ namespace Sonarr.Api.V3.Series
TvdbId = model.TvdbId,
TvRageId = model.TvRageId,
TvMazeId = model.TvMazeId,
TmdbId = model.TmdbId,
FirstAired = model.FirstAired,
LastAired = model.LastAired,
SeriesType = model.SeriesType,
@@ -187,6 +189,7 @@ namespace Sonarr.Api.V3.Series
TvdbId = resource.TvdbId,
TvRageId = resource.TvRageId,
TvMazeId = resource.TvMazeId,
TmdbId = resource.TmdbId,
FirstAired = resource.FirstAired,
SeriesType = resource.SeriesType,
CleanTitle = resource.CleanTitle,
src/Sonarr.Api.V3/openapi.json
+4
View File
@@ -11585,6 +11585,10 @@
"type": "integer",
"format": "int32"
},
"tmdbId": {
"type": "integer",
"format": "int32"
},
"firstAired": {
"type": "string",
"format": "date-time",