3.2.30.21

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -1961,7 +1961,7 @@ namespace Emby.Server.Implementations.Data
                 }
                 else
                 {
-                    index ++;
+                    index++;
                 }
             }
 
@@ -4716,6 +4716,33 @@ namespace Emby.Server.Implementations.Data
 
         public void UpdateInheritedValues(CancellationToken cancellationToken)
         {
+            UpdateInheritedTags(cancellationToken);
+        }
+
+        private void UpdateInheritedTags(CancellationToken cancellationToken)
+        {
+            using (WriteLock.Write())
+            {
+                using (var connection = CreateConnection())
+                {
+                    connection.RunInTransaction(db =>
+                    {
+                        connection.ExecuteAll(string.Join(";", new string[]
+                        {
+                            "delete from itemvalues where type = 6",
+
+                            "insert into itemvalues (ItemId, Type, Value, CleanValue)  select ItemId, 6, Value, CleanValue from ItemValues where Type=4",
+
+                            @"insert into itemvalues (ItemId, Type, Value, CleanValue) select AncestorIds.itemid, 6, ItemValues.Value, ItemValues.CleanValue
+FROM AncestorIds
+LEFT JOIN ItemValues ON (AncestorIds.AncestorId = ItemValues.ItemId)
+where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type = 4 "
+
+                        }));
+
+                    }, TransactionMode);
+                }
+            }
         }
 
         private static Dictionary<string, string[]> GetTypeMapDictionary()

MediaBrowser.Controller/Entities/IHasProgramAttributes.cs

@@ -15,5 +15,6 @@ namespace MediaBrowser.Controller.Entities
         bool IsPremiere { get; set; }
         ProgramAudio? Audio { get; set; }
         string EpisodeTitle { get; set; }
+        string ServiceName { get; set; }
     }
 }

MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs

@@ -89,24 +89,9 @@ namespace MediaBrowser.Controller.LiveTv
             }
         }
 
-        private static string EmbyServiceName = "Emby";
         public override double? GetDefaultPrimaryImageAspectRatio()
         {
-            var serviceName = ServiceName;
-            if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName))
-            {
-                double value = 16;
-                value /= 9;
-
-                return value;
-            }
-            else
-            {
-                double value = 2;
-                value /= 3;
-
-                return value;
-            }
+            return LiveTvProgram.GetDefaultPrimaryImageAspectRatio(this);
         }
 
         public override string GetClientTypeName()

MediaBrowser.Controller/LiveTv/LiveTvProgram.cs

@@ -47,11 +47,10 @@ namespace MediaBrowser.Controller.LiveTv
             return list;
         }
 
-        private static string EmbyServiceName = "Emby";
-        public override double? GetDefaultPrimaryImageAspectRatio()
+        public static double? GetDefaultPrimaryImageAspectRatio(IHasProgramAttributes item)
         {
-            var serviceName = ServiceName;
-            if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName))
+            var serviceName = item.ServiceName;
+            if (!item.IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase))
             {
                 double value = 16;
                 value /= 9;
@@ -67,6 +66,12 @@ namespace MediaBrowser.Controller.LiveTv
             }
         }
 
+        private static string EmbyServiceName = "Emby";
+        public override double? GetDefaultPrimaryImageAspectRatio()
+        {
+            return GetDefaultPrimaryImageAspectRatio(this);
+        }
+
         [IgnoreDataMember]
         public override SourceType SourceType
         {

MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs

@@ -98,24 +98,9 @@ namespace MediaBrowser.Controller.LiveTv
             return false;
         }
 
-        private static string EmbyServiceName = "Emby";
         public override double? GetDefaultPrimaryImageAspectRatio()
         {
-            var serviceName = ServiceName;
-            if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName))
-            {
-                double value = 16;
-                value /= 9;
-
-                return value;
-            }
-            else
-            {
-                double value = 2;
-                value /= 3;
-
-                return value;
-            }
+            return LiveTvProgram.GetDefaultPrimaryImageAspectRatio(this);
         }
 
         [IgnoreDataMember]

MediaBrowser.Model/Plugins/PluginPageInfo.cs

@@ -4,6 +4,10 @@
     {
         public string Name { get; set; }
 
+        public string DisplayName { get; set; }
+
         public string EmbeddedResourcePath { get; set; }
+
+        public bool EnableInMainMenu { get; set; }
     }
 }

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.30.20")]
+[assembly: AssemblyVersion("3.2.30.21")]