fix music artists not showing in collections

3 files changed, 33 insertions, 12 deletions

diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 4a3301252..020818361 100644
--- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Model.Tasks;
 
 namespace Emby.Server.Implementations.Channels
 {
-    class RefreshChannelsScheduledTask : IScheduledTask
+    class RefreshChannelsScheduledTask : IScheduledTask, IConfigurableScheduledTask
     {
         private readonly IChannelManager _channelManager;
         private readonly IUserManager _userManager;
@@ -39,6 +39,21 @@ namespace Emby.Server.Implementations.Channels
             get { return "Internet Channels"; }
         }
 
+        public bool IsHidden
+        {
+            get { return ((ChannelManager)_channelManager).Channels.Length == 0; }
+        }
+
+        public bool IsEnabled
+        {
+            get { return true; }
+        }
+
+        public bool IsLogged
+        {
+            get { return true; }
+        }
+
         public async Task Execute(System.Threading.CancellationToken cancellationToken, IProgress<double> progress)
         {
             var manager = (ChannelManager)_channelManager;
@@ -65,15 +80,5 @@ namespace Emby.Server.Implementations.Channels
         {
             get { return "RefreshInternetChannels"; }
         }
-
-        public bool IsHidden
-        {
-            get { return false; }
-        }
-
-        public bool IsEnabled
-        {
-            get { return true; }
-        }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index b3c7ecc9f..e210e2224 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -653,6 +653,14 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             // Schedules direct requires that the client support compression and will return a 400 response without it
             options.EnableHttpCompression = true;
 
+            // On windows 7 under .net core, this header is not getting added
+#if NETSTANDARD2_0
+            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            {
+                options.RequestHeaders["Accept-Encoding"] = "deflate";
+            }
+#endif
+
             try
             {
                 return await _httpClient.Post(options).ConfigureAwait(false);
@@ -684,6 +692,14 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             // Schedules direct requires that the client support compression and will return a 400 response without it
             options.EnableHttpCompression = true;
 
+            // On windows 7 under .net core, this header is not getting added
+#if NETSTANDARD2_0
+            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            {
+                options.RequestHeaders["Accept-Encoding"] = "deflate";
+            }
+#endif
+
             try
             {
                 return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index ce7145a79..12183aec2 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1266,7 +1266,7 @@ namespace MediaBrowser.Controller.Entities
 
                 var childOwner = child.IsOwnedItem ? (child.GetOwner() ?? child) : child;
 
-                if (childOwner != null)
+                if (childOwner != null && !(child is IItemByName))
                 {
                     var childLocationType = childOwner.LocationType;
                     if (childLocationType == LocationType.Remote || childLocationType == LocationType.Virtual)