diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-27 12:36:41 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-27 12:36:41 -0400 |
| commit | 5782d9084db2e3b4f2b5d4dfc8d5dfef02498906 (patch) | |
| tree | f8cbbd095c6a050fe4d7b6630868f246da4d23f5 /MediaBrowser.Model | |
| parent | c70f1047f7433102c54004b0f3c4d44a3b859882 (diff) | |
fixes #299 - Add trailer urls to MovieDbProvider
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaUrl.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index f5398ddd5..149029b59 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -160,7 +160,7 @@ namespace MediaBrowser.Model.Dto /// Gets or sets the trailer urls. /// </summary> /// <value>The trailer urls.</value> - public List<string> TrailerUrls { get; set; } + public List<MediaUrl> RemoteTrailers { get; set; } /// <summary> /// Gets or sets the provider ids. @@ -619,16 +619,6 @@ namespace MediaBrowser.Model.Dto /// </summary> /// <value><c>true</c> if this instance is video; otherwise, <c>false</c>.</value> [IgnoreDataMember] - public bool HasTrailer - { - get { return LocalTrailerCount > 0 || (TrailerUrls != null && TrailerUrls.Count > 0); } - } - - /// <summary> - /// Gets a value indicating whether this instance is video. - /// </summary> - /// <value><c>true</c> if this instance is video; otherwise, <c>false</c>.</value> - [IgnoreDataMember] public bool IsVideo { get { return string.Equals(MediaType, Entities.MediaType.Video, StringComparison.OrdinalIgnoreCase); } diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs new file mode 100644 index 000000000..b99879650 --- /dev/null +++ b/MediaBrowser.Model/Entities/MediaUrl.cs @@ -0,0 +1,11 @@ + +namespace MediaBrowser.Model.Entities +{ + public class MediaUrl + { + public string Url { get; set; } + public string Name { get; set; } + public bool? IsHD { get; set; } + public bool IsDirectLink { get; set; } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 06dfa776d..6b1c728e2 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -52,6 +52,7 @@ <Compile Include="Dto\ItemCounts.cs" /> <Compile Include="Dto\StudioDto.cs" /> <Compile Include="Entities\ItemReview.cs" /> + <Compile Include="Entities\MediaUrl.cs" /> <Compile Include="Entities\MetadataFields.cs" /> <Compile Include="Entities\Video3DFormat.cs" /> <Compile Include="Net\WebSocketMessage.cs" /> diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index a8a58d6a6..b6f452d7c 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -154,7 +154,7 @@ namespace MediaBrowser.Model.Querying /// <summary> /// The trailer url of the item /// </summary> - TrailerUrls, + RemoteTrailers, /// <summary> /// The user data of the item |