mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
Add keywords as tags to series + cleanup
This commit is contained in:
parent
f4d49eff9b
commit
9adbf4e9d8
@ -190,7 +190,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
|
|||||||
movie.AddGenre(genre);
|
movie.AddGenre(genre);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (movieResult.Keywords.Keywords != null)
|
if (movieResult.Keywords?.Keywords != null)
|
||||||
{
|
{
|
||||||
for (var i = 0; i < movieResult.Keywords.Keywords.Count; i++)
|
for (var i = 0; i < movieResult.Keywords.Keywords.Count; i++)
|
||||||
{
|
{
|
||||||
|
@ -8,13 +8,11 @@ using System.Net.Http;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Extensions;
|
using MediaBrowser.Model.Extensions;
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Plugins.Tmdb.People
|
namespace MediaBrowser.Providers.Plugins.Tmdb.People
|
||||||
{
|
{
|
||||||
|
@ -7,14 +7,10 @@ using System.Net.Http;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Plugins.Tmdb.People
|
namespace MediaBrowser.Providers.Plugins.Tmdb.People
|
||||||
{
|
{
|
||||||
|
@ -8,16 +8,11 @@ using System.Net.Http;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Globalization;
|
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
@ -1,28 +1,18 @@
|
|||||||
#pragma warning disable CS1591
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Net.Http.Headers;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Globalization;
|
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
using MediaBrowser.Providers.Plugins.Tmdb.Movies;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using TMDbLib.Objects.Find;
|
using TMDbLib.Objects.Find;
|
||||||
using TMDbLib.Objects.Search;
|
using TMDbLib.Objects.Search;
|
||||||
using TMDbLib.Objects.TvShows;
|
using TMDbLib.Objects.TvShows;
|
||||||
@ -34,8 +24,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
|||||||
private readonly IHttpClientFactory _httpClientFactory;
|
private readonly IHttpClientFactory _httpClientFactory;
|
||||||
private readonly TmdbClientManager _tmdbClientManager;
|
private readonly TmdbClientManager _tmdbClientManager;
|
||||||
|
|
||||||
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
|
||||||
|
|
||||||
public TmdbSeriesProvider(
|
public TmdbSeriesProvider(
|
||||||
IHttpClientFactory httpClientFactory,
|
IHttpClientFactory httpClientFactory,
|
||||||
TmdbClientManager tmdbClientManager)
|
TmdbClientManager tmdbClientManager)
|
||||||
@ -136,7 +124,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
|||||||
Overview = series.Overview
|
Overview = series.Overview
|
||||||
};
|
};
|
||||||
|
|
||||||
remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(_usCulture));
|
remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(CultureInfo.InvariantCulture));
|
||||||
if (series.ExternalIds != null)
|
if (series.ExternalIds != null)
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(series.ExternalIds.ImdbId))
|
if (!string.IsNullOrEmpty(series.ExternalIds.ImdbId))
|
||||||
@ -165,7 +153,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
|||||||
Overview = series.Overview
|
Overview = series.Overview
|
||||||
};
|
};
|
||||||
|
|
||||||
remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(_usCulture));
|
remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(CultureInfo.InvariantCulture));
|
||||||
remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
|
remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
|
||||||
|
|
||||||
return remoteResult;
|
return remoteResult;
|
||||||
@ -250,7 +238,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
|||||||
{
|
{
|
||||||
var series = new Series {Name = seriesResult.Name, OriginalTitle = seriesResult.OriginalName};
|
var series = new Series {Name = seriesResult.Name, OriginalTitle = seriesResult.OriginalName};
|
||||||
|
|
||||||
series.SetProviderId(MetadataProvider.Tmdb, seriesResult.Id.ToString(_usCulture));
|
series.SetProviderId(MetadataProvider.Tmdb, seriesResult.Id.ToString(CultureInfo.InvariantCulture));
|
||||||
|
|
||||||
series.CommunityRating = Convert.ToSingle(seriesResult.VoteAverage);
|
series.CommunityRating = Convert.ToSingle(seriesResult.VoteAverage);
|
||||||
|
|
||||||
@ -266,6 +254,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
|||||||
series.Genres = seriesResult.Genres.Select(i => i.Name).ToArray();
|
series.Genres = seriesResult.Genres.Select(i => i.Name).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (seriesResult.Keywords?.Results != null)
|
||||||
|
{
|
||||||
|
for (var i = 0; i < seriesResult.Keywords.Results.Count; i++)
|
||||||
|
{
|
||||||
|
series.AddTag(seriesResult.Keywords.Results[i].Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
series.HomePageUrl = seriesResult.Homepage;
|
series.HomePageUrl = seriesResult.Homepage;
|
||||||
|
|
||||||
series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
|
series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
|
||||||
|
Loading…
Reference in New Issue
Block a user