update detail page

3 files changed, 9 insertions, 10 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 14c3887df..a28e3faec 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -615,11 +615,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
         private ProgramInfo GetProgramInfoFromCache(string channelId, string programId)
         {
             var epgData = GetEpgDataForChannel(channelId);
-            if (epgData.Any())
-            {
-                return epgData.FirstOrDefault(p => p.Id == programId);
-            }
-            return null;
+            return epgData.FirstOrDefault(p => string.Equals(p.Id, programId, StringComparison.OrdinalIgnoreCase));
         }
 
         private string RecordingPath
@@ -670,9 +666,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
             allPrograms = GetProgramsForSeries(seriesTimer, allPrograms);
 
-            var recordingShowIds = currentRecordings.Select(i => i.ShowId).ToList();
+            var recordingShowIds = currentRecordings.Select(i => i.ProgramId).Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
 
-            allPrograms = allPrograms.Where(epg => !recordingShowIds.Contains(epg.ShowId, StringComparer.OrdinalIgnoreCase));
+            allPrograms = allPrograms.Where(i => !recordingShowIds.Contains(i.Id, StringComparer.OrdinalIgnoreCase));
 
             return allPrograms.Select(i => RecordingHelper.CreateTimer(i, seriesTimer));
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
index fca1bb012..db6e8de3f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
@@ -78,6 +78,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
             {
                 // They don't have dashes so try to normalize
                 program.OfficialRating = info.rating.Replace("TV", "TV-").Replace("--", "-");
+
+                var invalid = new[] { "N/A", "Approved", "Not Rated" };
+                if (invalid.Contains(program.OfficialRating, StringComparer.OrdinalIgnoreCase))
+                {
+                    program.OfficialRating = null;
+                }
             }
 
             if (!string.IsNullOrWhiteSpace(info.year))
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index a90fbaec8..412bb4742 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -742,9 +742,6 @@
     <Content Include="dashboard-ui\reports.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\livetvchannel.html">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

     <Content Include="dashboard-ui\livetvnewrecording.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>