github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some better null object handling #731

Browse source
This commit is contained in:
Jamie.Rees 2016-12-08 08:45:42 +00:00
commit 2a56bd2648
3 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
PlexRequests.Api/TheMovieDbApi.cs
View file

@ -47,25 +47,18 @@ namespace PlexRequests.Api
public async Task<List<SearchMovie>> SearchMovie(string searchTerm) public async Task<List<SearchMovie>> SearchMovie(string searchTerm)
{ {
var results = await Client.SearchMovie(searchTerm); var results = await Client.SearchMovie(searchTerm);
return results.Results; return results?.Results ?? new List<SearchMovie>();
}
[Obsolete("Should use TvMaze for TV")]
public async Task<List<SearchTv>> SearchTv(string searchTerm)
{
var results = await Client.SearchTvShow(searchTerm);
return results.Results;
} }
public async Task<List<MovieResult>> GetCurrentPlayingMovies() public async Task<List<MovieResult>> GetCurrentPlayingMovies()
{ {
var movies = await Client.GetMovieList(MovieListType.NowPlaying); var movies = await Client.GetMovieList(MovieListType.NowPlaying);
return movies.Results; return movies?.Results ?? new List<MovieResult>();
} }
public async Task<List<MovieResult>> GetUpcomingMovies() public async Task<List<MovieResult>> GetUpcomingMovies()
{ {
var movies = await Client.GetMovieList(MovieListType.Upcoming); var movies = await Client.GetMovieList(MovieListType.Upcoming);
return movies.Results; return movies?.Results ?? new List<MovieResult>();
} }
public async Task<Movie> GetMovieInformation(int tmdbId) public async Task<Movie> GetMovieInformation(int tmdbId)
@ -77,14 +70,7 @@ namespace PlexRequests.Api
public async Task<Movie> GetMovieInformation(string imdbId) public async Task<Movie> GetMovieInformation(string imdbId)
{ {
var movies = await Client.GetMovie(imdbId); var movies = await Client.GetMovie(imdbId);
return movies; return movies ?? new Movie();
}
[Obsolete("Should use TvMaze for TV")]
public async Task<TvShow> GetTvShowInformation(int tmdbId)
{
var show = await Client.GetTvShow(tmdbId);
return show;
} }
} }
} }

5
PlexRequests.Services/Jobs/RecentlyAdded.cs
View file

@ -147,7 +147,10 @@ namespace PlexRequests.Services.Jobs
var imdbId = PlexHelper.GetProviderIdFromPlexGuid(plexGUID); var imdbId = PlexHelper.GetProviderIdFromPlexGuid(plexGUID);
var info = _movieApi.GetMovieInformation(imdbId).Result; var info = _movieApi.GetMovieInformation(imdbId).Result;
if (info == null)
{
throw new Exception($"Movie with Imdb id {imdbId} returned null from the MovieApi");
}
AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/w500{info.BackdropPath}"); AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/w500{info.BackdropPath}");
sb.Append("<tr>"); sb.Append("<tr>");

11
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -257,7 +257,7 @@ namespace PlexRequests.UI.Modules
var movieInfoTask = await MovieApi.GetMovieInformation(movie.Id).ConfigureAwait(false); var movieInfoTask = await MovieApi.GetMovieInformation(movie.Id).ConfigureAwait(false);
// TODO needs to be careful about this, it's adding extra time to search... // TODO needs to be careful about this, it's adding extra time to search...
// https://www.themoviedb.org/talk/5807f4cdc3a36812160041f2 // https://www.themoviedb.org/talk/5807f4cdc3a36812160041f2
imdbId = movieInfoTask.ImdbId; imdbId = movieInfoTask?.ImdbId;
counter++; counter++;
} }
@ -492,6 +492,15 @@ namespace PlexRequests.UI.Modules
Analytics.TrackEventAsync(Category.Search, Action.Request, "Movie", Username, Analytics.TrackEventAsync(Category.Search, Action.Request, "Movie", Username,
CookieHelper.GetAnalyticClientId(Cookies)); CookieHelper.GetAnalyticClientId(Cookies));
var movieInfo = await MovieApi.GetMovieInformation(movieId); var movieInfo = await MovieApi.GetMovieInformation(movieId);
if (movieInfo == null)
{
return
Response.AsJson(new JsonResponseModel
{
Result = false,
Message = "There was an issue adding this movie!"
});
}
var fullMovieName = var fullMovieName =
$"{movieInfo.Title}{(movieInfo.ReleaseDate.HasValue ? $" ({movieInfo.ReleaseDate.Value.Year})" : string.Empty)}"; $"{movieInfo.Title}{(movieInfo.ReleaseDate.HasValue ? $" ({movieInfo.ReleaseDate.Value.Year})" : string.Empty)}";