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

Fixed bug #2188 #2134

Browse source
This commit is contained in:
Jamie 2018-04-24 08:09:11 +01:00
commit f62e97bb32
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Ombi.Helpers/StringHelper.cs
View file

@ -65,5 +65,15 @@ namespace Ombi.Helpers
securePassword.MakeReadOnly(); securePassword.MakeReadOnly();
return securePassword; return securePassword;
} }
public static int IntParseLinq(string stringIn)
{
if (int.TryParse(stringIn, out var result))
{
return result;
}
return -1;
}
} }
} }

18
src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
View file

@ -98,8 +98,8 @@ namespace Ombi.Schedule.Jobs.Ombi
addedLog.Where(x => x.Type == RecentlyAddedType.Emby && x.ContentType == ContentType.Episode); addedLog.Where(x => x.Type == RecentlyAddedType.Emby && x.ContentType == ContentType.Episode);
// Filter out the ones that we haven't sent yet // Filter out the ones that we haven't sent yet
var plexContentMoviesToSend = plexContent.Where(x => x.Type == PlexMediaTypeEntity.Movie && !addedPlexMovieLogIds.Contains(int.Parse(x.TheMovieDbId))); var plexContentMoviesToSend = plexContent.Where(x => x.Type == PlexMediaTypeEntity.Movie && !addedPlexMovieLogIds.Contains(StringHelper.IntParseLinq(x.TheMovieDbId)));
var embyContentMoviesToSend = embyContent.Where(x => x.Type == EmbyMediaType.Movie && !addedEmbyMoviesLogIds.Contains(int.Parse(x.TheMovieDbId))); var embyContentMoviesToSend = embyContent.Where(x => x.Type == EmbyMediaType.Movie && !addedEmbyMoviesLogIds.Contains(StringHelper.IntParseLinq(x.TheMovieDbId)));
_log.LogInformation("Plex Movies to send: {0}", plexContentMoviesToSend.Count()); _log.LogInformation("Plex Movies to send: {0}", plexContentMoviesToSend.Count());
_log.LogInformation("Emby Movies to send: {0}", embyContentMoviesToSend.Count()); _log.LogInformation("Emby Movies to send: {0}", embyContentMoviesToSend.Count());
@ -173,7 +173,7 @@ namespace Ombi.Schedule.Jobs.Ombi
AddedAt = DateTime.Now, AddedAt = DateTime.Now,
Type = RecentlyAddedType.Plex, Type = RecentlyAddedType.Plex,
ContentType = ContentType.Parent, ContentType = ContentType.Parent,
ContentId = int.Parse(p.TheMovieDbId), ContentId = StringHelper.IntParseLinq(p.TheMovieDbId),
}); });
} }
@ -185,7 +185,7 @@ namespace Ombi.Schedule.Jobs.Ombi
AddedAt = DateTime.Now, AddedAt = DateTime.Now,
Type = RecentlyAddedType.Plex, Type = RecentlyAddedType.Plex,
ContentType = ContentType.Episode, ContentType = ContentType.Episode,
ContentId = int.Parse(p.Series.TvDbId), ContentId = StringHelper.IntParseLinq(p.Series.TvDbId),
EpisodeNumber = p.EpisodeNumber, EpisodeNumber = p.EpisodeNumber,
SeasonNumber = p.SeasonNumber SeasonNumber = p.SeasonNumber
}); });
@ -199,7 +199,7 @@ namespace Ombi.Schedule.Jobs.Ombi
AddedAt = DateTime.Now, AddedAt = DateTime.Now,
Type = RecentlyAddedType.Emby, Type = RecentlyAddedType.Emby,
ContentType = ContentType.Parent, ContentType = ContentType.Parent,
ContentId = int.Parse(e.TheMovieDbId), ContentId = StringHelper.IntParseLinq(e.TheMovieDbId),
}); });
} }
} }
@ -211,7 +211,7 @@ namespace Ombi.Schedule.Jobs.Ombi
AddedAt = DateTime.Now, AddedAt = DateTime.Now,
Type = RecentlyAddedType.Emby, Type = RecentlyAddedType.Emby,
ContentType = ContentType.Episode, ContentType = ContentType.Episode,
ContentId = int.Parse(p.Series.TvDbId), ContentId = StringHelper.IntParseLinq(p.Series.TvDbId),
EpisodeNumber = p.EpisodeNumber, EpisodeNumber = p.EpisodeNumber,
SeasonNumber = p.SeasonNumber SeasonNumber = p.SeasonNumber
}); });
@ -259,7 +259,7 @@ namespace Ombi.Schedule.Jobs.Ombi
var itemsToReturn = new HashSet<PlexEpisode>(); var itemsToReturn = new HashSet<PlexEpisode>();
foreach (var ep in source) foreach (var ep in source)
{ {
var tvDbId = int.Parse(ep.Series.TvDbId); var tvDbId = StringHelper.IntParseLinq(ep.Series.TvDbId);
if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber)) if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber))
{ {
continue; continue;
@ -276,7 +276,7 @@ namespace Ombi.Schedule.Jobs.Ombi
var itemsToReturn = new HashSet<EmbyEpisode>(); var itemsToReturn = new HashSet<EmbyEpisode>();
foreach (var ep in source) foreach (var ep in source)
{ {
var tvDbId = int.Parse(ep.Series.TvDbId); var tvDbId = StringHelper.IntParseLinq(ep.Series.TvDbId);
if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber)) if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber))
{ {
continue; continue;
@ -374,7 +374,7 @@ namespace Ombi.Schedule.Jobs.Ombi
theMovieDbId = result.id.ToString(); theMovieDbId = result.id.ToString();
} }
var info = await _movieApi.GetMovieInformationWithExtraInfo(int.Parse(theMovieDbId)); var info = await _movieApi.GetMovieInformationWithExtraInfo(StringHelper.IntParseLinq(theMovieDbId));
if (info == null) if (info == null)
{ {
continue; continue;