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

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse source 
Conflicts:
	PlexRequests.Services/Jobs/RecentlyAdded.cs
This commit is contained in:
Jim MacKenzie 2016-10-19 21:24:47 -05:00
commit 71446f0b59
34 changed files with 761 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

20
PlexRequests.Core/PlexReadOnlyDatabase.cs
View file

@ -28,6 +28,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using PlexRequests.Core.SettingModels;
using PlexRequests.Store;
using PlexRequests.Store.Models.Plex;
@ -44,7 +45,8 @@ namespace PlexRequests.Core
if (!string.IsNullOrEmpty(settings.PlexDatabaseLocationOverride))
{
Plex.DbLocation = settings.PlexDatabaseLocationOverride;
//Overriden setting
Plex.DbLocation = Path.Combine(settings.PlexDatabaseLocationOverride, "Plug-in Support", "Databases", "com.plexapp.plugins.library.db");
}
else if (Type.GetType("Mono.Runtime") != null)
{
@ -61,8 +63,20 @@ namespace PlexRequests.Core
public IEnumerable<MetadataItems> GetItemsAddedAfterDate(DateTime dateTime)
{
return Plex.QueryMetadataItems("select * from metadata_items where added_at > @AddedAt",
new { AddedAt = dateTime });
// type 1 = Movie, type 4 = TV Episode
var movies = Plex.QueryMetadataItems(@"SELECT * FROM metadata_items
WHERE added_at > @AddedAt
AND metadata_type = 1
AND title <> ''", new { AddedAt = dateTime });
// Custom query to include the series title
var tv = Plex.QueryMetadataItems(@"SELECT series.title AS SeriesTitle, mi.* FROM metadata_items mi
INNER JOIN metadata_items season ON mi.parent_id = season.id
INNER JOIN metadata_items series ON series.id = season.parent_id
WHERE mi.added_at > @AddedAt
AND mi.metadata_type = 4", new { AddedAt = dateTime });
return movies.Union(tv);
}
}
}