From 0ff432ea4e9d2b988a1af85e1c4a459ba5eb2988 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Fri, 24 Aug 2012 13:49:07 -0400
Subject: [PATCH] Addede VfType to DtoBaseItem

---
 MediaBrowser.Api/ApiService.cs        | 7 +++++++
 MediaBrowser.Controller/Kernel.cs     | 6 ++++--
 MediaBrowser.Model/DTO/DTOBaseItem.cs | 5 +++++
 MediaBrowser.Model/DTO/IBNItem.cs     | 4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs
index ab0f46e423..5bad7fe5d5 100644
--- a/MediaBrowser.Api/ApiService.cs
+++ b/MediaBrowser.Api/ApiService.cs
@@ -107,6 +107,13 @@ namespace MediaBrowser.Api
             dto.Type = item.GetType().Name;
             dto.UserRating = item.UserRating;
 
+            VirtualFolder virtualFolder = item.VirtualFolder;
+
+            if (virtualFolder != null)
+            {
+                dto.VfType = virtualFolder.CollectionType;
+            }
+
             dto.UserData = item.GetUserData(user);
 
             Folder folder = item as Folder;
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index c4f36e7324..78b19282c4 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -243,12 +243,14 @@ namespace MediaBrowser.Controller
             {
                 var provider = MetadataProviders[i];
 
-                if (!provider.Supports(item))
+                // Skip if internet providers are currently disabled
+                if (provider.RequiresInternet && (!Configuration.EnableInternetProviders || !allowInternetProviders))
                 {
                     continue;
                 }
 
-                if (provider.RequiresInternet && (!Configuration.EnableInternetProviders || !allowInternetProviders))
+                // Skip if the provider doesn't support the current item
+                if (!provider.Supports(item))
                 {
                     continue;
                 }
diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/DTOBaseItem.cs
index 53d921d45c..1251f4ec40 100644
--- a/MediaBrowser.Model/DTO/DTOBaseItem.cs
+++ b/MediaBrowser.Model/DTO/DTOBaseItem.cs
@@ -83,6 +83,11 @@ namespace MediaBrowser.Model.DTO
         public IEnumerable<DTOBaseItem> LocalTrailers { get; set; }
         public int LocalTrailerCount { get; set; }
 
+        /// <summary>
+        /// Holds the virtual folder collection type
+        /// </summary>
+        public string VfType { get; set; }
+
         /// <summary>
         /// User data for this item based on the user it's being requested for
         /// </summary>
diff --git a/MediaBrowser.Model/DTO/IBNItem.cs b/MediaBrowser.Model/DTO/IBNItem.cs
index de89aa9372..fa5d72c857 100644
--- a/MediaBrowser.Model/DTO/IBNItem.cs
+++ b/MediaBrowser.Model/DTO/IBNItem.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Model.DTO
     }
 
     /// <summary>
-    /// This is used by BaseItemContainer
+    /// This is used by the api to get information about a Person within a BaseItem
     /// </summary>
     public class BaseItemPerson
     {
@@ -38,7 +38,7 @@ namespace MediaBrowser.Model.DTO
     }
 
     /// <summary>
-    /// This is used by BaseItemContainer
+    /// This is used by the api to get information about a studio within a BaseItem
     /// </summary>
     public class BaseItemStudio
     {