All calls to get items now require passing in a userId. Made the model project portable. Also filled in more api calls.

10 files changed, 53 insertions, 59 deletions

diff --git a/MediaBrowser.Model/Entities/Audio.cs b/MediaBrowser.Model/Entities/Audio.cs
index b243411ad..bfd739b5a 100644
--- a/MediaBrowser.Model/Entities/Audio.cs
+++ b/MediaBrowser.Model/Entities/Audio.cs
@@ -1,9 +1,4 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Threading.Tasks;

-

+

 namespace MediaBrowser.Model.Entities

 {

     public class Audio : BaseItem

diff --git a/MediaBrowser.Model/Entities/BaseItem.cs b/MediaBrowser.Model/Entities/BaseItem.cs
index a9c564a28..165328ac7 100644
--- a/MediaBrowser.Model/Entities/BaseItem.cs
+++ b/MediaBrowser.Model/Entities/BaseItem.cs
@@ -51,6 +51,7 @@ namespace MediaBrowser.Model.Entities
         public virtual string AspectRatio { get; set; }

         public virtual int? ProductionYear { get; set; }

 

+        [IgnoreDataMember]

         public virtual IEnumerable<Video> LocalTrailers { get; set; }

 

         public virtual string TrailerUrl { get; set; }

@@ -63,17 +64,6 @@ namespace MediaBrowser.Model.Entities
         /// <summary>

         /// This is strictly to enhance json output, until I can find a way to customize service stack to add this without having to use a property

         /// </summary>

-        public virtual bool IsFolder

-        {

-            get

-            {

-                return false;

-            }

-        }

-

-        /// <summary>

-        /// This is strictly to enhance json output, until I can find a way to customize service stack to add this without having to use a property

-        /// </summary>

         public string Type

         {

             get

diff --git a/MediaBrowser.Model/Entities/CategoryInfo.cs b/MediaBrowser.Model/Entities/CategoryInfo.cs
new file mode 100644
index 000000000..adf8ac7d9
--- /dev/null
+++ b/MediaBrowser.Model/Entities/CategoryInfo.cs
@@ -0,0 +1,21 @@
+

+namespace MediaBrowser.Model.Entities

+{

+    /// <summary>

+    /// This is a stub class used by the api to get IBN types in a compact format

+    /// </summary>

+    public class CategoryInfo

+    {

+        /// <summary>

+        /// The name of the genre, year, studio, etc

+        /// </summary>

+        public string Name { get; set; }

+

+        public string PrimaryImagePath { get; set; }

+

+        /// <summary>

+        /// The number of items that have the genre, year, studio, etc

+        /// </summary>

+        public int ItemCount { get; set; }

+    }

+}

diff --git a/MediaBrowser.Model/Entities/Folder.cs b/MediaBrowser.Model/Entities/Folder.cs
index 5ae47fea3..edcb981de 100644
--- a/MediaBrowser.Model/Entities/Folder.cs
+++ b/MediaBrowser.Model/Entities/Folder.cs
@@ -18,25 +18,12 @@ namespace MediaBrowser.Model.Entities
             }

         }

 

-        public override bool IsFolder

-        {

-            get

-            {

-                return true;

-            }

-        }

-

         [IgnoreDataMember]

         public BaseItem[] Children { get; set; }

 

         [IgnoreDataMember]

         public IEnumerable<Folder> FolderChildren { get { return Children.OfType<Folder>(); } }

 

-        public Folder GetFolderByName(string name)

-        {

-            return FolderChildren.FirstOrDefault(f => System.IO.Path.GetFileName(f.Path).Equals(name, StringComparison.OrdinalIgnoreCase));

-        }

-

         /// <summary>

         /// Finds an item by ID, recursively

         /// </summary>

diff --git a/MediaBrowser.Model/Entities/Genre.cs b/MediaBrowser.Model/Entities/Genre.cs
new file mode 100644
index 000000000..79dea52be
--- /dev/null
+++ b/MediaBrowser.Model/Entities/Genre.cs
@@ -0,0 +1,7 @@
+

+namespace MediaBrowser.Model.Entities

+{

+    public class Genre : BaseItem

+    {

+    }

+}

diff --git a/MediaBrowser.Model/Entities/Person.cs b/MediaBrowser.Model/Entities/Person.cs
index 521adb50c..93f541a18 100644
--- a/MediaBrowser.Model/Entities/Person.cs
+++ b/MediaBrowser.Model/Entities/Person.cs
@@ -1,9 +1,4 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Threading.Tasks;

-

+

 namespace MediaBrowser.Model.Entities

 {

     /// <summary>

@@ -26,8 +21,9 @@ namespace MediaBrowser.Model.Entities
 

     public enum PersonType

     {

-        Actor = 1,

-        Director = 2,

-        Writer = 3

+        Actor,

+        Director,

+        Writer,

+        Producer

     }

 }

diff --git a/MediaBrowser.Model/Entities/PlaybackStatus.cs b/MediaBrowser.Model/Entities/PlaybackStatus.cs
deleted file mode 100644
index 042cfe098..000000000
--- a/MediaBrowser.Model/Entities/PlaybackStatus.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Threading.Tasks;

-

-namespace MediaBrowser.Model.Entities

-{

-    public class PlaybackStatus

-    {

-    }

-}

diff --git a/MediaBrowser.Model/Entities/Studio.cs b/MediaBrowser.Model/Entities/Studio.cs
new file mode 100644
index 000000000..da9582aed
--- /dev/null
+++ b/MediaBrowser.Model/Entities/Studio.cs
@@ -0,0 +1,7 @@
+

+namespace MediaBrowser.Model.Entities

+{

+    public class Studio : BaseItem

+    {

+    }

+}

diff --git a/MediaBrowser.Model/Entities/Video.cs b/MediaBrowser.Model/Entities/Video.cs
index 8b27f47c8..4d7b473bb 100644
--- a/MediaBrowser.Model/Entities/Video.cs
+++ b/MediaBrowser.Model/Entities/Video.cs
@@ -1,8 +1,4 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Threading.Tasks;

+using System.Collections.Generic;

 

 namespace MediaBrowser.Model.Entities

 {

@@ -35,8 +31,8 @@ namespace MediaBrowser.Model.Entities
 

     public enum VideoType

     {

-        VideoFile = 1,

-        DVD = 2,

-        BluRay = 3

+        VideoFile,

+        DVD,

+        BluRay

     }

 }

diff --git a/MediaBrowser.Model/Entities/Year.cs b/MediaBrowser.Model/Entities/Year.cs
new file mode 100644
index 000000000..6c25f2ac5
--- /dev/null
+++ b/MediaBrowser.Model/Entities/Year.cs
@@ -0,0 +1,7 @@
+

+namespace MediaBrowser.Model.Entities

+{

+    public class Year : BaseItem

+    {

+    }

+}