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

Fixed a bug in the Plex Newsletter

Browse source
This commit is contained in:
tidusjar 2017-03-06 20:54:31 +00:00
parent c3cba15b17
commit c95e7368ae
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ombi.Services/Jobs/RecentlyAddedNewsletter/PlexRecentlyAddedNewsletter.cs
View file

@ -117,12 +117,16 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
var filteredMovies = movie.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList(); var filteredMovies = movie.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList();
var filteredEp = episodes.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList(); var filteredEp = episodes.Where(m => recentlyAdded.All(x => x.ProviderId != m.ProviderId)).ToList();
var filteredSeries = series.Where(x => recentlyAdded.All(c => c.ProviderId != x.ProviderId)).ToList();
var info = new List<PlexRecentlyAddedModel>(); var info = new List<PlexRecentlyAddedModel>();
foreach (var m in filteredMovies) foreach (var m in filteredMovies)
{ {
var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, m.ItemId); var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, m.ItemId);
if (i.Video == null)
{
continue;
}
info.Add(new PlexRecentlyAddedModel info.Add(new PlexRecentlyAddedModel
{ {
Metadata = i, Metadata = i,
@ -132,10 +136,14 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
GenerateMovieHtml(info, sb); GenerateMovieHtml(info, sb);
info.Clear(); info.Clear();
foreach (var t in series) foreach (var t in filteredSeries)
{ {
var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, t.ItemId); var i = Api.GetMetadata(plexSettings.PlexAuthToken, plexSettings.FullUri, t.ItemId);
if (i.Directory == null)
{
continue;
}
//var ep = filteredEp.Where(x => x.ShowTitle == t.Title); //var ep = filteredEp.Where(x => x.ShowTitle == t.Title);
info.Add(new PlexRecentlyAddedModel info.Add(new PlexRecentlyAddedModel
{ {
@ -183,6 +191,14 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
AddedAt = DateTime.UtcNow AddedAt = DateTime.UtcNow
}); });
} }
foreach (var a in filteredSeries)
{
RecentlyAddedLog.Insert(new RecentlyAddedLog
{
ProviderId = a.ProviderId,
AddedAt = DateTime.UtcNow
});
}
} }
var escapedHtml = new string(html.Where(c => !char.IsControl(c)).ToArray()); var escapedHtml = new string(html.Where(c => !char.IsControl(c)).ToArray());

3
Ombi.Store/TableCreation.cs
View file

@ -25,6 +25,7 @@
// *********************************************************************** // ***********************************************************************
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
@ -61,7 +62,7 @@ namespace Ombi.Store
{ {
connection.Open(); connection.Open();
var result = connection.Query<TableInfo>($"PRAGMA table_info({tableName});"); var result = connection.Query<TableInfo>($"PRAGMA table_info({tableName});");
if (result.Any(x => x.name == newColumn)) if (result.Any(x => x.name.Equals(newColumn, StringComparison.CurrentCultureIgnoreCase)))
{ {
connection.Close(); connection.Close();
return; return;