diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-05-04 12:34:15 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-05-04 12:34:15 -0400 |
| commit | de78c341026d1816e1470c9b1ff8ca765391f166 (patch) | |
| tree | dcc41df5793d22eaa8ba1e45f1632c7328f3ea3d /MediaBrowser.Controller | |
| parent | b01c12ca9ccb3df52321df84b21a1695ee17b750 (diff) | |
| parent | 107d1fc4f136813eed648dda5d18f433ed9302e2 (diff) | |
Merge pull request #1708 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/InternalItemsQuery.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/ILibraryManager.cs | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs index b148251ff1..6838fde714 100644 --- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs +++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs @@ -48,7 +48,8 @@ namespace MediaBrowser.Controller.Entities public string PresentationUniqueKey { get; set; } public string Path { get; set; } - + public string Name { get; set; } + public string Person { get; set; } public string[] PersonIds { get; set; } public string[] ItemIds { get; set; } @@ -107,6 +108,7 @@ namespace MediaBrowser.Controller.Entities internal List<Guid> ItemIdsFromPersonFilters { get; set; } public int? ParentIndexNumber { get; set; } + public int? IndexNumber { get; set; } public int? MinParentalRating { get; set; } public int? MaxParentalRating { get; set; } diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index 5388b8668f..07ba41b3d7 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -569,5 +569,8 @@ namespace MediaBrowser.Controller.Library /// <param name="parent">The parent.</param> /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns> bool IgnoreFile(FileSystemMetadata file, BaseItem parent); + + void AddVirtualFolder(string name, string collectionType, string[] mediaPaths, bool refreshLibrary); + void AddMediaPath(string virtualFolderName, string path); } }
\ No newline at end of file |
