diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-24 13:49:07 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-24 13:49:07 -0400 |
| commit | 0ff432ea4e9d2b988a1af85e1c4a459ba5eb2988 (patch) | |
| tree | ac58d04d32db50349bc0bf2443115c92af118000 | |
| parent | cc25bd579b820a91e436a358f38321d254c27451 (diff) | |
Addede VfType to DtoBaseItem
| -rw-r--r-- | MediaBrowser.Api/ApiService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Kernel.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/DTO/DTOBaseItem.cs | 5 | ||||
| -rw-r--r-- | 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 ab0f46e42..5bad7fe5d 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 c4f36e732..78b19282c 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 53d921d45..1251f4ec4 100644 --- a/MediaBrowser.Model/DTO/DTOBaseItem.cs +++ b/MediaBrowser.Model/DTO/DTOBaseItem.cs @@ -84,6 +84,11 @@ namespace MediaBrowser.Model.DTO 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>
public UserItemData UserData { get; set; }
diff --git a/MediaBrowser.Model/DTO/IBNItem.cs b/MediaBrowser.Model/DTO/IBNItem.cs index de89aa937..fa5d72c85 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
{
|