factor device pixel ratio into downloaded image size

4 files changed, 39 insertions, 18 deletions

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index db5c6b439..355ac43fc 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -215,9 +215,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 isNew = true;
             }
 
-            var info = channelInfo.GetChannelInfo();
-
-            item.HomePageUrl = info.HomePageUrl;
+            item.HomePageUrl = channelInfo.HomePageUrl;
             item.OriginalChannelName = channelInfo.Name;
 
             if (string.IsNullOrEmpty(item.Name))
@@ -258,7 +256,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             // Find the corresponding channel provider plugin
             var channelProvider = GetChannelProvider(channel);
 
-            var channelInfo = channelProvider.GetChannelInfo();
+            var channelInfo = channelProvider.GetChannelFeatures();
 
             int? providerStartIndex = null;
             int? providerLimit = null;
@@ -448,7 +446,7 @@ namespace MediaBrowser.Server.Implementations.Channels
         {
             // Increment this as needed to force new downloads
             // Incorporate Name because it's being used to convert channel entity to provider
-            return externalId + (channelProvider.DataVersion ?? string.Empty) + (channelProvider.Name ?? string.Empty) + "12";
+            return externalId + (channelProvider.DataVersion ?? string.Empty) + (channelProvider.Name ?? string.Empty) + "13";
         }
 
         private async Task<BaseItem> GetChannelItemEntity(ChannelItemInfo info, IChannel channelProvider, Channel internalChannel, CancellationToken cancellationToken)
@@ -473,7 +471,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
             else if (info.MediaType == ChannelMediaType.Audio)
             {
-                id = idToHash.GetMBId(typeof(ChannelFolderItem));
+                id = idToHash.GetMBId(typeof(ChannelAudioItem));
 
                 item = _libraryManager.GetItemById(id) as ChannelAudioItem;
 
diff --git a/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs b/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs
index e5a859cdc..10c78b300 100644
--- a/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs
+++ b/MediaBrowser.Server.Implementations/Dto/MediaStreamSelector.cs
@@ -64,7 +64,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 // always load the most suitable full subtitles
                 stream = full.FirstOrDefault();
             }
-            
+
             // load forced subs if we have found no suitable full subtitles
             stream = stream ?? forced.FirstOrDefault();
 
@@ -86,17 +86,13 @@ namespace MediaBrowser.Server.Implementations.Dto
             var orderStreams = streams
                 .Where(i => i.Type == type);
 
-            if (languagePreferences.Count == 0)
-            {
-                return orderStreams.OrderBy(i => i.IsDefault)
-                    .ThenBy(i => i.Index)
-                    .ToList();
-            }
-
+            // Give some preferance to external text subs for better performance
             return orderStreams.OrderBy(i => languagePreferences.FindIndex(l => string.Equals(i.Language, l, StringComparison.OrdinalIgnoreCase)))
-                .ThenBy(i => i.IsDefault)
-                .ThenBy(i => i.Index)
-                .ToList();
+                 .ThenBy(i => i.IsDefault)
+                 .ThenBy(i => !i.IsGraphicalSubtitleStream)
+                 .ThenBy(i => i.IsExternal)
+                 .ThenBy(i => i.Index)
+                 .ToList();
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index daed33436..f72cfc7df 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -150,6 +150,32 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     channels = channels
                         .Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite == val);
                 }
+
+                if (query.IsLiked.HasValue)
+                {
+                    var val = query.IsLiked.Value;
+
+                    channels = channels
+                        .Where(i =>
+                        {
+                            var likes = _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).Likes;
+
+                            return likes.HasValue && likes.Value == val;
+                        });
+                }
+
+                if (query.IsDisliked.HasValue)
+                {
+                    var val = query.IsDisliked.Value;
+
+                    channels = channels
+                        .Where(i =>
+                        {
+                            var likes = _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).Likes;
+
+                            return likes.HasValue && likes.Value != val;
+                        });
+                }
             }
 
             channels = channels.OrderBy(i =>
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 7658b07f1..019039725 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -785,5 +785,6 @@
 	"HeaderLiveTv": "Live TV",
 	"HeaderReports": "Reports",
 	"HeaderMetadataManager": "Metadata Manager",
-	"HeaderPreferences": "Preferences"
+	"HeaderPreferences": "Preferences",
+	"MessageLoadingChannels": "Loading channel content..."
 }
\ No newline at end of file