Merge pull request #2291 from MediaBrowser/dev

Dev

2 files changed, 43 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 10cac79922..cd61d2cce4 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -2134,7 +2134,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 MetadataCountryCode = GetPreferredMetadataCountryCode(),
                 MetadataLanguage = GetPreferredMetadataLanguage(),
-                Name = Name,
+                Name = GetNameForMetadataLookup(),
                 ProviderIds = ProviderIds,
                 IndexNumber = IndexNumber,
                 ParentIndexNumber = ParentIndexNumber,
@@ -2143,6 +2143,11 @@ namespace MediaBrowser.Controller.Entities
             };
         }
 
+        protected virtual string GetNameForMetadataLookup()
+        {
+            return Name;
+        }
+
         /// <summary>
         /// This is called before any metadata refresh and returns true or false indicating if changes were made
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
index fd9507afa0..08fcc00353 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
@@ -4,9 +4,12 @@ using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.LiveTv;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Controller.LiveTv
 {
@@ -236,6 +239,40 @@ namespace MediaBrowser.Controller.LiveTv
             }
         }
 
+        private LiveTvOptions GetConfiguration()
+        {
+            return ConfigurationManager.GetConfiguration<LiveTvOptions>("livetv");
+        }
+
+        private ListingsProviderInfo GetListingsProviderInfo()
+        {
+            if (string.Equals(ServiceName, "Emby", StringComparison.OrdinalIgnoreCase))
+            {
+                var config = GetConfiguration();
+
+                return config.ListingProviders.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i.MoviePrefix));
+            }
+
+            return null;
+        }
+
+        protected override string GetNameForMetadataLookup()
+        {
+            var name = base.GetNameForMetadataLookup();
+
+            var listings = GetListingsProviderInfo();
+
+            if (listings != null)
+            {
+                if (!string.IsNullOrWhiteSpace(listings.MoviePrefix))
+                {
+                    name = name.Replace(listings.MoviePrefix, string.Empty, StringComparison.OrdinalIgnoreCase).Trim();
+                }
+            }
+
+            return name;
+        }
+
         public override List<ExternalUrl> GetRelatedUrls()
         {
             var list = base.GetRelatedUrls();