From 853dbfc558e271d2287ff30c774884072ee1aa6e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 29 Dec 2016 02:14:59 -0500
Subject: separate player selection into it's own script

---
 MediaBrowser.Providers/Chapters/ChapterManager.cs  | 20 -----------------
 MediaBrowser.Providers/Manager/ProviderManager.cs  | 26 +++++++++-------------
 .../MediaInfo/FFProbeVideoInfo.cs                  |  2 +-
 3 files changed, 11 insertions(+), 37 deletions(-)

(limited to 'MediaBrowser.Providers')

diff --git a/MediaBrowser.Providers/Chapters/ChapterManager.cs b/MediaBrowser.Providers/Chapters/ChapterManager.cs
index 87aaafb39f..5fea2c3cdb 100644
--- a/MediaBrowser.Providers/Chapters/ChapterManager.cs
+++ b/MediaBrowser.Providers/Chapters/ChapterManager.cs
@@ -43,25 +43,5 @@ namespace MediaBrowser.Providers.Chapters
         {
             return _itemRepo.SaveChapters(new Guid(itemId), chapters, cancellationToken);
         }
-
-        public ChapterOptions GetConfiguration()
-        {
-            return _config.GetConfiguration<ChapterOptions>("chapters");
-        }
-    }
-
-    public class ChapterConfigurationStore : IConfigurationFactory
-    {
-        public IEnumerable<ConfigurationStore> GetConfigurations()
-        {
-            return new List<ConfigurationStore>
-            {
-                new ConfigurationStore
-                {
-                    Key = "chapters",
-                    ConfigurationType = typeof (ChapterOptions)
-                }
-            };
-        }
     }
 }
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index a2f3d04596..a645ab55f9 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -510,25 +510,19 @@ namespace MediaBrowser.Providers.Manager
                 Type = MetadataPluginType.LocalMetadataProvider
             }));
 
-            if (item.IsInternetMetadataEnabled())
+            // Fetchers
+            list.AddRange(providers.Where(i => (i is IRemoteMetadataProvider)).Select(i => new MetadataPlugin
             {
-                // Fetchers
-                list.AddRange(providers.Where(i => (i is IRemoteMetadataProvider)).Select(i => new MetadataPlugin
-                {
-                    Name = i.Name,
-                    Type = MetadataPluginType.MetadataFetcher
-                }));
-            }
+                Name = i.Name,
+                Type = MetadataPluginType.MetadataFetcher
+            }));
 
-            if (item.IsSaveLocalMetadataEnabled())
+            // Savers
+            list.AddRange(_savers.Where(i => IsSaverEnabledForItem(i, item, ItemUpdateType.MetadataEdit, true)).OrderBy(i => i.Name).Select(i => new MetadataPlugin
             {
-                // Savers
-                list.AddRange(_savers.Where(i => IsSaverEnabledForItem(i, item, ItemUpdateType.MetadataEdit, true)).OrderBy(i => i.Name).Select(i => new MetadataPlugin
-                {
-                    Name = i.Name,
-                    Type = MetadataPluginType.MetadataSaver
-                }));
-            }
+                Name = i.Name,
+                Type = MetadataPluginType.MetadataSaver
+            }));
         }
 
         private void AddImagePlugins<T>(List<MetadataPlugin> list, T item, List<IImageProvider> imageProviders)
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index c1bae4b3cb..c4ea13063e 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -417,7 +417,7 @@ namespace MediaBrowser.Providers.MediaInfo
             }
             if (!string.IsNullOrWhiteSpace(data.Name))
             {
-                if (string.IsNullOrWhiteSpace(video.Name) || string.Equals(video.Name, Path.GetFileNameWithoutExtension(video.Path), StringComparison.OrdinalIgnoreCase))
+                if (string.IsNullOrWhiteSpace(video.Name) || (string.Equals(video.Name, Path.GetFileNameWithoutExtension(video.Path), StringComparison.OrdinalIgnoreCase) && !video.ProviderIds.Any()))
                 {
                     // Don't use the embedded name for extras because it will often be the same name as the movie
                     if (!video.ExtraType.HasValue && !video.IsOwnedItem)
-- 
cgit v1.2.3