From 8b39ed2f63a08597e1faf368c3c0506dbe960127 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Sat, 8 Sep 2012 15:05:18 -0400 Subject: Moved TV into the main project and added Series properties to DTOBaseItem --- MediaBrowser.Model/DTO/DTOBaseItem.cs | 2 +- MediaBrowser.Model/Entities/TV/Episode.cs | 7 +++++++ MediaBrowser.Model/Entities/TV/Season.cs | 28 ++++++++++++++++++++++++++++ MediaBrowser.Model/Entities/TV/Series.cs | 12 ++++++++++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 3 +++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 MediaBrowser.Model/Entities/TV/Episode.cs create mode 100644 MediaBrowser.Model/Entities/TV/Season.cs create mode 100644 MediaBrowser.Model/Entities/TV/Series.cs (limited to 'MediaBrowser.Model') diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/DTOBaseItem.cs index 149b5ba683..e1bc9c65b2 100644 --- a/MediaBrowser.Model/DTO/DTOBaseItem.cs +++ b/MediaBrowser.Model/DTO/DTOBaseItem.cs @@ -157,7 +157,7 @@ namespace MediaBrowser.Model.DTO public VideoInfo VideoInfo { get; set; } [ProtoMember(44)] - public VideoInfo SeriesInfo { get; set; } + public SeriesInfo SeriesInfo { get; set; } [ProtoMember(45)] public bool IsNew { get; set; } diff --git a/MediaBrowser.Model/Entities/TV/Episode.cs b/MediaBrowser.Model/Entities/TV/Episode.cs new file mode 100644 index 0000000000..b7c46fdc74 --- /dev/null +++ b/MediaBrowser.Model/Entities/TV/Episode.cs @@ -0,0 +1,7 @@ + +namespace MediaBrowser.Model.Entities.TV +{ + public class Episode : Video + { + } +} diff --git a/MediaBrowser.Model/Entities/TV/Season.cs b/MediaBrowser.Model/Entities/TV/Season.cs new file mode 100644 index 0000000000..d63c68aa13 --- /dev/null +++ b/MediaBrowser.Model/Entities/TV/Season.cs @@ -0,0 +1,28 @@ +using System; + +namespace MediaBrowser.Model.Entities.TV +{ + public class Season : Folder + { + /// + /// Store these to reduce disk access in Episode Resolver + /// + public string[] MetadataFiles { get; set; } + + /// + /// Determines if the metafolder contains a given file + /// + public bool ContainsMetadataFile(string file) + { + for (int i = 0; i < MetadataFiles.Length; i++) + { + if (MetadataFiles[i].Equals(file, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + } + + return false; + } + } +} diff --git a/MediaBrowser.Model/Entities/TV/Series.cs b/MediaBrowser.Model/Entities/TV/Series.cs new file mode 100644 index 0000000000..fd05f89004 --- /dev/null +++ b/MediaBrowser.Model/Entities/TV/Series.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; + +namespace MediaBrowser.Model.Entities.TV +{ + public class Series : Folder + { + public string Status { get; set; } + public IEnumerable AirDays { get; set; } + public string AirTime { get; set; } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index aeb75d7f18..cd93c92bdf 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -54,6 +54,9 @@ + + + -- cgit v1.2.3