diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-23 08:59:40 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-23 08:59:40 -0400 |
| commit | 977f8e970a74536276ba6c91055008bd4c851439 (patch) | |
| tree | 24d0387550417f26f3ce7b36d7d8712b693add96 | |
| parent | 4527a187387295d73568bc3eef18aaad78633dfd (diff) | |
Added VideoType.ISO and trimmed Person output size
| -rw-r--r-- | MediaBrowser.Api/ApiService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/VideoResolver.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/DTO/IBNItem.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/Video.cs | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs index dd9c575f11..f52141a64b 100644 --- a/MediaBrowser.Api/ApiService.cs +++ b/MediaBrowser.Api/ApiService.cs @@ -206,7 +206,9 @@ namespace MediaBrowser.Api {
BaseItemPerson baseItemPerson = new BaseItemPerson();
- baseItemPerson.PersonInfo = p;
+ baseItemPerson.Name = p.Name;
+ baseItemPerson.Overview = p.Overview;
+ baseItemPerson.Type = p.Type;
Person ibnObject = entities.First(i => i.Name.Equals(p.Name, StringComparison.OrdinalIgnoreCase));
@@ -263,7 +265,7 @@ namespace MediaBrowser.Api {
Id = entity.Id,
BaseItemCount = itemCount,
- HasPrimaryImage = !string.IsNullOrEmpty(entity.PrimaryImagePath),
+ HasImage = !string.IsNullOrEmpty(entity.PrimaryImagePath),
Name = entity.Name
};
}
diff --git a/MediaBrowser.Controller/Resolvers/VideoResolver.cs b/MediaBrowser.Controller/Resolvers/VideoResolver.cs index cdb33837f3..4b9fcfd39f 100644 --- a/MediaBrowser.Controller/Resolvers/VideoResolver.cs +++ b/MediaBrowser.Controller/Resolvers/VideoResolver.cs @@ -30,9 +30,11 @@ namespace MediaBrowser.Controller.Resolvers {
if (IsVideoFile(args.Path))
{
+ VideoType type = Path.GetExtension(args.Path).EndsWith("", System.StringComparison.OrdinalIgnoreCase) ? VideoType.Iso : VideoType.VideoFile;
+
return new T()
{
- VideoType = VideoType.VideoFile,
+ VideoType = type,
Path = args.Path
};
}
diff --git a/MediaBrowser.Model/DTO/IBNItem.cs b/MediaBrowser.Model/DTO/IBNItem.cs index 9748c5e7f7..de89aa9372 100644 --- a/MediaBrowser.Model/DTO/IBNItem.cs +++ b/MediaBrowser.Model/DTO/IBNItem.cs @@ -18,7 +18,7 @@ namespace MediaBrowser.Model.DTO /// </summary>
public Guid Id { get; set; }
- public bool HasPrimaryImage { get; set; }
+ public bool HasImage { get; set; }
/// <summary>
/// The number of items that have the genre, year, studio, etc
@@ -31,7 +31,9 @@ namespace MediaBrowser.Model.DTO /// </summary>
public class BaseItemPerson
{
- public PersonInfo PersonInfo { get; set; }
+ public string Name { get; set; }
+ public string Overview { get; set; }
+ public string Type { get; set; }
public bool HasImage { get; set; }
}
diff --git a/MediaBrowser.Model/Entities/Video.cs b/MediaBrowser.Model/Entities/Video.cs index fab22abd37..6fa3f56fea 100644 --- a/MediaBrowser.Model/Entities/Video.cs +++ b/MediaBrowser.Model/Entities/Video.cs @@ -37,6 +37,7 @@ namespace MediaBrowser.Model.Entities public enum VideoType
{
VideoFile,
+ Iso,
DVD,
BluRay
}
|