diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj index 1f0ae901d..3039d30c9 100644 --- a/PlexRequests.Api/PlexRequests.Api.csproj +++ b/PlexRequests.Api/PlexRequests.Api.csproj @@ -62,8 +62,8 @@ ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll - - ..\packages\TMDbLib.0.9.6.0-alpha\lib\net45\TMDbLib.dll + + ..\packages\TMDbLib.0.9.0.0-alpha\lib\net45\TMDbLib.dll True diff --git a/PlexRequests.Api/TheMovieDbApi.cs b/PlexRequests.Api/TheMovieDbApi.cs index 5138129f8..0e860d58a 100644 --- a/PlexRequests.Api/TheMovieDbApi.cs +++ b/PlexRequests.Api/TheMovieDbApi.cs @@ -46,44 +46,44 @@ namespace PlexRequests.Api public TMDbClient Client { get; set; } public async Task> SearchMovie(string searchTerm) { - var results = await Client.SearchMovieAsync(searchTerm); + var results = await Client.SearchMovie(searchTerm); return results.Results; } [Obsolete("Should use TvMaze for TV")] public async Task> SearchTv(string searchTerm) { - var results = await Client.SearchTvShowAsync(searchTerm); + var results = await Client.SearchTvShow(searchTerm); return results.Results; } - public async Task> GetCurrentPlayingMovies() + public async Task> GetCurrentPlayingMovies() { - var movies = await Client.GetMovieNowPlayingListAsync(); + var movies = await Client.GetMovieList(MovieListType.NowPlaying); return movies.Results; } - public async Task> GetUpcomingMovies() + public async Task> GetUpcomingMovies() { - var movies = await Client.GetMovieUpcomingListAsync(); + var movies = await Client.GetMovieList(MovieListType.Upcoming); return movies.Results; } public async Task GetMovieInformation(int tmdbId) { - var movies = await Client.GetMovieAsync(tmdbId); + var movies = await Client.GetMovie(tmdbId); return movies; } public async Task GetMovieInformation(string imdbId) { - var movies = await Client.GetMovieAsync(imdbId); + var movies = await Client.GetMovie(imdbId); return movies; } [Obsolete("Should use TvMaze for TV")] public async Task GetTvShowInformation(int tmdbId) { - var show = await Client.GetTvShowAsync(tmdbId); + var show = await Client.GetTvShow(tmdbId); return show; } } diff --git a/PlexRequests.Api/packages.config b/PlexRequests.Api/packages.config index c38877ac4..ce5ccf24e 100644 --- a/PlexRequests.Api/packages.config +++ b/PlexRequests.Api/packages.config @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs b/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs index ed1426993..161ea0ec3 100644 --- a/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs +++ b/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs @@ -412,6 +412,8 @@ namespace PlexRequests.Services.Jobs try { + + // TODO what the fuck was I thinking if (setCache) { results = GetLibraries(plexSettings); diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 5dbc74bdd..ace9e9334 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -184,14 +184,14 @@ namespace PlexRequests.UI.Modules private async Task ProcessMovies(MovieSearchType searchType, string searchTerm) { - List apiMovies; + List apiMovies; switch (searchType) { case MovieSearchType.Search: var movies = await MovieApi.SearchMovie(searchTerm).ConfigureAwait(false); apiMovies = movies.Select(x => - new SearchMovie + new MovieResult { Adult = x.Adult, BackdropPath = x.BackdropPath, @@ -217,7 +217,7 @@ namespace PlexRequests.UI.Modules apiMovies = await MovieApi.GetUpcomingMovies(); break; default: - apiMovies = new List(); + apiMovies = new List(); break; } diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index f6bdedb2c..366464d37 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -197,8 +197,8 @@ ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll - - ..\packages\TMDbLib.0.9.6.0-alpha\lib\net45\TMDbLib.dll + + ..\packages\TMDbLib.0.9.0.0-alpha\lib\net45\TMDbLib.dll True diff --git a/PlexRequests.UI/packages.config b/PlexRequests.UI/packages.config index e7f32ca86..eaca70f4a 100644 --- a/PlexRequests.UI/packages.config +++ b/PlexRequests.UI/packages.config @@ -51,5 +51,5 @@ - + \ No newline at end of file