aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-01 00:06:28 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-01 00:06:28 -0400
commit43943657b7ea0c607f998c6397d3878e3fb05c5f (patch)
tree3ac5009b82a2366bed09be8b0222a53a9c8c57de /MediaBrowser.Controller
parentf77209cf77aebd2ba8a8f35de41cbbaeaf36a47a (diff)
add additional view settings
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Collections/ICollectionManager.cs7
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs5
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs5
3 files changed, 16 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs
index b63c49f99a..fdb2a49755 100644
--- a/MediaBrowser.Controller/Collections/ICollectionManager.cs
+++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs
@@ -38,5 +38,12 @@ namespace MediaBrowser.Controller.Collections
/// <param name="user">The user.</param>
/// <returns>IEnumerable{BaseItem}.</returns>
IEnumerable<BaseItem> CollapseItemsWithinBoxSets(IEnumerable<BaseItem> items, User user);
+
+ /// <summary>
+ /// Gets the collections folder.
+ /// </summary>
+ /// <param name="userId">The user identifier.</param>
+ /// <returns>Folder.</returns>
+ Folder GetCollectionsFolder(string userId);
}
}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a2ff1b4fdf..524d7097ba 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -134,6 +134,11 @@ namespace MediaBrowser.Controller.Entities
}
}
+ public virtual bool IsHiddenFromUser(User user)
+ {
+ return false;
+ }
+
[IgnoreDataMember]
public virtual bool IsOwnedItem
{
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index f503a5ff44..e54e72cd8d 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -809,7 +809,10 @@ namespace MediaBrowser.Controller.Entities
{
if (filter == null || filter(child))
{
- list.Add(child);
+ if (!child.IsHiddenFromUser(user))
+ {
+ list.Add(child);
+ }
}
if (recursive && child.IsFolder)