Merge pull request #2281 from MediaBrowser/dev

Dev

1 files changed, 9 insertions, 32 deletions

diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index eff77574d3..07773d846b 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -1,14 +1,13 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Playlists;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Querying;
-using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Server.Implementations.Playlists
 {
@@ -29,6 +28,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
             return base.GetEligibleChildrenForRecursiveChildren(user).OfType<Playlist>();
         }
 
+        [IgnoreDataMember]
         public override bool IsHidden
         {
             get
@@ -37,9 +37,10 @@ namespace MediaBrowser.Server.Implementations.Playlists
             }
         }
 
+        [IgnoreDataMember]
         public override string CollectionType
         {
-            get { return Model.Entities.CollectionType.Playlists; }
+            get { return MediaBrowser.Model.Entities.CollectionType.Playlists; }
         }
 
         protected override Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query)
@@ -48,29 +49,5 @@ namespace MediaBrowser.Server.Implementations.Playlists
             return base.GetItemsInternal(query);
         }
     }
-
-    public class PlaylistsDynamicFolder : IVirtualFolderCreator
-    {
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        public PlaylistsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
-        {
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-        }
-
-        public BasePluginFolder GetFolder()
-        {
-            var path = Path.Combine(_appPaths.DataPath, "playlists");
-
-			_fileSystem.CreateDirectory(path);
-
-            return new PlaylistsFolder
-            {
-                Path = path
-            };
-        }
-    }
 }