diff --git a/src/Ombi.Core/Engine/MovieSearchEngine.cs b/src/Ombi.Core/Engine/MovieSearchEngine.cs
index 682a999eb..975e48d11 100644
--- a/src/Ombi.Core/Engine/MovieSearchEngine.cs
+++ b/src/Ombi.Core/Engine/MovieSearchEngine.cs
@@ -161,7 +161,7 @@ namespace Ombi.Core.Engine
var result = await Cache.GetOrAddAsync(CacheKeys.UpcomingMovies, async () =>
{
var langCode = await DefaultLanguageCode(null);
- return await MovieApi.Upcoming(langCode);
+ return await MovieApi.UpcomingMovies(langCode);
}, DateTimeOffset.Now.AddHours(12));
if (result != null)
{
diff --git a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
index 3acd7d1f0..27edbacbb 100644
--- a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
@@ -11,6 +11,7 @@ using Ombi.Core.Models.Search;
using Ombi.Core.Models.Search.V2;
using Ombi.Core.Models.UI;
using Ombi.Core.Rule.Interfaces;
+using Ombi.Core.Services;
using Ombi.Core.Settings;
using Ombi.Helpers;
using Ombi.Settings.Settings.Models;
@@ -31,7 +32,8 @@ namespace Ombi.Core.Engine.V2
{
public MovieSearchEngineV2(ICurrentUser identity, IRequestServiceMain service, IMovieDbApi movApi, IMapper mapper,
ILogger logger, IRuleEvaluator r, OmbiUserManager um, ICacheService mem, ISettingsService s, IRepository sub,
- ISettingsService customizationSettings, IMovieRequestEngine movieRequestEngine, IHttpClientFactory httpClientFactory)
+ ISettingsService customizationSettings, IMovieRequestEngine movieRequestEngine, IHttpClientFactory httpClientFactory,
+ IFeatureService feature)
: base(identity, service, r, um, mem, s, sub)
{
MovieApi = movApi;
@@ -40,6 +42,7 @@ namespace Ombi.Core.Engine.V2
_customizationSettings = customizationSettings;
_movieRequestEngine = movieRequestEngine;
_client = httpClientFactory.CreateClient();
+ _feature = feature;
}
private IMovieDbApi MovieApi { get; }
@@ -48,6 +51,7 @@ namespace Ombi.Core.Engine.V2
private readonly ISettingsService _customizationSettings;
private readonly IMovieRequestEngine _movieRequestEngine;
private readonly HttpClient _client;
+ private readonly IFeatureService _feature;
public async Task GetFullMovieInformation(int theMovieDbId, CancellationToken cancellationToken, string langCode = null)
{
@@ -196,14 +200,19 @@ namespace Ombi.Core.Engine.V2
public async Task> NowPlayingMovies(int currentPosition, int amountToLoad)
{
var langCode = await DefaultLanguageCode(null);
+ var isOldTrendingSourceEnabled = await _feature.FeatureEnabled(FeatureNames.OldTrendingSource);
var pages = PaginationHelper.GetNextPages(currentPosition, amountToLoad, _theMovieDbMaxPageItems);
var results = new List();
foreach (var pagesToLoad in pages)
{
+ var search = () => (isOldTrendingSourceEnabled) ?
+ MovieApi.NowPlaying(langCode, pagesToLoad.Page)
+ : MovieApi.TrendingMovies(langCode, pagesToLoad.Page);
+
var apiResult = await Cache.GetOrAddAsync(nameof(NowPlayingMovies) + pagesToLoad.Page + langCode,
- () => MovieApi.NowPlaying(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
+ search, DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
}
return await TransformMovieResultsToResponse(results);
@@ -278,7 +287,7 @@ namespace Ombi.Core.Engine.V2
var result = await Cache.GetOrAddAsync(CacheKeys.UpcomingMovies, async () =>
{
var langCode = await DefaultLanguageCode(null);
- return await MovieApi.Upcoming(langCode);
+ return await MovieApi.UpcomingMovies(langCode);
}, DateTimeOffset.Now.AddHours(12));
if (result != null)
{
@@ -298,7 +307,7 @@ namespace Ombi.Core.Engine.V2
foreach (var pagesToLoad in pages)
{
var apiResult = await Cache.GetOrAddAsync(nameof(UpcomingMovies) + pagesToLoad.Page + langCode,
- () => MovieApi.Upcoming(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
+ () => MovieApi.UpcomingMovies(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
}
return await TransformMovieResultsToResponse(results);
diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
index 344ced813..21035567a 100644
--- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
@@ -26,6 +26,7 @@ using System.Diagnostics;
using Ombi.Core.Engine.Interfaces;
using Ombi.Core.Models.UI;
using Ombi.Core.Helpers;
+using Ombi.Core.Services;
namespace Ombi.Core.Engine.V2
{
@@ -37,10 +38,12 @@ namespace Ombi.Core.Engine.V2
private readonly IMovieDbApi _movieApi;
private readonly ISettingsService _customization;
private readonly ITvRequestEngine _requestEngine;
+ private readonly IFeatureService _feature;
public TvSearchEngineV2(ICurrentUser identity, IRequestServiceMain service, ITvMazeApi tvMaze, IMapper mapper,
ITraktApi trakt, IRuleEvaluator r, OmbiUserManager um, ICacheService memCache, ISettingsService s,
- IRepository sub, IMovieDbApi movieApi, ISettingsService customization, ITvRequestEngine requestEngine)
+ IRepository sub, IMovieDbApi movieApi, ISettingsService customization, ITvRequestEngine requestEngine,
+ IFeatureService feature)
: base(identity, service, r, um, memCache, s, sub)
{
_tvMaze = tvMaze;
@@ -49,6 +52,7 @@ namespace Ombi.Core.Engine.V2
_movieApi = movieApi;
_customization = customization;
_requestEngine = requestEngine;
+ _feature = feature;
}
@@ -132,15 +136,19 @@ namespace Ombi.Core.Engine.V2
}
public async Task> Trending(int currentlyLoaded, int amountToLoad)
- {
+ {
var langCode = await DefaultLanguageCode(null);
+ var isOldTrendingSourceEnabled = await _feature.FeatureEnabled(FeatureNames.OldTrendingSource);
var pages = PaginationHelper.GetNextPages(currentlyLoaded, amountToLoad, ResultLimit);
var results = new List();
foreach (var pagesToLoad in pages)
{
+ var search = ( async () => (isOldTrendingSourceEnabled) ?
+ await _movieApi.TopRatedTv(langCode, pagesToLoad.Page)
+ : await _movieApi.TrendingTv(langCode, pagesToLoad.Page));
var apiResult = await Cache.GetOrAddAsync(nameof(Trending) + langCode + pagesToLoad.Page,
- async () => await _movieApi.TopRatedTv(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
+ search, DateTimeOffset.Now.AddHours(12));
results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
}
diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
index b4d61f93d..27cdf0f3a 100644
--- a/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
+++ b/src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs
@@ -157,9 +157,20 @@ namespace Ombi.Schedule.Jobs.Emby
}
var existingTv = await _repo.GetByEmbyId(tvShow.Id);
+
+ if (existingTv != null &&
+ ( existingTv.ImdbId != tvShow.ProviderIds?.Imdb
+ || existingTv.TheMovieDbId != tvShow.ProviderIds?.Tmdb
+ || existingTv.TvDbId != tvShow.ProviderIds?.Tvdb))
+ {
+ _logger.LogDebug($"Series '{tvShow.Name}' has different IDs, probably a reidentification.");
+ await _repo.DeleteTv(existingTv);
+ existingTv = null;
+ }
+
if (existingTv == null)
{
- _logger.LogDebug("Adding new TV Show {0}", tvShow.Name);
+ _logger.LogDebug("Adding TV Show {0}", tvShow.Name);
mediaToAdd.Add(new EmbyContent
{
TvDbId = tvShow.ProviderIds?.Tvdb,
@@ -265,23 +276,21 @@ namespace Ombi.Schedule.Jobs.Emby
return;
}
_logger.LogDebug($"Adding new movie {movieInfo.Name}");
-
- content.Add(new EmbyContent
- {
- ImdbId = movieInfo.ProviderIds.Imdb,
- TheMovieDbId = movieInfo.ProviderIds?.Tmdb,
- Title = movieInfo.Name,
- Type = MediaType.Movie,
- EmbyId = movieInfo.Id,
- Url = EmbyHelper.GetEmbyMediaUrl(movieInfo.Id, server?.ServerId, server.ServerHostname),
- AddedAt = DateTime.UtcNow,
- Quality = has4K ? null : quality,
- Has4K = has4K
- });
+ var newMovie = new EmbyContent();
+ newMovie.AddedAt = DateTime.UtcNow;
+ MapEmbyContent(newMovie, movieInfo, server, has4K, quality);
+ content.Add(newMovie);
}
else
{
- if (!quality.Equals(existingMovie?.Quality, StringComparison.InvariantCultureIgnoreCase))
+ var movieHasChanged = false;
+ if (existingMovie.ImdbId != movieInfo.ProviderIds.Imdb || existingMovie.TheMovieDbId != movieInfo.ProviderIds.Tmdb)
+ {
+ _logger.LogDebug($"Updating existing movie '{movieInfo.Name}'");
+ MapEmbyContent(existingMovie, movieInfo, server, has4K, quality);
+ movieHasChanged = true;
+ }
+ else if (!quality.Equals(existingMovie?.Quality, StringComparison.InvariantCultureIgnoreCase))
{
_logger.LogDebug($"We have found another quality for Movie '{movieInfo.Name}', Quality: '{quality}'");
existingMovie.Quality = has4K ? null : quality;
@@ -290,6 +299,11 @@ namespace Ombi.Schedule.Jobs.Emby
// Probably could refactor here
// If a 4k movie comes in (we don't store the quality on 4k)
// it will always get updated even know it's not changed
+ movieHasChanged = true;
+ }
+
+ if (movieHasChanged)
+ {
toUpdate.Add(existingMovie);
}
else
@@ -300,6 +314,17 @@ namespace Ombi.Schedule.Jobs.Emby
}
}
+ private void MapEmbyContent(EmbyContent content, EmbyMovie movieInfo, EmbyServers server, bool has4K, string quality){
+ content.ImdbId = movieInfo.ProviderIds.Imdb;
+ content.TheMovieDbId = movieInfo.ProviderIds?.Tmdb;
+ content.Title = movieInfo.Name;
+ content.Type = MediaType.Movie;
+ content.EmbyId = movieInfo.Id;
+ content.Url = EmbyHelper.GetEmbyMediaUrl(movieInfo.Id, server?.ServerId, server.ServerHostname);
+ content.Quality = has4K ? null : quality;
+ content.Has4K = has4K;
+ }
+
private bool ValidateSettings(EmbyServers server)
{
if (server?.Ip == null || string.IsNullOrEmpty(server?.ApiKey))
diff --git a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs
index 060c974e7..5519b3413 100644
--- a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs
+++ b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinContentSync.cs
@@ -132,9 +132,20 @@ namespace Ombi.Schedule.Jobs.Jellyfin
}
var existingTv = await _repo.GetByJellyfinId(tvShow.Id);
+
+ if (existingTv != null &&
+ ( existingTv.ImdbId != tvShow.ProviderIds?.Imdb
+ || existingTv.TheMovieDbId != tvShow.ProviderIds?.Tmdb
+ || existingTv.TvDbId != tvShow.ProviderIds?.Tvdb))
+ {
+ _logger.LogDebug($"Series '{tvShow.Name}' has different IDs, probably a reidentification.");
+ await _repo.DeleteTv(existingTv);
+ existingTv = null;
+ }
+
if (existingTv == null)
{
- _logger.LogDebug("Adding new TV Show {0}", tvShow.Name);
+ _logger.LogDebug("Adding TV Show {0}", tvShow.Name);
mediaToAdd.Add(new JellyfinContent
{
TvDbId = tvShow.ProviderIds?.Tvdb,
@@ -230,22 +241,21 @@ namespace Ombi.Schedule.Jobs.Jellyfin
return;
}
_logger.LogDebug($"Adding new movie {movieInfo.Name}");
- content.Add(new JellyfinContent
- {
- ImdbId = movieInfo.ProviderIds.Imdb,
- TheMovieDbId = movieInfo.ProviderIds?.Tmdb,
- Title = movieInfo.Name,
- Type = MediaType.Movie,
- JellyfinId = movieInfo.Id,
- Url = JellyfinHelper.GetJellyfinMediaUrl(movieInfo.Id, server?.ServerId, server.ServerHostname),
- AddedAt = DateTime.UtcNow,
- Quality = has4K ? null : quality,
- Has4K = has4K
- });
+ var newMovie = new JellyfinContent();
+ newMovie.AddedAt = DateTime.UtcNow;
+ MapJellyfinMovie(newMovie, movieInfo, server, has4K, quality);
+ content.Add(newMovie);;
}
else
{
- if (!quality.Equals(existingMovie?.Quality, StringComparison.InvariantCultureIgnoreCase))
+ var movieHasChanged = false;
+ if (existingMovie.ImdbId != movieInfo.ProviderIds.Imdb || existingMovie.TheMovieDbId != movieInfo.ProviderIds.Tmdb)
+ {
+ _logger.LogDebug($"Updating existing movie '{movieInfo.Name}'");
+ MapJellyfinMovie(existingMovie, movieInfo, server, has4K, quality);
+ movieHasChanged = true;
+ }
+ else if (!quality.Equals(existingMovie?.Quality, StringComparison.InvariantCultureIgnoreCase))
{
_logger.LogDebug($"We have found another quality for Movie '{movieInfo.Name}', Quality: '{quality}'");
existingMovie.Quality = has4K ? null : quality;
@@ -255,6 +265,12 @@ namespace Ombi.Schedule.Jobs.Jellyfin
// If a 4k movie comes in (we don't store the quality on 4k)
// it will always get updated even know it's not changed
toUpdate.Add(existingMovie);
+ movieHasChanged = true;
+ }
+
+ if (movieHasChanged)
+ {
+ toUpdate.Add(existingMovie);
}
else
{
@@ -264,6 +280,18 @@ namespace Ombi.Schedule.Jobs.Jellyfin
}
}
+ private void MapJellyfinMovie(JellyfinContent content, JellyfinMovie movieInfo, JellyfinServers server, bool has4K, string quality)
+ {
+ content.ImdbId = movieInfo.ProviderIds.Imdb;
+ content.TheMovieDbId = movieInfo.ProviderIds?.Tmdb;
+ content.Title = movieInfo.Name;
+ content.Type = MediaType.Movie;
+ content.JellyfinId = movieInfo.Id;
+ content.Url = JellyfinHelper.GetJellyfinMediaUrl(movieInfo.Id, server?.ServerId, server.ServerHostname);
+ content.Quality = has4K ? null : quality;
+ content.Has4K = has4K;
+ }
+
private bool ValidateSettings(JellyfinServers server)
{
if (server?.Ip == null || string.IsNullOrEmpty(server?.ApiKey))
diff --git a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
index a11a9ff80..0782a796a 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
@@ -409,7 +409,9 @@ namespace Ombi.Schedule.Jobs.Ombi
private HashSet FilterEpisodes(IEnumerable source, IEnumerable recentlyAdded)
{
var itemsToReturn = new HashSet();
- foreach (var ep in source.Where(x => x.Series.HasTvDb))
+ foreach (var ep in source.Where(x => x.Series.HasTvDb // needed for recentlyAddedLog
+ && x.Series.HasTheMovieDb // needed to fetch info to publish, this is just in case...
+ ))
{
var tvDbId = StringHelper.IntParseLinq(ep.Series.TvDbId);
if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber))
@@ -501,16 +503,11 @@ namespace Ombi.Schedule.Jobs.Ombi
foreach (var content in ordered)
{
int.TryParse(content.TheMovieDbId, out var movieDbId);
- if (movieDbId <= 0)
- {
- _log.LogWarning($"{content.Title} does not have a TMDB ID, it won't be published.");
- continue;
- }
var info = await _movieApi.GetMovieInformationWithExtraInfo(movieDbId, defaultLanguageCode);
var mediaurl = content.Url;
if (info == null)
{
- _log.LogWarning($"TMDB does not know movie {content.Title}, it won't be published.");
+ _log.LogError($"TMDB does not know movie {content.Title}. This shouldn't happen because our media server knows it as ID '{movieDbId}'.");
continue;
}
try
@@ -665,48 +662,18 @@ namespace Ombi.Schedule.Jobs.Ombi
var orderedTv = series.OrderByDescending(x => x.AddedAt);
foreach (var t in orderedTv)
{
- if (!t.HasTvDb)
- {
- // We may need to use themoviedb for the imdbid or their own id to get info
- if (t.HasTheMovieDb)
- {
- int.TryParse(t.TheMovieDbId, out var movieId);
- var externals = await _movieApi.GetTvExternals(movieId);
- if (externals == null || externals.tvdb_id <= 0)
- {
- // needed later for recently added log
- _log.LogWarning($"{t.Title} has no TVDB ID, it won't be published.");
- continue;
- }
- t.TvDbId = externals.tvdb_id.ToString();
- }
- // WE could check the below but we need to get the moviedb and then perform the above, let the metadata job figure this out.
- //else if(t.HasImdb)
- //{
- // // Check the imdbid
- // var externals = await _movieApi.Find(t.ImdbId, ExternalSource.imdb_id);
- // if (externals?.tv_results == null || externals.tv_results.Length <= 0)
- // {
- // continue;
- // }
- // t.TvDbId = externals.tv_results.FirstOrDefault()..ToString();
- //}
-
- }
-
try
{
var tvInfo = await _movieApi.GetTVInfo(t.TheMovieDbId, languageCode);
if (tvInfo == null)
{
- _log.LogWarning($"TMDB does not know series {t.Title}, it won't be published.");
+ _log.LogError($"TMDB does not know series {t.Title}. This shouldn't happen because our media server knows it as ID '{t.TheMovieDbId}'.");
continue;
}
if (tvInfo.backdrop_path.HasValue())
{
-
AddBackgroundInsideTable($"https://image.tmdb.org/t/p/w500{tvInfo.backdrop_path}");
}
else
@@ -732,7 +699,7 @@ namespace Ombi.Schedule.Jobs.Ombi
}
catch (Exception e)
{
- _log.LogError(e, "Error when processing Plex TV {0}", t.Title);
+ _log.LogError(e, "Error when processing TV {0}", t.Title);
}
finally
{
diff --git a/src/Ombi.Settings/Settings/Models/FeatureSettings.cs b/src/Ombi.Settings/Settings/Models/FeatureSettings.cs
index 6a285d422..9d0149e5d 100644
--- a/src/Ombi.Settings/Settings/Models/FeatureSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/FeatureSettings.cs
@@ -20,5 +20,6 @@ namespace Ombi.Settings.Settings.Models
public static class FeatureNames
{
public const string Movie4KRequests = nameof(Movie4KRequests);
+ public const string OldTrendingSource = nameof(OldTrendingSource);
}
}
diff --git a/src/Ombi.Store/Repository/EmbyContentRepository.cs b/src/Ombi.Store/Repository/EmbyContentRepository.cs
index df88d8292..8f9904ebb 100644
--- a/src/Ombi.Store/Repository/EmbyContentRepository.cs
+++ b/src/Ombi.Store/Repository/EmbyContentRepository.cs
@@ -102,6 +102,13 @@ namespace Ombi.Store.Repository
return InternalSaveChanges();
}
+ public override async Task DeleteTv(EmbyContent tv)
+ {
+ var episodesToDelete = GetAllEpisodes().Cast().Where(x => x.ParentId == tv.EmbyId).ToList();
+ Db.EmbyEpisode.RemoveRange(episodesToDelete);
+ await Delete(tv);
+ }
+
public override RecentlyAddedType RecentlyAddedType => RecentlyAddedType.Emby;
}
}
\ No newline at end of file
diff --git a/src/Ombi.Store/Repository/IMediaServerContentRepository.cs b/src/Ombi.Store/Repository/IMediaServerContentRepository.cs
index db4835a16..3f165b7e6 100644
--- a/src/Ombi.Store/Repository/IMediaServerContentRepository.cs
+++ b/src/Ombi.Store/Repository/IMediaServerContentRepository.cs
@@ -14,6 +14,7 @@ namespace Ombi.Store.Repository
IQueryable GetAllEpisodes();
Task Add(IMediaServerEpisode content);
Task AddRange(IEnumerable content);
+ Task DeleteTv(Content tv);
void UpdateWithoutSave(IMediaServerContent existingContent);
}
}
\ No newline at end of file
diff --git a/src/Ombi.Store/Repository/JellyfinContentRepository.cs b/src/Ombi.Store/Repository/JellyfinContentRepository.cs
index c3451da62..8dc729a6b 100644
--- a/src/Ombi.Store/Repository/JellyfinContentRepository.cs
+++ b/src/Ombi.Store/Repository/JellyfinContentRepository.cs
@@ -104,6 +104,13 @@ namespace Ombi.Store.Repository
return InternalSaveChanges();
}
+ public override async Task DeleteTv(JellyfinContent tv)
+ {
+ var episodesToDelete = GetAllEpisodes().Cast().Where(x => x.ParentId == tv.JellyfinId).ToList();
+ Db.JellyfinEpisode.RemoveRange(episodesToDelete);
+ await Delete(tv);
+ }
+
public override RecentlyAddedType RecentlyAddedType => RecentlyAddedType.Jellyfin;
}
}
diff --git a/src/Ombi.Store/Repository/MediaServerRepository.cs b/src/Ombi.Store/Repository/MediaServerRepository.cs
index c1c7d4ec8..251fe3cea 100644
--- a/src/Ombi.Store/Repository/MediaServerRepository.cs
+++ b/src/Ombi.Store/Repository/MediaServerRepository.cs
@@ -22,5 +22,6 @@ namespace Ombi.Store.Repository
public abstract Task AddRange(IEnumerable content);
public abstract void UpdateWithoutSave(IMediaServerContent existingContent);
public abstract Task UpdateRange(IEnumerable existingContent);
+ public abstract Task DeleteTv(T tv);
}
}
\ No newline at end of file
diff --git a/src/Ombi.Store/Repository/PlexContentRepository.cs b/src/Ombi.Store/Repository/PlexContentRepository.cs
index 96dfbe8e1..9f34af6a1 100644
--- a/src/Ombi.Store/Repository/PlexContentRepository.cs
+++ b/src/Ombi.Store/Repository/PlexContentRepository.cs
@@ -169,5 +169,12 @@ namespace Ombi.Store.Repository
Db.PlexServerContent.UpdateRange((IEnumerable)existingContent);
return InternalSaveChanges();
}
+
+ public override Task DeleteTv(PlexServerContent tv)
+ {
+ // not used for now
+ // TODO: delete episodes, then delete series
+ throw new NotImplementedException();
+ }
}
}
\ No newline at end of file
diff --git a/src/Ombi.TheMovieDbApi/IMovieDbApi.cs b/src/Ombi.TheMovieDbApi/IMovieDbApi.cs
index 51da958b6..12f5255b4 100644
--- a/src/Ombi.TheMovieDbApi/IMovieDbApi.cs
+++ b/src/Ombi.TheMovieDbApi/IMovieDbApi.cs
@@ -15,14 +15,16 @@ namespace Ombi.Api.TheMovieDb
Task GetMovieInformation(int movieId);
Task GetMovieInformationWithExtraInfo(int movieId, string langCode = "en");
Task> NowPlaying(string languageCode, int? page = null);
+ Task> TrendingMovies(string languageCode, int? page = null);
Task> PopularMovies(string languageCode, int? page = null, CancellationToken cancellationToken = default(CancellationToken));
Task> PopularTv(string langCode, int? page = null, CancellationToken cancellationToken = default(CancellationToken));
Task> SearchMovie(string searchTerm, int? year, string languageCode);
Task> GetMoviesViaKeywords(string keywordId, string langCode, CancellationToken cancellationToken, int? page = null);
Task> SearchTv(string searchTerm, string year = default);
Task> TopRated(string languageCode, int? page = null);
- Task> Upcoming(string languageCode, int? page = null);
+ Task> UpcomingMovies(string languageCode, int? page = null);
Task> TopRatedTv(string languageCode, int? page = null);
+ Task> TrendingTv(string languageCode, int? page = null);
Task> UpcomingTv(string languageCode, int? page = null);
Task> SimilarMovies(int movieId, string langCode);
Task Find(string externalId, ExternalSource source);
diff --git a/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs b/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs
index 02862fb7d..5b0817388 100644
--- a/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs
+++ b/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs
@@ -281,22 +281,39 @@ namespace Ombi.Api.TheMovieDb
var result = await Api.Request>(request);
return Mapper.Map>(result.results);
}
-
- public Task> Upcoming(string langCode, int? page = null)
+
+ public Task> TrendingMovies(string langCode, int? page = null)
{
- return Upcoming("movie", langCode, page);
- }
- public Task> UpcomingTv(string langCode, int? page = null)
- {
- return Upcoming("tv", langCode, page);
+ return Trending("movie", langCode, page);
}
+ public Task> TrendingTv(string langCode, int? page = null)
+ {
+ return Trending("tv", langCode, page);
+ }
+ private async Task> Trending(string type, string langCode, int? page = null)
+ {
+ // https://developers.themoviedb.org/3/trending/get-trending
+ var timeWindow = "week"; // another option can be 'day'
+ var request = new Request($"trending/{type}/{timeWindow}", BaseUri, HttpMethod.Get);
+ request.AddQueryString("api_key", ApiToken);
+ request.AddQueryString("language", langCode);
+
+ if (page != null)
+ {
+ request.AddQueryString("page", page.ToString());
+ }
+
+ AddRetry(request);
+ var result = await Api.Request>(request);
+ return Mapper.Map>(result.results);
+ }
///
/// Maintains filter parity with /movie/upcoming.
///
- private async Task> Upcoming(string type, string langCode, int? page = null)
+ public async Task> UpcomingMovies(string langCode, int? page = null)
{
- var request = new Request($"discover/{type}", BaseUri, HttpMethod.Get);
+ var request = new Request($"discover/movie", BaseUri, HttpMethod.Get);
request.AddQueryString("api_key", ApiToken);
request.AddQueryString("language", langCode);
@@ -313,7 +330,27 @@ namespace Ombi.Api.TheMovieDb
request.AddQueryString("page", page.ToString());
}
await AddDiscoverSettings(request);
- await AddGenreFilter(request, type);
+ await AddGenreFilter(request, "movie");
+ AddRetry(request);
+ var result = await Api.Request>(request);
+ return Mapper.Map>(result.results);
+ }
+ public async Task> UpcomingTv(string langCode, int? page = null)
+ {
+ var request = new Request($"discover/tv", BaseUri, HttpMethod.Get);
+ request.AddQueryString("api_key", ApiToken);
+ request.AddQueryString("language", langCode);
+
+ // Search for shows that will air in the next month
+ var startDate = DateTime.Today.AddDays(1);
+ request.AddQueryString($"first_air_date.gte", startDate.ToString("yyyy-MM-dd"));
+ request.AddQueryString($"first_air_date.lte", startDate.AddDays(30).ToString("yyyy-MM-dd"));
+ if (page != null)
+ {
+ request.AddQueryString("page", page.ToString());
+ }
+ await AddDiscoverSettings(request);
+ await AddGenreFilter(request, "tv");
AddRetry(request);
var result = await Api.Request>(request);
return Mapper.Map>(result.results);
diff --git a/src/Ombi/ClientApp/src/app/settings/features/features.component.html b/src/Ombi/ClientApp/src/app/settings/features/features.component.html
index 4eb975cfe..37de15a4c 100644
--- a/src/Ombi/ClientApp/src/app/settings/features/features.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/features/features.component.html
@@ -8,7 +8,7 @@
-
+
{{feature.name}}
@@ -17,4 +17,4 @@
-
\ No newline at end of file
+
diff --git a/src/Ombi/Controllers/V2/SearchController.cs b/src/Ombi/Controllers/V2/SearchController.cs
index 5227f06ec..429add7c8 100644
--- a/src/Ombi/Controllers/V2/SearchController.cs
+++ b/src/Ombi/Controllers/V2/SearchController.cs
@@ -392,14 +392,14 @@ namespace Ombi.Controllers.V2
///
/// Returns trending shows by page
///
- /// We use Trakt.tv as the Provider
+ /// We use TheMovieDb as the Provider
///
[HttpGet("tv/trending/{currentPosition}/{amountToLoad}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
- public Task> Trending(int currentPosition, int amountToLoad)
+ public Task> TrendingTv(int currentPosition, int amountToLoad)
{
- return _mediaCacheService.GetOrAddAsync(nameof(Trending) + currentPosition + amountToLoad,
+ return _mediaCacheService.GetOrAddAsync(nameof(TrendingTv) + currentPosition + amountToLoad,
() => _tvEngineV2.Trending(currentPosition, amountToLoad),
DateTimeOffset.Now.AddHours(12));
}
diff --git a/version.json b/version.json
index e4a3f1a5b..bcef7521a 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
{
- "version": "4.17.0"
+ "version": "4.20.0"
}
\ No newline at end of file
|
- 