From 314a51dff3f070be75bcaf00be244977fdd3ceb5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 11 Oct 2014 21:46:02 -0400
Subject: add more device options

---
 MediaBrowser.Controller/Devices/IDeviceManager.cs  |  3 ++-
 .../Entities/ICollectionFolder.cs                  |  5 +++-
 MediaBrowser.Controller/Entities/UserView.cs       | 29 +---------------------
 3 files changed, 7 insertions(+), 30 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs
index b82c39effc..e66de42bb1 100644
--- a/MediaBrowser.Controller/Devices/IDeviceManager.cs
+++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs
@@ -13,9 +13,10 @@ namespace MediaBrowser.Controller.Devices
         /// </summary>
         /// <param name="reportedId">The reported identifier.</param>
         /// <param name="name">The name.</param>
+        /// <param name="appName">Name of the application.</param>
         /// <param name="usedByUserId">The used by user identifier.</param>
         /// <returns>Task.</returns>
-        Task RegisterDevice(string reportedId, string name, string usedByUserId);
+        Task RegisterDevice(string reportedId, string name, string appName, string usedByUserId);
 
         /// <summary>
         /// Saves the capabilities.
diff --git a/MediaBrowser.Controller/Entities/ICollectionFolder.cs b/MediaBrowser.Controller/Entities/ICollectionFolder.cs
index 4c6346f7ee..656aa37ce6 100644
--- a/MediaBrowser.Controller/Entities/ICollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/ICollectionFolder.cs
@@ -1,4 +1,5 @@
-
+using System.Collections.Generic;
+
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
@@ -7,5 +8,7 @@ namespace MediaBrowser.Controller.Entities
     public interface ICollectionFolder
     {
         string CollectionType { get; }
+        string Path { get; }
+        IEnumerable<string> PhysicalLocations { get; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index bcbaa967a1..eb08a6f2fe 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Entities
@@ -60,7 +59,7 @@ namespace MediaBrowser.Controller.Entities
                 CollectionType.Trailers
             };
 
-            var collectionFolder = folder as CollectionFolder;
+            var collectionFolder = folder as ICollectionFolder;
 
             if (collectionFolder == null)
             {
@@ -70,30 +69,4 @@ namespace MediaBrowser.Controller.Entities
             return standaloneTypes.Contains(collectionFolder.CollectionType ?? string.Empty);
         }
     }
-
-    public class SpecialFolder : Folder
-    {
-        public SpecialFolderType SpecialFolderType { get; set; }
-        public string ItemTypeName { get; set; }
-        public string ParentId { get; set; }
-
-        public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
-        {
-            var parent = (Folder)LibraryManager.GetItemById(new Guid(ParentId));
-
-            if (SpecialFolderType == SpecialFolderType.ItemsByType)
-            {
-                var items = parent.GetRecursiveChildren(user, includeLinkedChildren);
-
-                return items.Where(i => string.Equals(i.GetType().Name, ItemTypeName, StringComparison.OrdinalIgnoreCase));
-            }
-
-            return new List<BaseItem>();
-        }
-    }
-
-    public enum SpecialFolderType
-    {
-        ItemsByType = 1
-    }
 }
-- 
cgit v1.2.3