aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/BaseItem.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-04-10 10:49:03 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-04-10 10:49:03 -0400
commitfbbab13b3134a0d6179e42fd8dbbc629654c1c28 (patch)
treee82ce1630842023b6a0c39a2275871bc95294f53 /MediaBrowser.Controller/Entities/BaseItem.cs
parent4f7e8fee24ead08d114f41e9fd9c1c7b4dd55359 (diff)
fix library changed
Diffstat (limited to 'MediaBrowser.Controller/Entities/BaseItem.cs')
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs31
1 files changed, 22 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index f8384ea1c..a1bcde9e6 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1144,6 +1144,11 @@ namespace MediaBrowser.Controller.Entities
public virtual bool IsVisibleStandalone(User user)
{
+ return IsVisibleStandaloneInternal(user, true);
+ }
+
+ protected bool IsVisibleStandaloneInternal(User user, bool checkFolders)
+ {
if (!IsVisible(user))
{
return false;
@@ -1154,17 +1159,25 @@ namespace MediaBrowser.Controller.Entities
return false;
}
- var topParent = Parents.LastOrDefault() ?? this;
-
- if (string.IsNullOrWhiteSpace(topParent.Path))
+ if (checkFolders)
{
- return true;
- }
+ var topParent = Parents.LastOrDefault() ?? this;
- var folders = user.RootFolder.GetChildren(user, true).Select(i => i.Id).ToList();
- var itemCollectionFolders = LibraryManager.GetCollectionFolders(this).Select(i => i.Id).ToList();
+ if (string.IsNullOrWhiteSpace(topParent.Path))
+ {
+ return true;
+ }
- return itemCollectionFolders.Any(folders.Contains);
+ var userCollectionFolders = user.RootFolder.GetChildren(user, true).Select(i => i.Id).ToList();
+ var itemCollectionFolders = LibraryManager.GetCollectionFolders(this).Select(i => i.Id);
+
+ if (!itemCollectionFolders.Any(userCollectionFolders.Contains))
+ {
+ return false;
+ }
+ }
+
+ return true;
}
/// <summary>
@@ -1669,7 +1682,7 @@ namespace MediaBrowser.Controller.Entities
else
{
existing.DateModified = FileSystem.GetLastWriteTimeUtc(newImage);
- existing.Length = ((FileInfo) newImage).Length;
+ existing.Length = ((FileInfo)newImage).Length;
}
}