aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-01-11 12:56:26 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-01-11 12:56:26 -0500
commit0b5d4ce3f839118a0a5903ec278321ecfecf1c32 (patch)
tree10ddadb459f400a6711b2ea5babd4c47e5ba078e /MediaBrowser.Controller
parent12f20de68b3e988b27286a1f25175a2fe91db5a8 (diff)
fix live tv folders being created in a loop
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs2
-rw-r--r--MediaBrowser.Controller/Entities/ICollectionFolder.cs13
2 files changed, 1 insertions, 14 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index c8bdbd1942..cdd503bba4 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -647,7 +647,7 @@ namespace MediaBrowser.Controller.Entities
private static bool ContainsPath(string parent, string path)
{
- return string.Equals(parent, path, StringComparison.OrdinalIgnoreCase) || FileSystem.ContainsSubPath(parent, path);
+ return FileSystem.AreEqual(parent, path) || FileSystem.ContainsSubPath(parent, path);
}
/// <summary>
diff --git a/MediaBrowser.Controller/Entities/ICollectionFolder.cs b/MediaBrowser.Controller/Entities/ICollectionFolder.cs
index f4544f173e..d8b02034c7 100644
--- a/MediaBrowser.Controller/Entities/ICollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/ICollectionFolder.cs
@@ -20,17 +20,4 @@ namespace MediaBrowser.Controller.Entities
{
bool EnableUserSpecificView { get; }
}
-
- public static class CollectionFolderExtensions
- {
- public static string GetViewType(this ICollectionFolder folder, User user)
- {
- if (user.Configuration.PlainFolderViews.Contains(folder.Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
- {
- return null;
- }
-
- return folder.CollectionType;
- }
- }
}