From 68268cfb73d83c21df939a7992f3e4dcee9234f5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 27 Sep 2016 13:51:01 -0400
Subject: update closing of live streams

---
 .../Library/LibraryManager.cs                          | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index b076996df..a3930f36a 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -2550,9 +2550,25 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
+            var metadataPath = ConfigurationManager.Configuration.MetadataPath;
+            var metadataNetworkPath = ConfigurationManager.Configuration.MetadataNetworkPath;
+
+            if (!string.IsNullOrWhiteSpace(metadataPath) && !string.IsNullOrWhiteSpace(metadataNetworkPath))
+            {
+                var metadataSubstitutionResult = SubstitutePathInternal(path, metadataPath, metadataNetworkPath);
+                if (metadataSubstitutionResult.Item2)
+                {
+                    return metadataSubstitutionResult.Item1;
+                }
+            }
+
             foreach (var map in ConfigurationManager.Configuration.PathSubstitutions)
             {
-                path = SubstitutePath(path, map.From, map.To);
+                var substitutionResult = SubstitutePathInternal(path, map.From, map.To);
+                if (substitutionResult.Item2)
+                {
+                    return substitutionResult.Item1;
+                }
             }
 
             return path;
-- 
cgit v1.2.3


From f5d37ed659d88bfa00483deddbbf93c33c2e10d6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 28 Sep 2016 01:11:41 -0400
Subject: add guide settings

---
 .../Channels/RefreshChannelsScheduledTask.cs                          | 2 +-
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 005bbb852..5ac3da3db 100644
--- a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
         public string Category
         {
-            get { return "Channels"; }
+            get { return "Internet Channels"; }
         }
 
         public async Task Execute(System.Threading.CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index a3930f36a..f6fb158ae 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -2882,12 +2882,12 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var libraryOptions = CollectionFolder.GetLibraryOptions(virtualFolderPath);
 
-                SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
-
                 var list = libraryOptions.PathInfos.ToList();
                 list.Add(pathInfo);
                 libraryOptions.PathInfos = list.ToArray();
 
+                SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
+
                 CollectionFolder.SaveLibraryOptions(virtualFolderPath, libraryOptions);
             }
         }
-- 
cgit v1.2.3