diff options
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/GameGenresService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 24 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/ILibraryItem.cs (renamed from MediaBrowser.Controller/Entities/IBaseItem.cs) | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Episode.cs | 42 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/RecordingInfoDto.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs | 12 |
7 files changed, 22 insertions, 69 deletions
diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs index 77b1f4c54..79ee27df6 100644 --- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs @@ -1,6 +1,5 @@ using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.Dto; diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 47b5247c3..c887f6977 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// Class BaseItem /// </summary> - public abstract class BaseItem : IHasProviderIds, IBaseItem, IHasImages, IHasUserData + public abstract class BaseItem : IHasProviderIds, ILibraryItem, IHasImages, IHasUserData { protected BaseItem() { @@ -505,28 +505,6 @@ namespace MediaBrowser.Controller.Entities public List<PersonInfo> People { get; set; } /// <summary> - /// Override this if you need to combine/collapse person information - /// </summary> - /// <value>All people.</value> - [IgnoreDataMember] - public virtual IEnumerable<PersonInfo> AllPeople - { - get { return People; } - } - - [IgnoreDataMember] - public virtual IEnumerable<string> AllStudios - { - get { return Studios; } - } - - [IgnoreDataMember] - public virtual IEnumerable<string> AllGenres - { - get { return Genres; } - } - - /// <summary> /// Gets or sets the studios. /// </summary> /// <value>The studios.</value> diff --git a/MediaBrowser.Controller/Entities/IBaseItem.cs b/MediaBrowser.Controller/Entities/ILibraryItem.cs index 83ccd55b0..b2f39608f 100644 --- a/MediaBrowser.Controller/Entities/IBaseItem.cs +++ b/MediaBrowser.Controller/Entities/ILibraryItem.cs @@ -5,7 +5,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// Interface ILibraryItem /// </summary> - public interface IBaseItem + public interface ILibraryItem { /// <summary> /// Gets the name. diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 42897e09f..61bf14543 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -123,48 +123,6 @@ namespace MediaBrowser.Controller.Entities.TV } /// <summary> - /// Override this if you need to combine/collapse person information - /// </summary> - /// <value>All people.</value> - [IgnoreDataMember] - public override IEnumerable<PersonInfo> AllPeople - { - get - { - if (People == null) return Series != null ? Series.People : People; - return Series != null && Series.People != null ? People.Concat(Series.People) : base.AllPeople; - } - } - - /// <summary> - /// Gets all genres. - /// </summary> - /// <value>All genres.</value> - [IgnoreDataMember] - public override IEnumerable<string> AllGenres - { - get - { - if (Genres == null) return Series != null ? Series.Genres : Genres; - return Series != null && Series.Genres != null ? Genres.Concat(Series.Genres) : base.AllGenres; - } - } - - /// <summary> - /// Gets all studios. - /// </summary> - /// <value>All studios.</value> - [IgnoreDataMember] - public override IEnumerable<string> AllStudios - { - get - { - if (Studios == null) return Series != null ? Series.Studios : Studios; - return Series != null && Series.Studios != null ? Studios.Concat(Series.Studios) : base.AllStudios; - } - } - - /// <summary> /// Our rating comes from our series /// </summary> [IgnoreDataMember] diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index bb5e97621..af3857f17 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -99,7 +99,7 @@ <Compile Include="Entities\IHasTrailers.cs" /> <Compile Include="Entities\IHasUserData.cs" /> <Compile Include="Entities\IItemByName.cs" /> - <Compile Include="Entities\IBaseItem.cs" /> + <Compile Include="Entities\ILibraryItem.cs" /> <Compile Include="Entities\ImageSourceInfo.cs" /> <Compile Include="Entities\LinkedChild.cs" /> <Compile Include="Entities\MusicVideo.cs" /> diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs index 389df2248..c1161f4ec 100644 --- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs @@ -107,7 +107,13 @@ namespace MediaBrowser.Model.LiveTv /// </summary> /// <value>The name of the status.</value> public string StatusName { get; set; } - + + /// <summary> + /// Gets or sets the completion percentage. + /// </summary> + /// <value>The completion percentage.</value> + public double? CompletionPercentage { get; set; } + /// <summary> /// Genre of the program. /// </summary> diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index ad9f769eb..55fa47ff7 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -231,6 +231,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv }).ToList() }; + if (info.Status == RecordingStatus.InProgress) + { + var now = DateTime.UtcNow.Ticks; + var start = info.StartDate.Ticks; + var end = info.EndDate.Ticks; + + var pct = now - start; + pct /= end; + pct *= 100; + dto.CompletionPercentage = pct; + } + var imageTag = GetImageTag(recording); if (imageTag.HasValue) |