From e9a5bb699e42d6d7aa166ab03a35bb64060828b4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 14 Jan 2014 15:24:56 -0500
Subject: [PATCH] added recording progress bars

---
 .../UserLibrary/GameGenresService.cs          |  1 -
 MediaBrowser.Controller/Entities/BaseItem.cs  | 24 +----------
 .../{IBaseItem.cs => ILibraryItem.cs}         |  2 +-
 .../Entities/TV/Episode.cs                    | 42 -------------------
 .../MediaBrowser.Controller.csproj            |  2 +-
 MediaBrowser.Model/LiveTv/RecordingInfoDto.cs |  8 +++-
 .../LiveTv/LiveTvDtoService.cs                | 12 ++++++
 7 files changed, 22 insertions(+), 69 deletions(-)
 rename MediaBrowser.Controller/Entities/{IBaseItem.cs => ILibraryItem.cs} (94%)

diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
index 77b1f4c542..79ee27df62 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 47b5247c37..c887f69779 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()
         {
@@ -504,28 +504,6 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The people.</value>
         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>
diff --git a/MediaBrowser.Controller/Entities/IBaseItem.cs b/MediaBrowser.Controller/Entities/ILibraryItem.cs
similarity index 94%
rename from MediaBrowser.Controller/Entities/IBaseItem.cs
rename to MediaBrowser.Controller/Entities/ILibraryItem.cs
index 83ccd55b0a..b2f39608f3 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 42897e09fe..61bf14543f 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -122,48 +122,6 @@ namespace MediaBrowser.Controller.Entities.TV
             return base.GetUserDataKey();
         }
 
-        /// <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>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index bb5e97621b..af3857f178 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 389df2248f..c1161f4ec1 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 ad9f769eb1..55fa47ff77 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)