From d63e4f5573b05847aceaea3137b71181a14f20de Mon Sep 17 00:00:00 2001
From: Luke <luke.pulverenti@gmail.com>
Date: Sun, 18 Dec 2016 00:11:30 -0500
Subject: [PATCH 1/2] update mac project

---
 MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index c4b1af7a86..dc61e19a0c 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -380,9 +380,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvitems.html">
       <Link>Resources\dashboard-ui\livetvitems.html</Link>
     </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvseriestimer.html">
-      <Link>Resources\dashboard-ui\livetvseriestimer.html</Link>
-    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvsettings.html">
       <Link>Resources\dashboard-ui\livetvsettings.html</Link>
     </BundleResource>
@@ -3167,9 +3164,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvschedule.js">
       <Link>Resources\dashboard-ui\scripts\livetvschedule.js</Link>
     </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimer.js">
-      <Link>Resources\dashboard-ui\scripts\livetvseriestimer.js</Link>
-    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimers.js">
       <Link>Resources\dashboard-ui\scripts\livetvseriestimers.js</Link>
     </BundleResource>

From fb8e3f0843b4a2fac3c986815e8ef539cc79a0f7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 18 Dec 2016 00:25:06 -0500
Subject: [PATCH 2/2] speed up timer query by id

---
 .../LiveTv/LiveTvManager.cs                        | 14 +++++++++++++-
 MediaBrowser.Model/LiveTv/TimerQuery.cs            |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 5e12fc9b98..265817cbe1 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -2009,6 +2009,14 @@ namespace Emby.Server.Implementations.LiveTv
                     .Where(i => _tvDtoService.GetInternalSeriesTimerId(i.Item2.Name, i.Item1.SeriesTimerId) == guid);
             }
 
+            if (!string.IsNullOrEmpty(query.Id))
+            {
+                var guid = new Guid(query.Id);
+
+                timers = timers
+                    .Where(i => _tvDtoService.GetInternalTimerId(i.Item2.Name, i.Item1.Id) == guid);
+            }
+
             var returnList = new List<TimerInfoDto>();
 
             foreach (var i in timers)
@@ -2143,7 +2151,11 @@ namespace Emby.Server.Implementations.LiveTv
 
         public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken)
         {
-            var results = await GetTimers(new TimerQuery(), cancellationToken).ConfigureAwait(false);
+            var results = await GetTimers(new TimerQuery
+            {
+                Id = id
+
+            }, cancellationToken).ConfigureAwait(false);
 
             return results.Items.FirstOrDefault(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));
         }
diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs
index 310dc486fe..c6202680c5 100644
--- a/MediaBrowser.Model/LiveTv/TimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs
@@ -8,6 +8,8 @@
         /// <value>The channel identifier.</value>
         public string ChannelId { get; set; }
 
+        public string Id { get; set; }
+
         /// <summary>
         /// Gets or sets the series timer identifier.
         /// </summary>