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

A bit more error handling #32

Browse source
This commit is contained in:
tidusjar 2016-04-05 12:48:11 +01:00
commit 450fda6070
1 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

70
PlexRequests.Services/PlexAvailabilityChecker.cs
View file

@ -112,7 +112,7 @@ namespace PlexRequests.Services
matchResult = MovieTvSearch(results, r.Title, releaseDate); matchResult = MovieTvSearch(results, r.Title, releaseDate);
break; break;
case RequestType.Album: case RequestType.Album:
matchResult = MusicSearch(results, r.Title, r.ArtistName); matchResult = AlbumSearch(results, r.Title, r.ArtistName);
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
@ -168,7 +168,7 @@ namespace PlexRequests.Services
case PlexType.TvShow: case PlexType.TvShow:
return MovieTvSearch(results, title, year); return MovieTvSearch(results, title, year);
case PlexType.Music: case PlexType.Music:
return MusicSearch(results, title, artist); return AlbumSearch(results, title, artist);
default: default:
throw new ArgumentOutOfRangeException(nameof(type), type, null); throw new ArgumentOutOfRangeException(nameof(type), type, null);
} }
@ -183,32 +183,42 @@ namespace PlexRequests.Services
/// <returns></returns> /// <returns></returns>
private bool MovieTvSearch(PlexSearch results, string title, string year) private bool MovieTvSearch(PlexSearch results, string title, string year)
{ {
if (!string.IsNullOrEmpty(year)) try
{ {
var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase) && x.Year == year);
var directoryResult = false; if (!string.IsNullOrEmpty(year))
if (results.Directory != null)
{ {
if (results.Directory.Any(d => d.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase) && d.Year == year)) var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase) && x.Year == year);
var directoryResult = false;
if (results.Directory != null)
{ {
directoryResult = true; if (results.Directory.Any(d => d.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase) && d.Year == year))
{
directoryResult = true;
}
} }
return result?.Title != null || directoryResult;
}
else
{
var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase));
var directoryResult = false;
if (results.Directory != null)
{
if (results.Directory.Any(d => d.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase)))
{
directoryResult = true;
}
}
return result?.Title != null || directoryResult;
} }
return result?.Title != null || directoryResult;
} }
else catch (Exception e)
{ {
var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase)); Log.Error("Could not finish the Movie/TV check in Plex because of an exception:");
var directoryResult = false; Log.Error(e);
if (results.Directory != null) return false;
{
if (results.Directory.Any(d => d.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase)))
{
directoryResult = true;
}
}
return result?.Title != null || directoryResult;
} }
} }
@ -219,17 +229,25 @@ namespace PlexRequests.Services
/// <param name="title">The title.</param> /// <param name="title">The title.</param>
/// <param name="artist">The artist.</param> /// <param name="artist">The artist.</param>
/// <returns></returns> /// <returns></returns>
private bool MusicSearch(PlexSearch results, string title, string artist) private bool AlbumSearch(PlexSearch results, string title, string artist)
{ {
foreach (var r in results.Directory) try
{ {
var titleMatch = r.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase); foreach (var r in results.Directory)
var artistMatch = r.ParentTitle.Equals(artist, StringComparison.CurrentCultureIgnoreCase);
if (titleMatch && artistMatch)
{ {
return true; var titleMatch = r.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase);
var artistMatch = r.ParentTitle.Equals(artist, StringComparison.CurrentCultureIgnoreCase);
if (titleMatch && artistMatch)
{
return true;
}
} }
} }
catch (Exception e)
{
Log.Error("Could not finish the Album check in Plex because of an exception:");
Log.Error(e);
}
return false; return false;
} }