From a041fe8a2dc03790b8b56a01bb2c1d2c9fd9d690 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 21 Jun 2020 13:29:35 +0100
Subject: [PATCH 001/247] Add versioning to plugin folders

---
 .../ApplicationHost.cs                        | 98 ++++++++++++++++++-
 .../Updates/InstallationManager.cs            | 33 +++++--
 2 files changed, 123 insertions(+), 8 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 23f0571a1d..a3f76470f5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1008,6 +1008,102 @@ namespace Emby.Server.Implementations
 
         protected abstract void RestartInternal();
 
+        /// <summary>
+        /// Converts an string array to a number.
+        /// Element 0 is the filename.
+        /// </summary>
+        /// <param name="version">Parts of the filename.</param>
+        /// <returns>Long representing the version of the file.</returns>
+        private long StrToVersion(string[] version)
+        {
+            if (version.Length > 4)
+            {
+                Logger.LogError("Plugin version number too complex : {0}.", version[0]);
+                return -1;
+            }
+
+            // Build version into a string. 1.2.3.4 => 001002003004 (max 999999999999
+            string res = string.Empty;
+            for (int x = 1; x <= version.Length; x++)
+            {
+                res += version[1].PadLeft(3 - version[1].Length, '0');
+            }
+
+            return long.Parse(res, CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Only loads the latest version of each assembly based upon the folder name.
+        /// eg. MyAssembly 11.9.3.6  - will be ignored.
+        ///     MyAssembly 12.2.3.6  - will be loaded.
+        /// </summary>
+        /// <param name="path">Path to enumerate.</param>
+        /// <param name="cleanup">Set to true, to try and clean up earlier versions.</param>
+        /// <returns>IEnumerable{string} of filenames.</returns>
+        protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = false)
+        {
+            var dllList = new List<string>();
+            var versions = new SortedList<long, string>();
+            var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
+            var folder = string.Empty;
+
+            // Only add the latest version of the folder into the list.
+            foreach (var dir in directories)
+            {
+                string[] parts = dir.Split(".");
+
+                if (parts.Length == 1)
+                {
+                    dllList.AddRange(Directory.EnumerateFiles(dir, "*.dll", SearchOption.AllDirectories).ToList());
+                }
+                else
+                {
+                    // Add for version comparison later.
+                    versions.Add(StrToVersion(parts), parts[0]);
+                }
+            }
+
+            if (versions.Count > 0)
+            {
+                string lastName = string.Empty;
+
+                // Traverse backwards through the list.
+                // The first item will be the latest version.
+                for (int x = versions.Count - 1; x > 0; x--)
+                {
+                    folder = versions.Values[x];
+                    if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
+                    {
+                        dllList.AddRange(Directory.EnumerateFiles(path + "\\" + folder, "*.dll", SearchOption.AllDirectories));
+                        lastName = folder;
+                        continue;
+                    }
+
+                    if (!string.IsNullOrEmpty(lastName) && cleanup)
+                    {
+                        // Attempt a cleanup of old folders.
+                        try
+                        {
+                            Logger.LogDebug("Attempting to delete {0}", path + "\\" + folder);
+                            Directory.Delete(path + "\\" + folder);
+                        }
+                        catch
+                        {
+                            // Ignore errors.
+                        }
+                    }
+                }
+
+                folder = versions.Values[0];
+                if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
+                {
+                    dllList.AddRange(Directory.EnumerateFiles(path + "\\" + folder, "*.dll", SearchOption.AllDirectories));
+                }
+            }
+
+            return dllList;
+        }
+
         /// <summary>
         /// Gets the composable part assemblies.
         /// </summary>
@@ -1016,7 +1112,7 @@ namespace Emby.Server.Implementations
         {
             if (Directory.Exists(ApplicationPaths.PluginsPath))
             {
-                foreach (var file in Directory.EnumerateFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.AllDirectories))
+                foreach (var file in GetLatestDLLVersion(ApplicationPaths.PluginsPath))
                 {
                     Assembly plugAss;
                     try
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 80326fddf2..229e0338c0 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -16,6 +16,7 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Updates;
+using MediaBrowser.Common.System;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.IO;
@@ -23,6 +24,7 @@ using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Updates;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using MediaBrowser.Model.System;
 
 namespace Emby.Server.Implementations.Updates
 {
@@ -384,9 +386,19 @@ namespace Emby.Server.Implementations.Updates
                     throw new InvalidDataException("The checksum of the received data doesn't match.");
                 }
 
+                // Version folder as they cannot be overwritten in Windows.
+                targetDir += package.Version.ToString();
+
                 if (Directory.Exists(targetDir))
                 {
-                    Directory.Delete(targetDir, true);
+                    try
+                    {
+                        Directory.Delete(targetDir, true);
+                    }
+                    catch
+                    {
+                        // Ignore any exceptions.
+                    }
                 }
 
                 stream.Position = 0;
@@ -425,15 +437,22 @@ namespace Emby.Server.Implementations.Updates
                 path = file;
             }
 
-            if (isDirectory)
+            try
             {
-                _logger.LogInformation("Deleting plugin directory {0}", path);
-                Directory.Delete(path, true);
+                if (isDirectory)
+                {
+                    _logger.LogInformation("Deleting plugin directory {0}", path);
+                    Directory.Delete(path, true);
+                }
+                else
+                {
+                    _logger.LogInformation("Deleting plugin file {0}", path);
+                    _fileSystem.DeleteFile(path);
+                }
             }
-            else
+            catch
             {
-                _logger.LogInformation("Deleting plugin file {0}", path);
-                _fileSystem.DeleteFile(path);
+                // Ignore file errors.
             }
 
             var list = _config.Configuration.UninstalledPlugins.ToList();

From 99410f3c975dbcce44b6cdec2e17e9a8d67db30e Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 21 Jun 2020 16:15:55 +0100
Subject: [PATCH 002/247] fixes

---
 .../ApplicationHost.cs                        | 71 ++++++++++++++-----
 .../Updates/InstallationManager.cs            |  2 +-
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a3f76470f5..cbd9f7154a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1013,25 +1013,62 @@ namespace Emby.Server.Implementations
         /// Element 0 is the filename.
         /// </summary>
         /// <param name="version">Parts of the filename.</param>
+        /// <param name="foldername">Returns the folder name including any periods. eg. vs</param>
         /// <returns>Long representing the version of the file.</returns>
-        private long StrToVersion(string[] version)
+        private long StrToVersion(string[] version, out string foldername)
         {
-            if (version.Length > 4)
+            if (version.Length > 5)
             {
                 Logger.LogError("Plugin version number too complex : {0}.", version[0]);
-                return -1;
+                foldername = string.Join('.', version);
+                return 0;
             }
 
-            // Build version into a string. 1.2.3.4 => 001002003004 (max 999999999999
-            string res = string.Empty;
-            for (int x = 1; x <= version.Length; x++)
+            foldername = string.Empty;
+            int start = 0;
+            do
             {
-                res += version[1].PadLeft(3 - version[1].Length, '0');
+                foldername += "." + version[start];
+                start++;
+            }
+            while (start < version.Length && !int.TryParse(version[start], out _));
+            foldername = foldername.TrimStart('.');
+
+            if (start == version.Length)
+            {
+                // No valid version number.
+                return 0;
+            }
+
+            // Build version into a string. 1.2.3.4 => 001002003004 (max 999999999999).
+            string res = string.Empty;
+            for (int x = start; x < version.Length; x++)
+            {
+                res += version[x].PadLeft(4 - version[x].Length, '0');
             }
 
             return long.Parse(res, CultureInfo.InvariantCulture);
         }
 
+        private static int VersionCompare(Tuple<long, string, string> a, Tuple<long, string, string> b)
+        {
+            int compare = string.Compare(a.Item2, b.Item2, false, CultureInfo.InvariantCulture);
+
+            if (compare == 0)
+            {
+                if (a.Item1 > b.Item1)
+                {
+                    return 1;
+                }
+
+                return -1;
+
+            }
+
+            return compare;
+
+        }
+
         /// <summary>
         /// Only loads the latest version of each assembly based upon the folder name.
         /// eg. MyAssembly 11.9.3.6  - will be ignored.
@@ -1043,7 +1080,8 @@ namespace Emby.Server.Implementations
         protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = false)
         {
             var dllList = new List<string>();
-            var versions = new SortedList<long, string>();
+            var versions = new List<Tuple<long, string, string>>();
+
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
             var folder = string.Empty;
 
@@ -1058,23 +1096,24 @@ namespace Emby.Server.Implementations
                 }
                 else
                 {
+                    long id = StrToVersion(parts, out string foldername);
                     // Add for version comparison later.
-                    versions.Add(StrToVersion(parts), parts[0]);
+                    versions.Add(Tuple.Create(id, foldername, dir));
                 }
             }
 
             if (versions.Count > 0)
             {
                 string lastName = string.Empty;
-
+                versions.Sort(VersionCompare);
                 // Traverse backwards through the list.
                 // The first item will be the latest version.
                 for (int x = versions.Count - 1; x > 0; x--)
                 {
-                    folder = versions.Values[x];
+                    folder = versions[x].Item2;
                     if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
                     {
-                        dllList.AddRange(Directory.EnumerateFiles(path + "\\" + folder, "*.dll", SearchOption.AllDirectories));
+                        dllList.AddRange(Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories));
                         lastName = folder;
                         continue;
                     }
@@ -1084,8 +1123,8 @@ namespace Emby.Server.Implementations
                         // Attempt a cleanup of old folders.
                         try
                         {
-                            Logger.LogDebug("Attempting to delete {0}", path + "\\" + folder);
-                            Directory.Delete(path + "\\" + folder);
+                            Logger.LogDebug("Attempting to delete {0}", folder);
+                            Directory.Delete(folder);
                         }
                         catch
                         {
@@ -1094,10 +1133,10 @@ namespace Emby.Server.Implementations
                     }
                 }
 
-                folder = versions.Values[0];
+                folder = versions[0].Item2;
                 if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
                 {
-                    dllList.AddRange(Directory.EnumerateFiles(path + "\\" + folder, "*.dll", SearchOption.AllDirectories));
+                    dllList.AddRange(Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories));
                 }
             }
 
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 229e0338c0..b6cd5a6336 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -387,7 +387,7 @@ namespace Emby.Server.Implementations.Updates
                 }
 
                 // Version folder as they cannot be overwritten in Windows.
-                targetDir += package.Version.ToString();
+                targetDir += "." + package.Version.ToString();
 
                 if (Directory.Exists(targetDir))
                 {

From d89c46f1a97b436bae0a39816cab71f8d09ad3c3 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 21 Jun 2020 17:11:21 +0100
Subject: [PATCH 003/247] fixes

---
 .../ApplicationHost.cs                        | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index cbd9f7154a..ce907c3cec 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1083,8 +1083,7 @@ namespace Emby.Server.Implementations
             var versions = new List<Tuple<long, string, string>>();
 
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
-            var folder = string.Empty;
-
+            
             // Only add the latest version of the folder into the list.
             foreach (var dir in directories)
             {
@@ -1110,11 +1109,10 @@ namespace Emby.Server.Implementations
                 // The first item will be the latest version.
                 for (int x = versions.Count - 1; x > 0; x--)
                 {
-                    folder = versions[x].Item2;
-                    if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
+                    if (!string.Equals(lastName, versions[x].Item2, StringComparison.OrdinalIgnoreCase))
                     {
-                        dllList.AddRange(Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories));
-                        lastName = folder;
+                        dllList.AddRange(Directory.EnumerateFiles(versions[x].Item3, "*.dll", SearchOption.AllDirectories));
+                        lastName = versions[x].Item2;
                         continue;
                     }
 
@@ -1123,8 +1121,8 @@ namespace Emby.Server.Implementations
                         // Attempt a cleanup of old folders.
                         try
                         {
-                            Logger.LogDebug("Attempting to delete {0}", folder);
-                            Directory.Delete(folder);
+                            Logger.LogDebug("Attempting to delete {0}", versions[x].Item3);
+                            Directory.Delete(versions[x].Item3);
                         }
                         catch
                         {
@@ -1133,10 +1131,9 @@ namespace Emby.Server.Implementations
                     }
                 }
 
-                folder = versions[0].Item2;
-                if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
+                if (!string.Equals(lastName, versions[0].Item2, StringComparison.OrdinalIgnoreCase))
                 {
-                    dllList.AddRange(Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories));
+                    dllList.AddRange(Directory.EnumerateFiles(versions[0].Item3, "*.dll", SearchOption.AllDirectories));
                 }
             }
 

From 2255bc98722e57e77e191d08b1485372c1e9a400 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 21 Jun 2020 18:42:50 +0100
Subject: [PATCH 004/247] Changed padding in version numbers based up how they
 are stored in the repository.

---
 Emby.Server.Implementations/ApplicationHost.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index ce907c3cec..22a67b10cf 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1040,11 +1040,16 @@ namespace Emby.Server.Implementations
                 return 0;
             }
 
-            // Build version into a string. 1.2.3.4 => 001002003004 (max 999999999999).
+            // Build version into a string. 1.2.3.4 => 001002003004, 2.1 -> 200100000000.
             string res = string.Empty;
             for (int x = start; x < version.Length; x++)
             {
-                res += version[x].PadLeft(4 - version[x].Length, '0');
+                res += version[x].PadLeft(3, '0');
+            }
+
+            if (res.Length < 12)
+            {
+                res = res.PadRight(12, '0');
             }
 
             return long.Parse(res, CultureInfo.InvariantCulture);
@@ -1083,11 +1088,11 @@ namespace Emby.Server.Implementations
             var versions = new List<Tuple<long, string, string>>();
 
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
-            
+
             // Only add the latest version of the folder into the list.
             foreach (var dir in directories)
             {
-                string[] parts = dir.Split(".");
+                string[] parts = dir.Replace('_', '.').Split(".");
 
                 if (parts.Length == 1)
                 {

From bf1bbbdd3e72657d0e36a7a2b80c89d03fc40ba8 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 21 Jun 2020 18:46:48 +0100
Subject: [PATCH 005/247] Changed sorting to case insensitive

---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 22a67b10cf..830581d192 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1057,7 +1057,7 @@ namespace Emby.Server.Implementations
 
         private static int VersionCompare(Tuple<long, string, string> a, Tuple<long, string, string> b)
         {
-            int compare = string.Compare(a.Item2, b.Item2, false, CultureInfo.InvariantCulture);
+            int compare = string.Compare(a.Item2, b.Item2, true, CultureInfo.InvariantCulture);
 
             if (compare == 0)
             {

From a25a233b75df380d87f1fdca8738b32938095ab4 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 22 Jun 2020 11:57:46 +0100
Subject: [PATCH 006/247] Using  Version class.

---
 .../ApplicationHost.cs                        | 130 +++++-------------
 .../Updates/InstallationManager.cs            |   2 +-
 2 files changed, 35 insertions(+), 97 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 830581d192..9d452250d8 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1009,136 +1009,74 @@ namespace Emby.Server.Implementations
         protected abstract void RestartInternal();
 
         /// <summary>
-        /// Converts an string array to a number.
-        /// Element 0 is the filename.
+        /// Comparison function used in <<see cref="GetLatestDLLVersion" />.
         /// </summary>
-        /// <param name="version">Parts of the filename.</param>
-        /// <param name="foldername">Returns the folder name including any periods. eg. vs</param>
-        /// <returns>Long representing the version of the file.</returns>
-        private long StrToVersion(string[] version, out string foldername)
-        {
-            if (version.Length > 5)
-            {
-                Logger.LogError("Plugin version number too complex : {0}.", version[0]);
-                foldername = string.Join('.', version);
-                return 0;
-            }
-
-            foldername = string.Empty;
-            int start = 0;
-            do
-            {
-                foldername += "." + version[start];
-                start++;
-            }
-            while (start < version.Length && !int.TryParse(version[start], out _));
-            foldername = foldername.TrimStart('.');
-
-            if (start == version.Length)
-            {
-                // No valid version number.
-                return 0;
-            }
-
-            // Build version into a string. 1.2.3.4 => 001002003004, 2.1 -> 200100000000.
-            string res = string.Empty;
-            for (int x = start; x < version.Length; x++)
-            {
-                res += version[x].PadLeft(3, '0');
-            }
-
-            if (res.Length < 12)
-            {
-                res = res.PadRight(12, '0');
-            }
-
-            return long.Parse(res, CultureInfo.InvariantCulture);
-        }
-
-        private static int VersionCompare(Tuple<long, string, string> a, Tuple<long, string, string> b)
+        private static int VersionCompare(Tuple<Version, string, string> a, Tuple<Version, string, string> b)
         {
             int compare = string.Compare(a.Item2, b.Item2, true, CultureInfo.InvariantCulture);
 
             if (compare == 0)
             {
-                if (a.Item1 > b.Item1)
-                {
-                    return 1;
-                }
-
-                return -1;
-
+                return a.Item1.CompareTo(b.Item1);
             }
 
             return compare;
-
         }
 
         /// <summary>
         /// Only loads the latest version of each assembly based upon the folder name.
-        /// eg. MyAssembly 11.9.3.6  - will be ignored.
-        ///     MyAssembly 12.2.3.6  - will be loaded.
+        /// eg. MyAssembly_11.9.3.6  - will be ignored.
+        ///     MyAssembly_12.2.3.6  - will be loaded.
         /// </summary>
         /// <param name="path">Path to enumerate.</param>
         /// <param name="cleanup">Set to true, to try and clean up earlier versions.</param>
         /// <returns>IEnumerable{string} of filenames.</returns>
-        protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = false)
+        protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = true)
         {
             var dllList = new List<string>();
-            var versions = new List<Tuple<long, string, string>>();
+            var versions = new List<Tuple<Version, string, string>>();
+            var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
 
-            var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
-
-            // Only add the latest version of the folder into the list.
             foreach (var dir in directories)
             {
-                string[] parts = dir.Replace('_', '.').Split(".");
-
-                if (parts.Length == 1)
+                int p = dir.LastIndexOf('_');
+                if (p != -1 && Version.TryParse(dir.Substring(p + 1), out Version ver))
                 {
-                    dllList.AddRange(Directory.EnumerateFiles(dir, "*.dll", SearchOption.AllDirectories).ToList());
+                    // Versioned folder.
+                    versions.Add(Tuple.Create(ver, dir.Substring(0, p), dir));
                 }
                 else
                 {
-                    long id = StrToVersion(parts, out string foldername);
-                    // Add for version comparison later.
-                    versions.Add(Tuple.Create(id, foldername, dir));
+                    // Un-versioned folder.
+                    versions.Add(Tuple.Create(new Version(), dir, dir));
                 }
             }
 
-            if (versions.Count > 0)
+            string lastName = string.Empty;
+            versions.Sort(VersionCompare);
+            // Traverse backwards through the list.
+            // The first item will be the latest version.
+            for (int x = versions.Count - 1; x >= 0; x--)
             {
-                string lastName = string.Empty;
-                versions.Sort(VersionCompare);
-                // Traverse backwards through the list.
-                // The first item will be the latest version.
-                for (int x = versions.Count - 1; x > 0; x--)
+                if (!string.Equals(lastName, versions[x].Item2, StringComparison.OrdinalIgnoreCase))
                 {
-                    if (!string.Equals(lastName, versions[x].Item2, StringComparison.OrdinalIgnoreCase))
-                    {
-                        dllList.AddRange(Directory.EnumerateFiles(versions[x].Item3, "*.dll", SearchOption.AllDirectories));
-                        lastName = versions[x].Item2;
-                        continue;
-                    }
-
-                    if (!string.IsNullOrEmpty(lastName) && cleanup)
-                    {
-                        // Attempt a cleanup of old folders.
-                        try
-                        {
-                            Logger.LogDebug("Attempting to delete {0}", versions[x].Item3);
-                            Directory.Delete(versions[x].Item3);
-                        }
-                        catch
-                        {
-                            // Ignore errors.
-                        }
-                    }
+                    dllList.AddRange(Directory.EnumerateFiles(versions[x].Item3, "*.dll", SearchOption.AllDirectories));
+                    lastName = versions[x].Item2;
+                    continue;
                 }
 
-                if (!string.Equals(lastName, versions[0].Item2, StringComparison.OrdinalIgnoreCase))
+                if (!string.IsNullOrEmpty(lastName) && cleanup)
                 {
-                    dllList.AddRange(Directory.EnumerateFiles(versions[0].Item3, "*.dll", SearchOption.AllDirectories));
+                    // Attempt a cleanup of old folders.
+                    try
+                    {
+                        Logger.LogDebug("Attempting to delete {0}", versions[x].Item3);
+                        Directory.Delete(versions[x].Item3, true);
+                    }
+                    catch
+                    {
+                        // Ignore errors.
+                    }
                 }
             }
 
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index b6cd5a6336..1fa71e6739 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -387,7 +387,7 @@ namespace Emby.Server.Implementations.Updates
                 }
 
                 // Version folder as they cannot be overwritten in Windows.
-                targetDir += "." + package.Version.ToString();
+                targetDir += "_" + package.Version.ToString();
 
                 if (Directory.Exists(targetDir))
                 {

From ba3a9f7d466a84040b53399fbc3ae1673b7466ac Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 22 Jun 2020 12:14:31 +0100
Subject: [PATCH 007/247] removing stray < character from description.

---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 9d452250d8..ae6a82e8b9 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1009,7 +1009,7 @@ namespace Emby.Server.Implementations
         protected abstract void RestartInternal();
 
         /// <summary>
-        /// Comparison function used in <<see cref="GetLatestDLLVersion" />.
+        /// Comparison function used in <see cref="GetLatestDLLVersion" />.
         /// </summary>
         private static int VersionCompare(Tuple<Version, string, string> a, Tuple<Version, string, string> b)
         {

From 2b5d515de79f2309219459c7223b8a56269737f8 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 17 Jul 2020 09:08:29 -0600
Subject: [PATCH 008/247] specify plugin repo on install

---
 .../Updates/InstallationManager.cs                     |  7 ++++++-
 MediaBrowser.Api/PackageService.cs                     | 10 ++++++++++
 MediaBrowser.Model/Updates/PackageInfo.cs              | 10 ++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 4f54c06dd2..7833044eda 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -161,7 +161,12 @@ namespace Emby.Server.Implementations.Updates
             var result = new List<PackageInfo>();
             foreach (RepositoryInfo repository in _config.Configuration.PluginRepositories)
             {
-                result.AddRange(await GetPackages(repository.Url, cancellationToken).ConfigureAwait(true));
+                foreach (var package in await GetPackages(repository.Url, cancellationToken).ConfigureAwait(true))
+                {
+                    package.repositoryName = repository.Name;
+                    package.repositoryUrl = repository.Url;
+                    result.Add(package);
+                }
             }
 
             return result;
diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
index a84556fcc4..d36a7f55c2 100644
--- a/MediaBrowser.Api/PackageService.cs
+++ b/MediaBrowser.Api/PackageService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
@@ -83,6 +84,9 @@ namespace MediaBrowser.Api
         /// <value>The version.</value>
         [ApiMember(Name = "Version", Description = "Optional version. Defaults to latest version.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
         public string Version { get; set; }
+        
+        [ApiMember(Name = "RepositoryUrl", Description = "Optional. Specify the repository to install from", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string RepositoryUrl { get; set; }
     }
 
     /// <summary>
@@ -167,6 +171,12 @@ namespace MediaBrowser.Api
         public async Task Post(InstallPackage request)
         {
             var packages = await _installationManager.GetAvailablePackages().ConfigureAwait(false);
+            if (!string.IsNullOrEmpty(request.RepositoryUrl))
+            {
+                packages = packages.Where(p => p.repositoryUrl.Equals(request.RepositoryUrl, StringComparison.OrdinalIgnoreCase))
+                    .ToList();
+            }
+            
             var package = _installationManager.GetCompatibleVersions(
                     packages,
                     request.Name,
diff --git a/MediaBrowser.Model/Updates/PackageInfo.cs b/MediaBrowser.Model/Updates/PackageInfo.cs
index d9eb1386ef..98b151d551 100644
--- a/MediaBrowser.Model/Updates/PackageInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageInfo.cs
@@ -52,6 +52,16 @@ namespace MediaBrowser.Model.Updates
         /// <value>The versions.</value>
         public IReadOnlyList<VersionInfo> versions { get; set; }
 
+        /// <summary>
+        /// Gets or sets the repository name.
+        /// </summary>
+        public string repositoryName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the repository url.
+        /// </summary>
+        public string repositoryUrl { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PackageInfo"/> class.
         /// </summary>

From 8b9a38046666227f5c6f9d3099303300ddfd305a Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Tue, 18 Aug 2020 01:24:24 -0400
Subject: [PATCH 009/247] Add 1440p to the mix

Partially addresses #3112.
---
 MediaBrowser.Model/Dlna/ResolutionNormalizer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index 102db3b44e..a4305c8104 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -15,6 +15,7 @@ namespace MediaBrowser.Model.Dlna
                 new ResolutionConfiguration(720, 950000),
                 new ResolutionConfiguration(1280, 2500000),
                 new ResolutionConfiguration(1920, 4000000),
+                new ResolutionConfiguration(2560, 8000000),
                 new ResolutionConfiguration(3840, 35000000)
             };
 

From 50a9c8c8a747ea3a13f1622b8e77e1a9e635aacf Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Tue, 18 Aug 2020 20:22:15 -0600
Subject: [PATCH 010/247] resolve merge conflicts

---
 Jellyfin.Api/Controllers/PackageController.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/PackageController.cs b/Jellyfin.Api/Controllers/PackageController.cs
index 3d6a879093..2be0ad9fe9 100644
--- a/Jellyfin.Api/Controllers/PackageController.cs
+++ b/Jellyfin.Api/Controllers/PackageController.cs
@@ -76,6 +76,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="name">Package name.</param>
         /// <param name="assemblyGuid">GUID of the associated assembly.</param>
         /// <param name="version">Optional version. Defaults to latest version.</param>
+        /// <param name="repositoryUrl">Optional. Specify the repository to install from.</param>
         /// <response code="204">Package found.</response>
         /// <response code="404">Package not found.</response>
         /// <returns>A <see cref="NoContentResult"/> on success, or a <see cref="NotFoundResult"/> if the package could not be found.</returns>
@@ -86,9 +87,16 @@ namespace Jellyfin.Api.Controllers
         public async Task<ActionResult> InstallPackage(
             [FromRoute] [Required] string? name,
             [FromQuery] string? assemblyGuid,
-            [FromQuery] string? version)
+            [FromQuery] string? version,
+            [FromQuery] string? repositoryUrl)
         {
             var packages = await _installationManager.GetAvailablePackages().ConfigureAwait(false);
+            if (!string.IsNullOrEmpty(repositoryUrl))
+            {
+                packages = packages.Where(p => p.repositoryUrl.Equals(repositoryUrl, StringComparison.OrdinalIgnoreCase))
+                    .ToList();
+            }
+
             var package = _installationManager.GetCompatibleVersions(
                     packages,
                     name,

From 852213d90cd6fe3c4e7b6922ca1f8162bc34c55e Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Tue, 18 Aug 2020 20:23:34 -0600
Subject: [PATCH 011/247] resolve merge conflicts

---
 MediaBrowser.Api/PackageService.cs | 207 -----------------------------
 1 file changed, 207 deletions(-)
 delete mode 100644 MediaBrowser.Api/PackageService.cs

diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
deleted file mode 100644
index d36a7f55c2..0000000000
--- a/MediaBrowser.Api/PackageService.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Updates;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Updates;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Api
-{
-    [Route("/Repositories", "GET", Summary = "Gets all package repositories")]
-    [Authenticated]
-    public class GetRepositories : IReturnVoid
-    {
-    }
-
-    [Route("/Repositories", "POST", Summary = "Sets the enabled and existing package repositories")]
-    [Authenticated]
-    public class SetRepositories : List<RepositoryInfo>, IReturnVoid
-    {
-    }
-
-    /// <summary>
-    /// Class GetPackage.
-    /// </summary>
-    [Route("/Packages/{Name}", "GET", Summary = "Gets a package, by name or assembly guid")]
-    [Authenticated]
-    public class GetPackage : IReturn<PackageInfo>
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        [ApiMember(Name = "Name", Description = "The name of the package", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        [ApiMember(Name = "AssemblyGuid", Description = "The guid of the associated assembly", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public string AssemblyGuid { get; set; }
-    }
-
-    /// <summary>
-    /// Class GetPackages.
-    /// </summary>
-    [Route("/Packages", "GET", Summary = "Gets available packages")]
-    [Authenticated]
-    public class GetPackages : IReturn<PackageInfo[]>
-    {
-    }
-
-    /// <summary>
-    /// Class InstallPackage.
-    /// </summary>
-    [Route("/Packages/Installed/{Name}", "POST", Summary = "Installs a package")]
-    [Authenticated(Roles = "Admin")]
-    public class InstallPackage : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        [ApiMember(Name = "Name", Description = "Package name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        [ApiMember(Name = "AssemblyGuid", Description = "Guid of the associated assembly", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string AssemblyGuid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version.
-        /// </summary>
-        /// <value>The version.</value>
-        [ApiMember(Name = "Version", Description = "Optional version. Defaults to latest version.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Version { get; set; }
-        
-        [ApiMember(Name = "RepositoryUrl", Description = "Optional. Specify the repository to install from", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string RepositoryUrl { get; set; }
-    }
-
-    /// <summary>
-    /// Class CancelPackageInstallation.
-    /// </summary>
-    [Route("/Packages/Installing/{Id}", "DELETE", Summary = "Cancels a package installation")]
-    [Authenticated(Roles = "Admin")]
-    public class CancelPackageInstallation : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Installation Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
-        public string Id { get; set; }
-    }
-
-    /// <summary>
-    /// Class PackageService.
-    /// </summary>
-    public class PackageService : BaseApiService
-    {
-        private readonly IInstallationManager _installationManager;
-        private readonly IServerConfigurationManager _serverConfigurationManager;
-
-        public PackageService(
-            ILogger<PackageService> logger,
-            IServerConfigurationManager serverConfigurationManager,
-            IHttpResultFactory httpResultFactory,
-            IInstallationManager installationManager)
-            : base(logger, serverConfigurationManager, httpResultFactory)
-        {
-            _installationManager = installationManager;
-            _serverConfigurationManager = serverConfigurationManager;
-        }
-
-        public object Get(GetRepositories request)
-        {
-            var result = _serverConfigurationManager.Configuration.PluginRepositories;
-            return ToOptimizedResult(result);
-        }
-
-        public void Post(SetRepositories request)
-        {
-            _serverConfigurationManager.Configuration.PluginRepositories = request;
-            _serverConfigurationManager.SaveConfiguration();
-        }
-
-        /// <summary>
-        /// Gets the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>System.Object.</returns>
-        public object Get(GetPackage request)
-        {
-            var packages = _installationManager.GetAvailablePackages().GetAwaiter().GetResult();
-            var result = _installationManager.FilterPackages(
-                packages,
-                request.Name,
-                string.IsNullOrEmpty(request.AssemblyGuid) ? default : Guid.Parse(request.AssemblyGuid)).FirstOrDefault();
-
-            return ToOptimizedResult(result);
-        }
-
-        /// <summary>
-        /// Gets the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>System.Object.</returns>
-        public async Task<object> Get(GetPackages request)
-        {
-            IEnumerable<PackageInfo> packages = await _installationManager.GetAvailablePackages().ConfigureAwait(false);
-
-            return ToOptimizedResult(packages.ToArray());
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <exception cref="ResourceNotFoundException"></exception>
-        public async Task Post(InstallPackage request)
-        {
-            var packages = await _installationManager.GetAvailablePackages().ConfigureAwait(false);
-            if (!string.IsNullOrEmpty(request.RepositoryUrl))
-            {
-                packages = packages.Where(p => p.repositoryUrl.Equals(request.RepositoryUrl, StringComparison.OrdinalIgnoreCase))
-                    .ToList();
-            }
-            
-            var package = _installationManager.GetCompatibleVersions(
-                    packages,
-                    request.Name,
-                    string.IsNullOrEmpty(request.AssemblyGuid) ? Guid.Empty : Guid.Parse(request.AssemblyGuid),
-                    string.IsNullOrEmpty(request.Version) ? null : Version.Parse(request.Version)).FirstOrDefault();
-
-            if (package == null)
-            {
-                throw new ResourceNotFoundException(
-                    string.Format(
-                        CultureInfo.InvariantCulture,
-                        "Package not found: {0}",
-                        request.Name));
-            }
-
-            await _installationManager.InstallPackage(package);
-        }
-
-        /// <summary>
-        /// Deletes the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Delete(CancelPackageInstallation request)
-        {
-            _installationManager.CancelInstallation(new Guid(request.Id));
-        }
-    }
-}

From e33824d28667df0344420d42032fbb01e9f8f659 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 5 Sep 2020 20:20:15 +0100
Subject: [PATCH 012/247] Changed to named tuples

---
 .../ApplicationHost.cs                        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index ae6a82e8b9..1e298042c5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1011,13 +1011,15 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Comparison function used in <see cref="GetLatestDLLVersion" />.
         /// </summary>
-        private static int VersionCompare(Tuple<Version, string, string> a, Tuple<Version, string, string> b)
+        private static int VersionCompare(
+            (Version PluginVersion, string Name, string Path) a, 
+            (Version PluginVersion, string Name, string Path) b)
         {
-            int compare = string.Compare(a.Item2, b.Item2, true, CultureInfo.InvariantCulture);
+            int compare = string.Compare(a.Name, b.Name, true, CultureInfo.InvariantCulture);
 
             if (compare == 0)
             {
-                return a.Item1.CompareTo(b.Item1);
+                return a.PluginVersion.CompareTo(b.PluginVersion);
             }
 
             return compare;
@@ -1034,7 +1036,7 @@ namespace Emby.Server.Implementations
         protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = true)
         {
             var dllList = new List<string>();
-            var versions = new List<Tuple<Version, string, string>>();
+            var versions = new List<(Version PluginVersion, string Name, string Path)>();
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
 
             foreach (var dir in directories)
@@ -1043,12 +1045,12 @@ namespace Emby.Server.Implementations
                 if (p != -1 && Version.TryParse(dir.Substring(p + 1), out Version ver))
                 {
                     // Versioned folder.
-                    versions.Add(Tuple.Create(ver, dir.Substring(0, p), dir));
+                    versions.Add((ver, dir.Substring(0, p), dir));
                 }
                 else
                 {
                     // Un-versioned folder.
-                    versions.Add(Tuple.Create(new Version(), dir, dir));
+                    versions.Add((new Version(), dir, dir));
                 }
             }
 
@@ -1058,10 +1060,10 @@ namespace Emby.Server.Implementations
             // The first item will be the latest version.
             for (int x = versions.Count - 1; x >= 0; x--)
             {
-                if (!string.Equals(lastName, versions[x].Item2, StringComparison.OrdinalIgnoreCase))
+                if (!string.Equals(lastName, versions[x].Name, StringComparison.OrdinalIgnoreCase))
                 {
-                    dllList.AddRange(Directory.EnumerateFiles(versions[x].Item3, "*.dll", SearchOption.AllDirectories));
-                    lastName = versions[x].Item2;
+                    dllList.AddRange(Directory.EnumerateFiles(versions[x].Path, "*.dll", SearchOption.AllDirectories));
+                    lastName = versions[x].Name;
                     continue;
                 }
 
@@ -1070,8 +1072,8 @@ namespace Emby.Server.Implementations
                     // Attempt a cleanup of old folders.
                     try
                     {
-                        Logger.LogDebug("Attempting to delete {0}", versions[x].Item3);
-                        Directory.Delete(versions[x].Item3, true);
+                        Logger.LogDebug("Attempting to delete {0}", versions[x].Path);
+                        Directory.Delete(versions[x].Path, true);
                     }
                     catch
                     {

From 0f6ea123ea1ead19e6efc915e6af62dc4a198329 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 5 Sep 2020 20:55:42 +0100
Subject: [PATCH 013/247] Update ApplicationHost.cs

---
 Emby.Server.Implementations/ApplicationHost.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index d579beb2f2..52c40f4a5e 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;

From 320e3b98ab50e83932156b1a8ce7fc25685f7252 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sat, 5 Sep 2020 23:32:21 -0600
Subject: [PATCH 014/247] Add ci task to publish api client

---
 .ci/azure-pipelines-api-client.yml            | 72 +++++++++++++++++++
 .gitignore                                    |  1 +
 apiclient/.openapi-generator-ignore           |  2 +
 .../templates/typescript/package.mustache     | 30 ++++++++
 apiclient/templates/typescript/stable.sh      | 10 +++
 apiclient/templates/typescript/unstable.sh    | 10 +++
 6 files changed, 125 insertions(+)
 create mode 100644 .ci/azure-pipelines-api-client.yml
 create mode 100644 apiclient/.openapi-generator-ignore
 create mode 100644 apiclient/templates/typescript/package.mustache
 create mode 100644 apiclient/templates/typescript/stable.sh
 create mode 100644 apiclient/templates/typescript/unstable.sh

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
new file mode 100644
index 0000000000..babee15b5a
--- /dev/null
+++ b/.ci/azure-pipelines-api-client.yml
@@ -0,0 +1,72 @@
+parameters:
+  - name: LinuxImage
+    type: string
+    default: "ubuntu-latest"
+  - name: GeneratorVersion
+    type: string
+    default: "4.3.1"
+
+jobs:
+- job: GenerateApiClients
+  displayName: 'Generate Api Clients'
+
+  pool:
+    vmImage: "${{ parameters.LinuxImage }}"
+
+  steps:
+    - task: DownloadPipelineArtifact@2
+      displayName: 'Download OpenAPI Spec Artifact'
+      inputs:
+        source: "specific"
+        artifact: "OpenAPI Spec"
+        path: "$(System.ArtifactsDirectory)/openapi"
+        project: "$(System.TeamProjectId)"
+        pipeline: "29" # The main server CI build
+        runVersion: "latestFromBranch"
+        runBranch: "refs/heads/$(System.PullRequest.TargetBranch)"
+
+    - task: CmdLine@2
+    displayName: 'Download OpenApi Generator'
+    inputs:
+      scripts: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar"
+
+# Generate npm api client
+# Unstable
+    - task: npmAuthenticate@0
+    displayName: 'Authenticate to unstable npm feed'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+
+    - task: CmdLine@2
+    displayName: 'Build unstable typescript axios client'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+    inputs:
+      script: 'bash ./apiclient/templates/typescript/unstable.sh axios'
+
+    - task: Npm@1
+    displayName: 'Publish unstable typescript axios client'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+    inputs:
+      command: publish
+      publishRegistry: useFeed
+      publishFeed: jellyfin/unstable
+      workingDir: ./apiclient/generated/typescript/axios
+
+# Stable
+    - task: npmAuthenticate@0
+    displayName: 'Authenticate to stable npm feed'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
+
+    - task: CmdLine@2
+    displayName: 'Build stable typescript axios client'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
+    inputs:
+      script: 'bash ./apiclient/templates/typescript/stable.sh axios'
+
+    - task: Npm@1
+    displayName: 'Publish stable typescript axios client'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
+    inputs:
+      command: publish
+      publishRegistry: useExternalRegistry
+      publishEndpoint: 
+      workingDir: ./apiclient/generated/typescript/axios
diff --git a/.gitignore b/.gitignore
index 0df7606ce9..7cd3d0068a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -276,3 +276,4 @@ BenchmarkDotNet.Artifacts
 web/
 web-src.*
 MediaBrowser.WebDashboard/jellyfin-web
+apiclient/generated
diff --git a/apiclient/.openapi-generator-ignore b/apiclient/.openapi-generator-ignore
new file mode 100644
index 0000000000..f3802cf541
--- /dev/null
+++ b/apiclient/.openapi-generator-ignore
@@ -0,0 +1,2 @@
+# Prevent generator from creating these files:
+git_push.sh
diff --git a/apiclient/templates/typescript/package.mustache b/apiclient/templates/typescript/package.mustache
new file mode 100644
index 0000000000..5127917a14
--- /dev/null
+++ b/apiclient/templates/typescript/package.mustache
@@ -0,0 +1,30 @@
+{
+  "name": "jellyfin-apiclient-{{npmName}}",
+  "version": "10.7.0{{snapshotVersion}}",
+  "description": "Jellyfin api client using {{npmName}}",
+  "author": "Jellyfin Contributors",
+  "keywords": [
+    "{{npmName}}",
+    "typescript",
+    "jellyfin"
+  ],
+  "license": "GPL-3.0-only",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc --outDir dist/",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "axios": "^0.19.2"
+  },
+  "devDependencies": {
+    "@types/node": "^12.11.5",
+    "typescript": "^3.6.4"
+  }{{#npmRepository}},{{/npmRepository}}
+{{#npmRepository}}
+  "publishConfig": {
+    "registry": "{{npmRepository}}"
+  }
+{{/npmRepository}}
+}
diff --git a/apiclient/templates/typescript/stable.sh b/apiclient/templates/typescript/stable.sh
new file mode 100644
index 0000000000..46af6433f4
--- /dev/null
+++ b/apiclient/templates/typescript/stable.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CLIENT=$1
+openapi-generator generate \
+    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --generator-name typescript-${CLIENT} \
+    --output ./apiclient/generated/typescript/${CLIENT}  \
+    --template-dir ./apiclient/templates/typescript \
+    --ignore-file-override ./apiclient/.openapi-generator-ignore \
+    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}"
diff --git a/apiclient/templates/typescript/unstable.sh b/apiclient/templates/typescript/unstable.sh
new file mode 100644
index 0000000000..255e20c4fc
--- /dev/null
+++ b/apiclient/templates/typescript/unstable.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CLIENT=$1
+openapi-generator generate \
+    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --generator-name typescript-${CLIENT} \
+    --output ./apiclient/generated/typescript/${CLIENT}  \
+    --template-dir ./apiclient/templates/typescript \
+    --ignore-file-override ./apiclient/.openapi-generator-ignore \
+    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"

From 6ffffa95a7cfa092bc4dd1b75e25f1010d0d8855 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sun, 6 Sep 2020 08:26:36 -0600
Subject: [PATCH 015/247] Use jar directly

---
 .ci/azure-pipelines.yml                    | 3 +++
 apiclient/templates/typescript/stable.sh   | 2 +-
 apiclient/templates/typescript/unstable.sh | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index b417aae678..f3e515447d 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -55,3 +55,6 @@ jobs:
 
 - ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
   - template: azure-pipelines-package.yml
+
+- ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
+    - template: azure-pipelines-api-client.yml
diff --git a/apiclient/templates/typescript/stable.sh b/apiclient/templates/typescript/stable.sh
index 46af6433f4..f23a85cc96 100644
--- a/apiclient/templates/typescript/stable.sh
+++ b/apiclient/templates/typescript/stable.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CLIENT=$1
-openapi-generator generate \
+java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
     --generator-name typescript-${CLIENT} \
     --output ./apiclient/generated/typescript/${CLIENT}  \
diff --git a/apiclient/templates/typescript/unstable.sh b/apiclient/templates/typescript/unstable.sh
index 255e20c4fc..3571c8ad5c 100644
--- a/apiclient/templates/typescript/unstable.sh
+++ b/apiclient/templates/typescript/unstable.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CLIENT=$1
-openapi-generator generate \
+java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
     --generator-name typescript-${CLIENT} \
     --output ./apiclient/generated/typescript/${CLIENT}  \

From 95265288a6d2d28e6a7c8aa6861a54539978f6cd Mon Sep 17 00:00:00 2001
From: Cromefire_ <cromefire_@outlook.com>
Date: Mon, 7 Sep 2020 21:46:19 +0200
Subject: [PATCH 016/247] More expressive name for the VideoStream API

---
 Jellyfin.Api/Controllers/VideosController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs
index 5c65399cb8..3126a0bc33 100644
--- a/Jellyfin.Api/Controllers/VideosController.cs
+++ b/Jellyfin.Api/Controllers/VideosController.cs
@@ -325,9 +325,9 @@ namespace Jellyfin.Api.Controllers
         /// <param name="streamOptions">Optional. The streaming options.</param>
         /// <response code="200">Video stream returned.</response>
         /// <returns>A <see cref="FileResult"/> containing the audio file.</returns>
-        [HttpGet("{itemId}/{stream=stream}.{container?}", Name = "GetVideoStream_2")]
+        [HttpGet("{itemId}/{stream=stream}.{container?}", Name = "GetVideoStreamWithExt")]
         [HttpGet("{itemId}/stream")]
-        [HttpHead("{itemId}/{stream=stream}.{container?}", Name = "HeadVideoStream_2")]
+        [HttpHead("{itemId}/{stream=stream}.{container?}", Name = "HeadVideoStreamWithExt")]
         [HttpHead("{itemId}/stream", Name = "HeadVideoStream")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<ActionResult> GetVideoStream(

From e11a57f19b6f77138765b0924fe8f2731b32b6dc Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Tue, 8 Sep 2020 16:12:47 +0200
Subject: [PATCH 017/247] Fix some warnings

---
 .../Plugins/Tmdb/Models/General/Videos.cs     |  2 +-
 .../Plugins/Tmdb/Models/Movies/Trailers.cs    |  2 +-
 .../Tmdb/Models/People/PersonImages.cs        |  2 +-
 .../Plugins/Tmdb/Movies/TmdbImageProvider.cs  |  5 ++-
 .../{TmdbSettings.cs => TmdbImageSettings.cs} | 11 ++----
 .../Plugins/Tmdb/Movies/TmdbMovieProvider.cs  | 28 +++++++-------
 .../Plugins/Tmdb/Movies/TmdbSearch.cs         |  7 +++-
 .../Plugins/Tmdb/Movies/TmdbSettingsResult.cs |  9 +++++
 .../Tmdb/Music/TmdbMusicVideoProvider.cs      |  4 +-
 .../Plugins/Tmdb/People/TmdbPersonProvider.cs | 11 ++----
 .../Tmdb/TV/TmdbEpisodeImageProvider.cs       | 23 +++++++-----
 .../Plugins/Tmdb/TV/TmdbEpisodeProvider.cs    | 15 ++++----
 .../Tmdb/TV/TmdbEpisodeProviderBase.cs        | 13 +++++--
 .../Plugins/Tmdb/TV/TmdbSeasonProvider.cs     | 23 ++++++++----
 .../Tmdb/TV/TmdbSeriesImageProvider.cs        | 26 ++++++-------
 .../Plugins/Tmdb/TV/TmdbSeriesProvider.cs     | 37 ++++++++-----------
 .../Tmdb/Trailers/TmdbTrailerProvider.cs      |  8 ++--
 .../Studios/StudiosImageProvider.cs           | 16 ++++----
 .../Subtitles/SubtitleManager.cs              |  2 +-
 .../TV/MissingEpisodeProvider.cs              | 15 ++++++--
 .../TV/SeasonMetadataService.cs               |  6 +--
 21 files changed, 146 insertions(+), 119 deletions(-)
 rename MediaBrowser.Providers/Plugins/Tmdb/Movies/{TmdbSettings.cs => TmdbImageSettings.cs} (55%)
 create mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs
index 241dcab4de..1c673fdbd6 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs
@@ -6,6 +6,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
 {
     public class Videos
     {
-        public List<Video> Results { get; set; }
+        public IReadOnlyList<Video> Results { get; set; }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs
index 166860f517..0571772944 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs
@@ -6,6 +6,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
 {
     public class Trailers
     {
-        public List<Youtube> Youtube { get; set; }
+        public IReadOnlyList<Youtube> Youtube { get; set; }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs
index 3ea12334e8..d82e0fc6de 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs
@@ -7,6 +7,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Models.People
 {
     public class PersonImages
     {
-        public List<Profile> Profiles { get; set; }
+        public IReadOnlyList<Profile> Profiles { get; set; }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs
index a975fb8f6a..9db7e09974 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs
@@ -38,6 +38,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
         public static string ProviderName => TmdbUtils.ProviderName;
 
+        /// <inheritdoc />
+        public int Order => 0;
+
         public bool Supports(BaseItem item)
         {
             return item is Movie || item is MusicVideo || item is Trailer;
@@ -201,8 +204,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
             return null;
         }
 
-        public int Order => 0;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettings.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs
similarity index 55%
rename from MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettings.cs
rename to MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs
index 128258ab36..1ba8f9072a 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettings.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs
@@ -6,22 +6,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 {
     internal class TmdbImageSettings
     {
-        public List<string> backdrop_sizes { get; set; }
+        public IReadOnlyList<string> backdrop_sizes { get; set; }
 
         public string secure_base_url { get; set; }
 
-        public List<string> poster_sizes { get; set; }
+        public IReadOnlyList<string> poster_sizes { get; set; }
 
-        public List<string> profile_sizes { get; set; }
+        public IReadOnlyList<string> profile_sizes { get; set; }
 
         public string GetImageUrl(string image)
         {
             return secure_base_url + image;
         }
     }
-
-    internal class TmdbSettingsResult
-    {
-        public TmdbImageSettings images { get; set; }
-    }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index 5d383722a0..31cfd86494 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
         private const string TmdbConfigUrl = TmdbUtils.BaseTmdbApiUrl + "3/configuration?api_key={0}";
         private const string GetMovieInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/movie/{0}?api_key={1}&append_to_response=casts,releases,images,keywords,trailers";
 
-        internal static TmdbMovieProvider Current { get; private set; }
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
@@ -44,7 +44,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
         private readonly ILibraryManager _libraryManager;
         private readonly IApplicationHost _appHost;
 
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+        /// <summary>
+        /// The _TMDB settings task.
+        /// </summary>
+        private TmdbSettingsResult _tmdbSettings;
 
         public TmdbMovieProvider(
             IJsonSerializer jsonSerializer,
@@ -65,6 +68,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
             Current = this;
         }
 
+        internal static TmdbMovieProvider Current { get; private set; }
+
+        /// <inheritdoc />
+        public string Name => TmdbUtils.ProviderName;
+
+        /// <inheritdoc />
+        public int Order => 1;
+
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
         {
             return GetMovieSearchResults(searchInfo, cancellationToken);
@@ -131,13 +142,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
             return movieDb.GetMetadata(id, cancellationToken);
         }
 
-        public string Name => TmdbUtils.ProviderName;
-
-        /// <summary>
-        /// The _TMDB settings task.
-        /// </summary>
-        private TmdbSettingsResult _tmdbSettings;
-
         /// <summary>
         /// Gets the TMDB settings.
         /// </summary>
@@ -272,7 +276,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 languages.Add("en");
             }
 
-            return string.Join(",", languages);
+            return string.Join(',', languages);
         }
 
         public static string NormalizeLanguage(string language)
@@ -381,15 +385,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
         /// <summary>
         /// Gets the movie db response.
         /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         internal Task<HttpResponseMessage> GetMovieDbResponse(HttpRequestMessage message, CancellationToken cancellationToken = default)
         {
             message.Headers.UserAgent.ParseAdd(_appHost.ApplicationUserAgent);
             return _httpClientFactory.CreateClient(NamedClient.Default).SendAsync(message, cancellationToken);
         }
 
-        /// <inheritdoc />
-        public int Order => 1;
-
         /// <inheritdoc />
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs
index d885cd90b3..36a4eef8a3 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs
@@ -207,7 +207,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
             return results
                 .Select(i =>
                 {
-                    var remoteResult = new RemoteSearchResult {SearchProviderName = TmdbMovieProvider.Current.Name, Name = i.Title ?? i.Name ?? i.Original_Title, ImageUrl = string.IsNullOrWhiteSpace(i.Poster_Path) ? null : baseImageUrl + i.Poster_Path};
+                    var remoteResult = new RemoteSearchResult
+                    {
+                        SearchProviderName = TmdbMovieProvider.Current.Name,
+                        Name = i.Title ?? i.Name ?? i.Original_Title,
+                        ImageUrl = string.IsNullOrWhiteSpace(i.Poster_Path) ? null : baseImageUrl + i.Poster_Path
+                    };
 
                     if (!string.IsNullOrWhiteSpace(i.Release_Date))
                     {
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs
new file mode 100644
index 0000000000..c7ba974386
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs
@@ -0,0 +1,9 @@
+#pragma warning disable CS1591
+
+namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
+{
+    internal class TmdbSettingsResult
+    {
+        public TmdbImageSettings images { get; set; }
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs
index 73e49ba5bf..b88ecce87f 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs
@@ -14,6 +14,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Music
 {
     public class TmdbMusicVideoProvider : IRemoteMetadataProvider<MusicVideo, MusicVideoInfo>
     {
+        public string Name => TmdbMovieProvider.Current.Name;
+
         public Task<MetadataResult<MusicVideo>> GetMetadata(MusicVideoInfo info, CancellationToken cancellationToken)
         {
             return TmdbMovieProvider.Current.GetItemMetadata<MusicVideo>(info, cancellationToken);
@@ -24,8 +26,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Music
             return Task.FromResult((IEnumerable<RemoteSearchResult>)new List<RemoteSearchResult>());
         }
 
-        public string Name => TmdbMovieProvider.Current.Name;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
index 8d1a854d6c..777ebce492 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
 {
     public class TmdbPersonProvider : IRemoteMetadataProvider<Person, PersonLookupInfo>
     {
-        const string DataFileName = "info.json";
+        private const string DataFileName = "info.json";
 
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
@@ -39,20 +39,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
         private readonly IFileSystem _fileSystem;
         private readonly IServerConfigurationManager _configurationManager;
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly ILogger<TmdbPersonProvider> _logger;
 
         public TmdbPersonProvider(
             IFileSystem fileSystem,
             IServerConfigurationManager configurationManager,
             IJsonSerializer jsonSerializer,
-            IHttpClientFactory httpClientFactory,
-            ILogger<TmdbPersonProvider> logger)
+            IHttpClientFactory httpClientFactory)
         {
             _fileSystem = fileSystem;
             _configurationManager = configurationManager;
             _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
-            _logger = logger;
             Current = this;
         }
 
@@ -75,7 +72,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
                 var dataFilePath = GetPersonDataFilePath(_configurationManager.ApplicationPaths, tmdbId);
                 var info = _jsonSerializer.DeserializeFromFile<PersonResult>(dataFilePath);
 
-                var images = (info.Images ?? new PersonImages()).Profiles ?? new List<Profile>();
+                IReadOnlyList<Profile> images = info.Images?.Profiles ?? Array.Empty<Profile>();
 
                 var result = new RemoteSearchResult
                 {
@@ -95,7 +92,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
             if (searchInfo.IsAutomated)
             {
                 // Don't hammer moviedb searching by name
-                return new List<RemoteSearchResult>();
+                return Array.Empty<RemoteSearchResult>();
             }
 
             var url = string.Format(
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
index eebecdac67..c56774f8e7 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
@@ -28,7 +28,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
     {
         public TmdbEpisodeImageProvider(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
             : base(httpClientFactory, configurationManager, jsonSerializer, fileSystem, localization, loggerFactory)
-        { }
+        {
+        }
+
+        public string Name => TmdbUtils.ProviderName;
+
+        // After TheTvDb
+        public int Order => 1;
 
         public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
         {
@@ -43,7 +49,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             var episode = (Controller.Entities.TV.Episode)item;
             var series = episode.Series;
 
-            var seriesId = series != null ? series.GetProviderId(MetadataProvider.Tmdb) : null;
+            var seriesId = series?.GetProviderId(MetadataProvider.Tmdb);
 
             var list = new List<RemoteImageInfo>();
 
@@ -62,8 +68,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var language = item.GetPreferredMetadataLanguage();
 
-            var response = await GetEpisodeInfo(seriesId, seasonNumber.Value, episodeNumber.Value,
-                        language, cancellationToken).ConfigureAwait(false);
+            var response = await GetEpisodeInfo(
+                seriesId,
+                seasonNumber.Value,
+                episodeNumber.Value,
+                language,
+                cancellationToken).ConfigureAwait(false);
 
             var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
 
@@ -120,14 +130,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             return GetResponse(url, cancellationToken);
         }
 
-        public string Name => TmdbUtils.ProviderName;
-
         public bool Supports(BaseItem item)
         {
             return item is Controller.Entities.TV.Episode;
         }
-
-        // After TheTvDb
-        public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
index ed4739acbf..a7e3a03fe3 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
@@ -29,7 +29,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
     {
         public TmdbEpisodeProvider(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
             : base(httpClientFactory, configurationManager, jsonSerializer, fileSystem, localization, loggerFactory)
-        { }
+        {
+        }
+
+        // After TheTvDb
+        public int Order => 1;
+
+        public string Name => TmdbUtils.ProviderName;
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(EpisodeInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -41,7 +47,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 return list;
             }
 
-            var metadataResult = await GetMetadata(searchInfo, cancellationToken);
+            var metadataResult = await GetMetadata(searchInfo, cancellationToken).ConfigureAwait(false);
 
             if (metadataResult.HasMetadata)
             {
@@ -205,10 +211,5 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         {
             return GetResponse(url, cancellationToken);
         }
-
-        // After TheTvDb
-        public int Order => 1;
-
-        public string Name => TmdbUtils.ProviderName;
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
index 55b0f0409e..34d2424a34 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
@@ -21,11 +21,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
     public abstract class TmdbEpisodeProviderBase
     {
         private const string EpisodeUrlPattern = TmdbUtils.BaseTmdbApiUrl + @"3/tv/{0}/season/{1}/episode/{2}?api_key={3}&append_to_response=images,external_ids,credits,videos";
+
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IServerConfigurationManager _configurationManager;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IFileSystem _fileSystem;
-        private readonly ILocalizationManager _localization;
         private readonly ILogger<TmdbEpisodeProviderBase> _logger;
 
         protected TmdbEpisodeProviderBase(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
@@ -34,13 +34,16 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             _configurationManager = configurationManager;
             _jsonSerializer = jsonSerializer;
             _fileSystem = fileSystem;
-            _localization = localization;
             _logger = loggerFactory.CreateLogger<TmdbEpisodeProviderBase>();
         }
 
         protected ILogger Logger => _logger;
 
-        protected async Task<EpisodeResult> GetEpisodeInfo(string seriesTmdbId, int season, int episodeNumber, string preferredMetadataLanguage,
+        protected async Task<EpisodeResult> GetEpisodeInfo(
+            string seriesTmdbId,
+            int season,
+            int episodeNumber,
+            string preferredMetadataLanguage,
             CancellationToken cancellationToken)
         {
             await EnsureEpisodeInfo(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage, cancellationToken)
@@ -93,7 +96,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var path = TmdbSeriesProvider.GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
 
-            var filename = string.Format(CultureInfo.InvariantCulture, "season-{0}-episode-{1}-{2}.json",
+            var filename = string.Format(
+                CultureInfo.InvariantCulture,
+                "season-{0}-episode-{1}-{2}.json",
                 seasonNumber.ToString(CultureInfo.InvariantCulture),
                 episodeNumber.ToString(CultureInfo.InvariantCulture),
                 preferredLanguage);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
index 40f1c4e69f..c9b257fcc2 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
@@ -28,26 +28,32 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
     public class TmdbSeasonProvider : IRemoteMetadataProvider<Season, SeasonInfo>
     {
         private const string GetTvInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/tv/{0}/season/{1}?api_key={2}&append_to_response=images,keywords,external_ids,credits,videos";
+
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IServerConfigurationManager _configurationManager;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IFileSystem _fileSystem;
-        private readonly ILocalizationManager _localization;
         private readonly ILogger<TmdbSeasonProvider> _logger;
 
         internal static TmdbSeasonProvider Current { get; private set; }
 
-        public TmdbSeasonProvider(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, ILogger<TmdbSeasonProvider> logger)
+        public TmdbSeasonProvider(
+            IHttpClientFactory httpClientFactory,
+            IServerConfigurationManager configurationManager,
+            IFileSystem fileSystem,
+            IJsonSerializer jsonSerializer,
+            ILogger<TmdbSeasonProvider> logger)
         {
             _httpClientFactory = httpClientFactory;
             _configurationManager = configurationManager;
             _fileSystem = fileSystem;
-            _localization = localization;
             _jsonSerializer = jsonSerializer;
             _logger = logger;
             Current = this;
         }
 
+        public string Name => TmdbUtils.ProviderName;
+
         public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, CancellationToken cancellationToken)
         {
             var result = new MetadataResult<Season>();
@@ -116,8 +122,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             return result;
         }
 
-        public string Name => TmdbUtils.ProviderName;
-
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeasonInfo searchInfo, CancellationToken cancellationToken)
         {
             return Task.FromResult<IEnumerable<RemoteSearchResult>>(new List<RemoteSearchResult>());
@@ -128,7 +132,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
         }
 
-        private async Task<SeasonResult> GetSeasonInfo(string seriesTmdbId, int season, string preferredMetadataLanguage,
+        private async Task<SeasonResult> GetSeasonInfo(
+            string seriesTmdbId,
+            int season,
+            string preferredMetadataLanguage,
             CancellationToken cancellationToken)
         {
             await EnsureSeasonInfo(seriesTmdbId, season, preferredMetadataLanguage, cancellationToken)
@@ -181,7 +188,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var path = TmdbSeriesProvider.GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
 
-            var filename = string.Format(CultureInfo.InvariantCulture, "season-{0}-{1}.json",
+            var filename = string.Format(
+                CultureInfo.InvariantCulture,
+                "season-{0}-{1}.json",
                 seasonNumber.ToString(CultureInfo.InvariantCulture),
                 preferredLanguage);
 
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 125560175e..e2cd5e441c 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -25,9 +26,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
     {
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IFileSystem _fileSystem;
 
-        public TmdbSeriesImageProvider(IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory, IFileSystem fileSystem)
+        public TmdbSeriesImageProvider(IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory)
         {
             _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
@@ -38,6 +38,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
         public static string ProviderName => TmdbUtils.ProviderName;
 
+        // After tvdb and fanart
+        public int Order => 2;
+
         public bool Supports(BaseItem item)
         {
             return item is Series;
@@ -56,7 +59,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         {
             var list = new List<RemoteImageInfo>();
 
-            var results = await FetchImages(item, null, _jsonSerializer, cancellationToken).ConfigureAwait(false);
+            var results = await FetchImages(item, null, cancellationToken).ConfigureAwait(false);
 
             if (results == null)
             {
@@ -148,10 +151,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="language">The language.</param>
-        /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{MovieImages}.</returns>
-        private async Task<Images> FetchImages(BaseItem item, string language, IJsonSerializer jsonSerializer,
+        private async Task<Images> FetchImages(
+            BaseItem item,
+            string language,
             CancellationToken cancellationToken)
         {
             var tmdbId = item.GetProviderId(MetadataProvider.Tmdb);
@@ -165,22 +169,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var path = TmdbSeriesProvider.Current.GetDataFilePath(tmdbId, language);
 
-            if (!string.IsNullOrEmpty(path))
+            if (!string.IsNullOrEmpty(path) && File.Exists(path))
             {
-                var fileInfo = _fileSystem.GetFileInfo(path);
-
-                if (fileInfo.Exists)
-                {
-                    return jsonSerializer.DeserializeFromFile<SeriesResult>(path).Images;
-                }
+                return _jsonSerializer.DeserializeFromFile<SeriesResult>(path).Images;
             }
 
             return null;
         }
 
-        // After tvdb and fanart
-        public int Order => 2;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
index fa0873b9de..287ebca8c9 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
@@ -17,8 +17,6 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Providers.Plugins.Tmdb.Models.Search;
@@ -33,38 +31,35 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         private const string GetTvInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/tv/{0}?api_key={1}&append_to_response=credits,images,keywords,external_ids,videos,content_ratings";
 
         private readonly IJsonSerializer _jsonSerializer;
-        private readonly IFileSystem _fileSystem;
         private readonly IServerConfigurationManager _configurationManager;
         private readonly ILogger<TmdbSeriesProvider> _logger;
-        private readonly ILocalizationManager _localization;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly ILibraryManager _libraryManager;
 
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
-        internal static TmdbSeriesProvider Current { get; private set; }
-
         public TmdbSeriesProvider(
             IJsonSerializer jsonSerializer,
-            IFileSystem fileSystem,
             IServerConfigurationManager configurationManager,
             ILogger<TmdbSeriesProvider> logger,
-            ILocalizationManager localization,
             IHttpClientFactory httpClientFactory,
             ILibraryManager libraryManager)
         {
             _jsonSerializer = jsonSerializer;
-            _fileSystem = fileSystem;
             _configurationManager = configurationManager;
             _logger = logger;
-            _localization = localization;
             _httpClientFactory = httpClientFactory;
             _libraryManager = libraryManager;
             Current = this;
         }
 
+        internal static TmdbSeriesProvider Current { get; private set; }
+
         public string Name => TmdbUtils.ProviderName;
 
+        // After TheTVDB
+        public int Order => 1;
+
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
         {
             var tmdbId = searchInfo.GetProviderId(MetadataProvider.Tmdb);
@@ -129,8 +124,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
         public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, CancellationToken cancellationToken)
         {
-            var result = new MetadataResult<Series>();
-            result.QueriedById = true;
+            var result = new MetadataResult<Series>
+            {
+                QueriedById = true
+            };
 
             var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
 
@@ -206,9 +203,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             await EnsureSeriesInfo(tmdbId, language, cancellationToken).ConfigureAwait(false);
 
-            var result = new MetadataResult<Series>();
-            result.Item = new Series();
-            result.ResultLanguage = seriesInfo.ResultLanguage;
+            var result = new MetadataResult<Series>
+            {
+                Item = new Series(),
+                ResultLanguage = seriesInfo.ResultLanguage
+            };
 
             var settings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
 
@@ -474,12 +473,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var path = GetDataFilePath(tmdbId, language);
 
-            var fileInfo = _fileSystem.GetFileSystemInfo(path);
-
+            var fileInfo = new FileInfo(path);
             if (fileInfo.Exists)
             {
                 // If it's recent or automatic updates are enabled, don't re-download
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
+                if ((DateTime.UtcNow - fileInfo.LastWriteTimeUtc).TotalDays <= 2)
                 {
                     return Task.CompletedTask;
                 }
@@ -549,9 +547,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             return null;
         }
 
-        // After TheTVDB
-        public int Order => 1;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs
index 25296387ba..613dc17e31 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs
@@ -21,6 +21,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Trailers
             _httpClientFactory = httpClientFactory;
         }
 
+        public string Name => TmdbMovieProvider.Current.Name;
+
+        public int Order => 0;
+
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(TrailerInfo searchInfo, CancellationToken cancellationToken)
         {
             return TmdbMovieProvider.Current.GetMovieSearchResults(searchInfo, cancellationToken);
@@ -31,10 +35,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Trailers
             return TmdbMovieProvider.Current.GetItemMetadata<Trailer>(info, cancellationToken);
         }
 
-        public string Name => TmdbMovieProvider.Current.Name;
-
-        public int Order => 0;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
index 76dc7df7f7..90e13f12f8 100644
--- a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
+++ b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
@@ -33,6 +33,8 @@ namespace MediaBrowser.Providers.Studios
 
         public string Name => "Emby Designs";
 
+        public int Order => 0;
+
         public bool Supports(BaseItem item)
         {
             return item is Studio;
@@ -119,8 +121,6 @@ namespace MediaBrowser.Providers.Studios
             return EnsureList(url, file, _fileSystem, cancellationToken);
         }
 
-        public int Order => 0;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);
@@ -161,12 +161,12 @@ namespace MediaBrowser.Providers.Studios
 
         private string GetComparableName(string name)
         {
-            return name.Replace(" ", string.Empty)
-                .Replace(".", string.Empty)
-                .Replace("&", string.Empty)
-                .Replace("!", string.Empty)
-                .Replace(",", string.Empty)
-                .Replace("/", string.Empty);
+            return name.Replace(" ", string.Empty, StringComparison.Ordinal)
+                .Replace(".", string.Empty, StringComparison.Ordinal)
+                .Replace("&", string.Empty, StringComparison.Ordinal)
+                .Replace("!", string.Empty, StringComparison.Ordinal)
+                .Replace(",", string.Empty, StringComparison.Ordinal)
+                .Replace("/", string.Empty, StringComparison.Ordinal);
         }
 
         public IEnumerable<string> GetAvailableImages(string file)
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 0f7cb3f8fa..f25d3d5ee7 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -303,7 +303,7 @@ namespace MediaBrowser.Providers.Subtitles
 
         private ISubtitleProvider GetProvider(string id)
         {
-            return _subtitleProviders.First(i => string.Equals(id, GetProviderId(i.Name)));
+            return _subtitleProviders.First(i => string.Equals(id, GetProviderId(i.Name), StringComparison.Ordinal));
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
index 616c61ec0a..c833b12271 100644
--- a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
@@ -48,18 +48,25 @@ namespace MediaBrowser.Providers.TV
 
         public async Task<bool> Run(Series series, bool addNewItems, CancellationToken cancellationToken)
         {
-            var tvdbId = series.GetProviderId(MetadataProvider.Tvdb);
-            if (string.IsNullOrEmpty(tvdbId))
+            var tvdbIdString = series.GetProviderId(MetadataProvider.Tvdb);
+            if (string.IsNullOrEmpty(tvdbIdString))
             {
                 return false;
             }
 
-            var episodes = await _tvdbClientManager.GetAllEpisodesAsync(Convert.ToInt32(tvdbId), series.GetPreferredMetadataLanguage(), cancellationToken);
+            var episodes = await _tvdbClientManager.GetAllEpisodesAsync(
+                int.Parse(tvdbIdString, CultureInfo.InvariantCulture),
+                series.GetPreferredMetadataLanguage(),
+                cancellationToken).ConfigureAwait(false);
 
             var episodeLookup = episodes
                 .Select(i =>
                 {
-                    DateTime.TryParse(i.FirstAired, out var firstAired);
+                    if (!DateTime.TryParse(i.FirstAired, out var firstAired))
+                    {
+                        firstAired = default;
+                    }
+
                     var seasonNumber = i.AiredSeason.GetValueOrDefault(-1);
                     var episodeNumber = i.AiredEpisodeNumber.GetValueOrDefault(-1);
                     return (seasonNumber, episodeNumber, firstAired);
diff --git a/MediaBrowser.Providers/TV/SeasonMetadataService.cs b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
index 5431de623e..4e59f78bc4 100644
--- a/MediaBrowser.Providers/TV/SeasonMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
@@ -27,6 +27,9 @@ namespace MediaBrowser.Providers.TV
         {
         }
 
+        /// <inheritdoc />
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
+
         /// <inheritdoc />
         protected override ItemUpdateType BeforeSaveInternal(Season item, bool isFullRefresh, ItemUpdateType currentUpdateType)
         {
@@ -67,9 +70,6 @@ namespace MediaBrowser.Providers.TV
             return updateType;
         }
 
-        /// <inheritdoc />
-        protected override bool EnableUpdatingPremiereDateFromChildren => true;
-
         /// <inheritdoc />
         protected override IList<BaseItem> GetChildrenForMetadataUpdates(Season item)
             => item.GetEpisodes();

From 2eff0db804dcc46849ad536ad14c3f5faa0695be Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 8 Sep 2020 17:49:38 +0100
Subject: [PATCH 018/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 52c40f4a5e..8144718037 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1080,7 +1080,7 @@ namespace Emby.Server.Implementations
                     // Attempt a cleanup of old folders.
                     try
                     {
-                        Logger.LogDebug("Attempting to delete {0}", versions[x].Path);
+                        Logger.LogDebug("Deleting {Path}", versions[x].Path);
                         Directory.Delete(versions[x].Path, true);
                     }
                     catch

From a9d8b53658930d062c1f2ddc34715c51aec08ce1 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 8 Sep 2020 17:49:55 +0100
Subject: [PATCH 019/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 8144718037..a6b6505bf9 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1083,9 +1083,9 @@ namespace Emby.Server.Implementations
                         Logger.LogDebug("Deleting {Path}", versions[x].Path);
                         Directory.Delete(versions[x].Path, true);
                     }
-                    catch
+                    catch (Exception e)
                     {
-                        // Ignore errors.
+                        Logger.LogWarning(e, "Unable to delete {Path}", versions[x].Path);
                     }
                 }
             }

From f4eb34a9662a2474cf555e1665db517ee41db68e Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 8 Sep 2020 17:50:19 +0100
Subject: [PATCH 020/247] Update
 Emby.Server.Implementations/Updates/InstallationManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/Updates/InstallationManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 81cf18f8df..5af2b7e32f 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -375,7 +375,7 @@ namespace Emby.Server.Implementations.Updates
             }
 
             // Version folder as they cannot be overwritten in Windows.
-            targetDir += "_" + package.Version.ToString();
+            targetDir += "_" + package.Version;
 
             if (Directory.Exists(targetDir))
             {

From ddfb13f94550b6df7cbe7d6aeb17ab91d4bb2b54 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 8 Sep 2020 17:50:37 +0100
Subject: [PATCH 021/247] Update
 Emby.Server.Implementations/Updates/InstallationManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/Updates/InstallationManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 5af2b7e32f..ba0fdfc340 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -388,7 +388,6 @@ namespace Emby.Server.Implementations.Updates
                     // Ignore any exceptions.
                 }
             }
-            
             stream.Position = 0;
             _zipClient.ExtractAllFromZip(stream, targetDir, true);
 

From 60e8f47194d0bc7053e5771cd355b1ef628f99a2 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 8 Sep 2020 17:52:08 +0100
Subject: [PATCH 022/247] Update ApplicationHost.cs

---
 Emby.Server.Implementations/ApplicationHost.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a6b6505bf9..1bc436820e 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1049,11 +1049,11 @@ namespace Emby.Server.Implementations
 
             foreach (var dir in directories)
             {
-                int p = dir.LastIndexOf('_');
-                if (p != -1 && Version.TryParse(dir.Substring(p + 1), out Version ver))
+                int underscoreIndex = dir.LastIndexOf('_');
+                if (underscoreIndex != -1 && Version.TryParse(dir.Substring(underscoreIndex + 1), out Version ver))
                 {
                     // Versioned folder.
-                    versions.Add((ver, dir.Substring(0, p), dir));
+                    versions.Add((ver, dir.Substring(0, underscoreIndex), dir));
                 }
                 else
                 {

From 3b319d45c0e1420d381d8e8fdc9b39a4be7ff280 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Tue, 8 Sep 2020 23:15:32 +0200
Subject: [PATCH 023/247] Fix build

---
 .../Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs                  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index e2cd5e441c..179ceb825d 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -13,7 +13,6 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
@@ -31,7 +30,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         {
             _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
-            _fileSystem = fileSystem;
         }
 
         public string Name => ProviderName;

From b9c7cce6968482145ab15603dcca218e67d1b2b9 Mon Sep 17 00:00:00 2001
From: Keridos <2742845+Keridos@users.noreply.github.com>
Date: Wed, 9 Sep 2020 01:57:09 +0200
Subject: [PATCH 024/247] some testing for AudioBook fix PartNumber detection

---
 .../AudioBook/AudioBookFilePathParser.cs      | 17 +---
 Emby.Naming/AudioBook/AudioBookResolver.cs    |  2 +-
 .../AudioBook/AudioBookListResolverTests.cs   | 90 +++++++++++++++++++
 .../AudioBook/AudioBookResolverTests.cs       | 58 ++++++++++++
 4 files changed, 151 insertions(+), 16 deletions(-)
 create mode 100644 tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs
 create mode 100644 tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs

diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
index 3c874c62ca..eb9393b0bd 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
@@ -50,27 +50,14 @@ namespace Emby.Naming.AudioBook
                         {
                             if (int.TryParse(value.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
                             {
-                                result.ChapterNumber = intValue;
+                                result.PartNumber = intValue;
                             }
                         }
                     }
                 }
             }
 
-            /*var matches = _iRegexProvider.GetRegex("\\d+", RegexOptions.IgnoreCase).Matches(fileName);
-            if (matches.Count > 0)
-            {
-                if (!result.ChapterNumber.HasValue)
-                {
-                    result.ChapterNumber = int.Parse(matches[0].Groups[0].Value);
-                }
-
-                if (matches.Count > 1)
-                {
-                    result.PartNumber = int.Parse(matches[matches.Count - 1].Groups[0].Value);
-                }
-            }*/
-            result.Success = result.PartNumber.HasValue || result.ChapterNumber.HasValue;
+            result.Success = result.ChapterNumber.HasValue || result.PartNumber.HasValue;
 
             return result;
         }
diff --git a/Emby.Naming/AudioBook/AudioBookResolver.cs b/Emby.Naming/AudioBook/AudioBookResolver.cs
index 5466b46379..ed53bd04fa 100644
--- a/Emby.Naming/AudioBook/AudioBookResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookResolver.cs
@@ -55,8 +55,8 @@ namespace Emby.Naming.AudioBook
             {
                 Path = path,
                 Container = container,
-                PartNumber = parsingResult.PartNumber,
                 ChapterNumber = parsingResult.ChapterNumber,
+                PartNumber = parsingResult.PartNumber,
                 IsDirectory = isDirectory
             };
         }
diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs
new file mode 100644
index 0000000000..541bb321cd
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs
@@ -0,0 +1,90 @@
+using System.Linq;
+using Emby.Naming.AudioBook;
+using Emby.Naming.Common;
+using MediaBrowser.Model.IO;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.AudioBook
+{
+    public class AudioBookListResolverTests
+    {
+        private readonly NamingOptions _namingOptions = new NamingOptions();
+
+        [Fact]
+        public void TestStackAndExtras()
+        {
+            // No stacking here because there is no part/disc/etc
+            var files = new[]
+            {
+                "Harry Potter and the Deathly Hallows/Part 1.mp3",
+                "Harry Potter and the Deathly Hallows/Part 2.mp3",
+                "Harry Potter and the Deathly Hallows/book.nfo",
+
+                "Batman/Chapter 1.mp3",
+                "Batman/Chapter 2.mp3",
+                "Batman/Chapter 3.mp3",
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+            }).ToList()).ToList();
+
+            Assert.Equal(2, result[0].Files.ToList().Count);
+            // Assert.Empty(result[0].Extras); FIXME: AudioBookListResolver should resolve extra files properly
+            Assert.Equal("Harry Potter and the Deathly Hallows", result[0].Name);
+
+            Assert.Equal(3, result[1].Files.ToList().Count);
+            Assert.Empty(result[1].Extras);
+            Assert.Equal("Batman", result[1].Name);
+        }
+
+        [Fact]
+        public void TestWithMetadata()
+        {
+            var files = new[]
+            {
+                "Harry Potter and the Deathly Hallows/Chapter 1.ogg",
+                "Harry Potter and the Deathly Hallows/Harry Potter and the Deathly Hallows.nfo"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public void TestWithExtra()
+        {
+            var files = new[]
+            {
+                "Harry Potter and the Deathly Hallows/Chapter 1.mp3",
+                "Harry Potter and the Deathly Hallows/Harry Potter and the Deathly Hallows trailer.mp3"
+            };
+
+            var resolver = GetResolver();
+
+            var result = resolver.Resolve(files.Select(i => new FileSystemMetadata
+            {
+                IsDirectory = false,
+                FullName = i
+            }).ToList()).ToList();
+
+            Assert.Single(result);
+        }
+
+        private AudioBookListResolver GetResolver()
+        {
+            return new AudioBookListResolver(_namingOptions);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
new file mode 100644
index 0000000000..5da2e93d8d
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using Emby.Naming.AudioBook;
+using Emby.Naming.Common;
+using MediaBrowser.Model.Entities;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.AudioBook
+{
+    public class AudioBookResolverTests
+    {
+        private readonly NamingOptions _namingOptions = new NamingOptions();
+
+        public static IEnumerable<object[]> GetResolveFileTestData()
+        {
+            yield return new object[]
+            {
+                new AudioBookFileInfo()
+                {
+                    Path = @"/server/AudioBooks/Larry Potter/Larry Potter.mp3",
+                    Container = "mp3",
+                }
+            };
+            yield return new object[]
+            {
+                new AudioBookFileInfo()
+                {
+                    Path = @"/server/AudioBooks/Berry Potter/Chapter 1 .ogg",
+                    Container = "ogg",
+                    ChapterNumber = 1
+                }
+            };
+            yield return new object[]
+            {
+                new AudioBookFileInfo()
+                {
+                    Path = @"/server/AudioBooks/Nerry Potter/Part 3 - Chapter 2.mp3",
+                    Container = "mp3",
+                    ChapterNumber = 2,
+                    PartNumber = 3
+                }
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(GetResolveFileTestData))]
+        public void ResolveFile_ValidFileName_Success(AudioBookFileInfo expectedResult)
+        {
+            var result = new AudioBookResolver(_namingOptions).Resolve(expectedResult.Path);
+
+            Assert.NotNull(result);
+            Assert.Equal(result?.Path, expectedResult.Path);
+            Assert.Equal(result?.Container, expectedResult.Container);
+            Assert.Equal(result?.ChapterNumber, expectedResult.ChapterNumber);
+            Assert.Equal(result?.PartNumber, expectedResult.PartNumber);
+            Assert.Equal(result?.IsDirectory, expectedResult.IsDirectory);
+        }
+    }
+}

From 8eb1eedc8d4b1a287f317013c54ed59a6c29b229 Mon Sep 17 00:00:00 2001
From: Keridos <2742845+Keridos@users.noreply.github.com>
Date: Wed, 9 Sep 2020 02:33:59 +0200
Subject: [PATCH 025/247] implement suggested  changes

---
 .../AudioBook/AudioBookListResolverTests.cs            | 10 +++++-----
 .../AudioBook/AudioBookResolverTests.cs                |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs
index 541bb321cd..1084e20bda 100644
--- a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookListResolverTests.cs
@@ -31,13 +31,13 @@ namespace Jellyfin.Naming.Tests.AudioBook
             {
                 IsDirectory = false,
                 FullName = i
-            }).ToList()).ToList();
+            })).ToList();
 
-            Assert.Equal(2, result[0].Files.ToList().Count);
+            Assert.Equal(2, result[0].Files.Count);
             // Assert.Empty(result[0].Extras); FIXME: AudioBookListResolver should resolve extra files properly
             Assert.Equal("Harry Potter and the Deathly Hallows", result[0].Name);
 
-            Assert.Equal(3, result[1].Files.ToList().Count);
+            Assert.Equal(3, result[1].Files.Count);
             Assert.Empty(result[1].Extras);
             Assert.Equal("Batman", result[1].Name);
         }
@@ -57,7 +57,7 @@ namespace Jellyfin.Naming.Tests.AudioBook
             {
                 IsDirectory = false,
                 FullName = i
-            }).ToList()).ToList();
+            }));
 
             Assert.Single(result);
         }
@@ -77,7 +77,7 @@ namespace Jellyfin.Naming.Tests.AudioBook
             {
                 IsDirectory = false,
                 FullName = i
-            }).ToList()).ToList();
+            })).ToList();
 
             Assert.Single(result);
         }
diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
index 5da2e93d8d..0d29f1703c 100644
--- a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Emby.Naming.AudioBook;
 using Emby.Naming.Common;
-using MediaBrowser.Model.Entities;
 using Xunit;
 
 namespace Jellyfin.Naming.Tests.AudioBook

From ba777039ef6635332c8a92c03d558a7ce8e75b7e Mon Sep 17 00:00:00 2001
From: Keridos <2742845+Keridos@users.noreply.github.com>
Date: Wed, 9 Sep 2020 02:43:06 +0200
Subject: [PATCH 026/247] remove unnecessary nullchecks

---
 .../AudioBook/AudioBookResolverTests.cs                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
index 0d29f1703c..83d44721c4 100644
--- a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookResolverTests.cs
@@ -47,11 +47,11 @@ namespace Jellyfin.Naming.Tests.AudioBook
             var result = new AudioBookResolver(_namingOptions).Resolve(expectedResult.Path);
 
             Assert.NotNull(result);
-            Assert.Equal(result?.Path, expectedResult.Path);
-            Assert.Equal(result?.Container, expectedResult.Container);
-            Assert.Equal(result?.ChapterNumber, expectedResult.ChapterNumber);
-            Assert.Equal(result?.PartNumber, expectedResult.PartNumber);
-            Assert.Equal(result?.IsDirectory, expectedResult.IsDirectory);
+            Assert.Equal(result.Path, expectedResult.Path);
+            Assert.Equal(result.Container, expectedResult.Container);
+            Assert.Equal(result.ChapterNumber, expectedResult.ChapterNumber);
+            Assert.Equal(result.PartNumber, expectedResult.PartNumber);
+            Assert.Equal(result.IsDirectory, expectedResult.IsDirectory);
         }
     }
 }

From 03d4e907286f48bc1f085f30b49569ff4eacc550 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Wed, 9 Sep 2020 18:52:12 -0600
Subject: [PATCH 027/247] add new files to rpm build

---
 fedora/jellyfin.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fedora/jellyfin.spec b/fedora/jellyfin.spec
index 37b573e505..bfb2b3be29 100644
--- a/fedora/jellyfin.spec
+++ b/fedora/jellyfin.spec
@@ -84,6 +84,10 @@ EOF
 %{_libdir}/jellyfin/*.so
 %{_libdir}/jellyfin/*.a
 %{_libdir}/jellyfin/createdump
+%{_libdir}/jellyfin/*.xml
+%{_libdir}/jellyfin/wwwroot/api-docs/*
+%{_libdir}/jellyfin/wwwroot/api-docs/redoc/*
+%{_libdir}/jellyfin/wwwroot/api-docs/swagger/*
 # Needs 755 else only root can run it since binary build by dotnet is 722
 %attr(755,root,root) %{_libdir}/jellyfin/jellyfin
 %{_libdir}/jellyfin/SOS_README.md

From 46ae51bc9aaf4564cdb38b02d6b87b9cfcc82bfb Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sat, 12 Sep 2020 10:19:04 -0600
Subject: [PATCH 028/247] update to dotnet 3.1.8

---
 .../Emby.Server.Implementations.csproj                    | 8 ++++----
 Jellyfin.Api/Jellyfin.Api.csproj                          | 4 ++--
 Jellyfin.Data/Jellyfin.Data.csproj                        | 4 ++--
 .../Jellyfin.Server.Implementations.csproj                | 4 ++--
 Jellyfin.Server/Jellyfin.Server.csproj                    | 8 ++++----
 MediaBrowser.Common/MediaBrowser.Common.csproj            | 4 ++--
 MediaBrowser.Controller/MediaBrowser.Controller.csproj    | 4 ++--
 MediaBrowser.Model/MediaBrowser.Model.csproj              | 2 +-
 MediaBrowser.Providers/MediaBrowser.Providers.csproj      | 6 +++---
 deployment/Dockerfile.debian.amd64                        | 2 +-
 deployment/Dockerfile.debian.arm64                        | 2 +-
 deployment/Dockerfile.debian.armhf                        | 2 +-
 deployment/Dockerfile.linux.amd64                         | 2 +-
 deployment/Dockerfile.macos                               | 2 +-
 deployment/Dockerfile.portable                            | 2 +-
 deployment/Dockerfile.ubuntu.amd64                        | 2 +-
 deployment/Dockerfile.ubuntu.arm64                        | 2 +-
 deployment/Dockerfile.ubuntu.armhf                        | 2 +-
 deployment/Dockerfile.windows.amd64                       | 2 +-
 tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj        | 4 ++--
 20 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 0a348f0d00..c84c7b53df 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -32,10 +32,10 @@
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" />
     <PackageReference Include="Mono.Nat" Version="2.0.2" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="3.4.0" />
     <PackageReference Include="ServiceStack.Text.Core" Version="5.9.2" />
diff --git a/Jellyfin.Api/Jellyfin.Api.csproj b/Jellyfin.Api/Jellyfin.Api.csproj
index ca0542b036..c27dce8ddf 100644
--- a/Jellyfin.Api/Jellyfin.Api.csproj
+++ b/Jellyfin.Api/Jellyfin.Api.csproj
@@ -14,9 +14,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.8" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="5.5.1" />
   </ItemGroup>
diff --git a/Jellyfin.Data/Jellyfin.Data.csproj b/Jellyfin.Data/Jellyfin.Data.csproj
index 95343f91b5..6bb0d8ce27 100644
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -41,8 +41,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
index 30ed3e6af3..4e79dd8d6c 100644
--- a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
+++ b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
@@ -24,11 +24,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 0ac309a0b0..648172fbf7 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -41,10 +41,10 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.8" />
     <PackageReference Include="prometheus-net" Version="3.6.0" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 70dcc2397c..322740cca8 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
   </ItemGroup>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 9854ec520f..6544704065 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index c0a75009ae..2646810907 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -34,7 +34,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
     <PackageReference Include="System.Globalization" Version="4.3.0" />
     <PackageReference Include="System.Text.Json" Version="5.0.0-preview.8.20407.11" />
   </ItemGroup>
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 39f93c479b..51ca26361d 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -16,9 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="OptimizedPriorityQueue" Version="4.2.0" />
     <PackageReference Include="PlaylistsNET" Version="1.1.2" />
     <PackageReference Include="TvDbSharper" Version="3.2.1" />
diff --git a/deployment/Dockerfile.debian.amd64 b/deployment/Dockerfile.debian.amd64
index 1ac5f76d6c..7202c58838 100644
--- a/deployment/Dockerfile.debian.amd64
+++ b/deployment/Dockerfile.debian.amd64
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.debian.arm64 b/deployment/Dockerfile.debian.arm64
index 68381e7bfd..e9f30213f4 100644
--- a/deployment/Dockerfile.debian.arm64
+++ b/deployment/Dockerfile.debian.arm64
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.debian.armhf b/deployment/Dockerfile.debian.armhf
index ce1b100c1c..91a8a6e7a1 100644
--- a/deployment/Dockerfile.debian.armhf
+++ b/deployment/Dockerfile.debian.armhf
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.linux.amd64 b/deployment/Dockerfile.linux.amd64
index b4a3c1b76d..828d5c2cf9 100644
--- a/deployment/Dockerfile.linux.amd64
+++ b/deployment/Dockerfile.linux.amd64
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.macos b/deployment/Dockerfile.macos
index 7912e018e5..0b2a0fe5fa 100644
--- a/deployment/Dockerfile.macos
+++ b/deployment/Dockerfile.macos
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.portable b/deployment/Dockerfile.portable
index 949f1ef8f8..7d5de230fa 100644
--- a/deployment/Dockerfile.portable
+++ b/deployment/Dockerfile.portable
@@ -15,7 +15,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.ubuntu.amd64 b/deployment/Dockerfile.ubuntu.amd64
index 9518d84936..9c63f43dfa 100644
--- a/deployment/Dockerfile.ubuntu.amd64
+++ b/deployment/Dockerfile.ubuntu.amd64
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.ubuntu.arm64 b/deployment/Dockerfile.ubuntu.arm64
index 0174f2f2a9..51612dd443 100644
--- a/deployment/Dockerfile.ubuntu.arm64
+++ b/deployment/Dockerfile.ubuntu.arm64
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.ubuntu.armhf b/deployment/Dockerfile.ubuntu.armhf
index 0e02240c8f..4ed7f86872 100644
--- a/deployment/Dockerfile.ubuntu.armhf
+++ b/deployment/Dockerfile.ubuntu.armhf
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/deployment/Dockerfile.windows.amd64 b/deployment/Dockerfile.windows.amd64
index d1f2f9e48b..5671cc598a 100644
--- a/deployment/Dockerfile.windows.amd64
+++ b/deployment/Dockerfile.windows.amd64
@@ -15,7 +15,7 @@ RUN apt-get update \
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN wget https://download.visualstudio.microsoft.com/download/pr/4f9b8a64-5e09-456c-a087-527cfc8b4cd2/15e14ec06eab947432de139f172f7a98/dotnet-sdk-3.1.401-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+RUN wget https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
  && mkdir -p dotnet-sdk \
  && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
  && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
diff --git a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
index bcba3a2032..e3a7a54286 100644
--- a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
+++ b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
@@ -16,8 +16,8 @@
     <PackageReference Include="AutoFixture" Version="4.13.0" />
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.13.0" />
     <PackageReference Include="AutoFixture.Xunit2" Version="4.13.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

From b88cfa802f2274b898a3b4e178700ab438c767e0 Mon Sep 17 00:00:00 2001
From: derchu <71195282+derchu@users.noreply.github.com>
Date: Sat, 12 Sep 2020 14:46:29 -0700
Subject: [PATCH 029/247] Grab content rating from episode info

---
 MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeProvider.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeProvider.cs
index c088d8cec1..5fa8a3e1ca 100644
--- a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeProvider.cs
@@ -141,6 +141,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
                     Name = episode.EpisodeName,
                     Overview = episode.Overview,
                     CommunityRating = (float?)episode.SiteRating,
+                    OfficialRating = episode.ContentRating,
                 }
             };
             result.ResetPeople();

From 81f655803d50ce75c270d06d409d1f1c190a6d79 Mon Sep 17 00:00:00 2001
From: Jim Cartlidge <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 16:30:04 +0100
Subject: [PATCH 030/247] Modified to work with manifests.

---
 .../ApplicationHost.cs                        | 43 +++++++++++--------
 .../Plugins/PlugInManifest.cs                 | 32 ++++++++++++++
 2 files changed, 57 insertions(+), 18 deletions(-)
 create mode 100644 Emby.Server.Implementations/Plugins/PlugInManifest.cs

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 1bc436820e..89752c63c0 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -38,6 +38,7 @@ using Emby.Server.Implementations.LiveTv;
 using Emby.Server.Implementations.Localization;
 using Emby.Server.Implementations.Net;
 using Emby.Server.Implementations.Playlists;
+using Emby.Server.Implementations.Plugins;
 using Emby.Server.Implementations.QuickConnect;
 using Emby.Server.Implementations.ScheduledTasks;
 using Emby.Server.Implementations.Security;
@@ -1020,7 +1021,7 @@ namespace Emby.Server.Implementations
         /// Comparison function used in <see cref="GetLatestDLLVersion" />.
         /// </summary>
         private static int VersionCompare(
-            (Version PluginVersion, string Name, string Path) a, 
+            (Version PluginVersion, string Name, string Path) a,
             (Version PluginVersion, string Name, string Path) b)
         {
             int compare = string.Compare(a.Name, b.Name, true, CultureInfo.InvariantCulture);
@@ -1033,32 +1034,38 @@ namespace Emby.Server.Implementations
             return compare;
         }
 
-        /// <summary>
-        /// Only loads the latest version of each assembly based upon the folder name.
-        /// eg. MyAssembly_11.9.3.6  - will be ignored.
-        ///     MyAssembly_12.2.3.6  - will be loaded.
-        /// </summary>
-        /// <param name="path">Path to enumerate.</param>
-        /// <param name="cleanup">Set to true, to try and clean up earlier versions.</param>
-        /// <returns>IEnumerable{string} of filenames.</returns>
-        protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = true)
+        private IEnumerable<string> GetPlugins(string path, bool cleanup = true)
         {
             var dllList = new List<string>();
             var versions = new List<(Version PluginVersion, string Name, string Path)>();
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
 
+            var serializer = new JsonSerializer();
             foreach (var dir in directories)
             {
-                int underscoreIndex = dir.LastIndexOf('_');
-                if (underscoreIndex != -1 && Version.TryParse(dir.Substring(underscoreIndex + 1), out Version ver))
+                try
                 {
-                    // Versioned folder.
-                    versions.Add((ver, dir.Substring(0, underscoreIndex), dir));
+                    var manifest = serializer.DeserializeFromFile<PlugInManifest>(dir + "\\meta.json");
+
+                    if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
+                    {
+                        targetAbi = new Version("0.0.0.1");
+                    }
+
+                    if (!Version.TryParse(manifest.Version, out var version))
+                    {
+                        version = new Version("0.0.0.1");
+                    }
+
+                    if (targetAbi <= ApplicationVersion)
+                    {
+                        // Only load Plugins for this version or below.
+                        versions.Add((version, manifest.Name, dir));
+                    }
                 }
-                else
+                catch
                 {
-                    // Un-versioned folder.
-                    versions.Add((new Version(), dir, dir));
+                    continue;
                 }
             }
 
@@ -1101,7 +1108,7 @@ namespace Emby.Server.Implementations
         {
             if (Directory.Exists(ApplicationPaths.PluginsPath))
             {
-                foreach (var file in GetLatestDLLVersion(ApplicationPaths.PluginsPath))
+                foreach (var file in GetPlugins(ApplicationPaths.PluginsPath))
                 {
                     Assembly plugAss;
                     try
diff --git a/Emby.Server.Implementations/Plugins/PlugInManifest.cs b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
new file mode 100644
index 0000000000..e334d65e50
--- /dev/null
+++ b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
@@ -0,0 +1,32 @@
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
+using System;
+
+namespace Emby.Server.Implementations.Plugins
+{
+    /// <summary>
+    /// Defines a Plugin manifest file.
+    /// </summary>
+    public class PlugInManifest
+    {
+        public string Category { get; set; }
+
+        public string Changelog { get; set; }
+
+        public string Description { get; set; }
+
+        public Guid Guid { get; set; }
+
+        public string Name { get; set; }
+
+        public string Overview { get; set; }
+
+        public string Owner { get; set; }
+
+        public string TargetAbi { get; set; }
+
+        public DateTime Timestamp { get; set; }
+
+        public string Version { get; set; }
+}
+}

From 5f58d2c15183736098ca9e4cb7397ea9fb75d5d1 Mon Sep 17 00:00:00 2001
From: Jim Cartlidge <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 16:37:20 +0100
Subject: [PATCH 031/247] With method comments.

---
 Emby.Server.Implementations/ApplicationHost.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 89752c63c0..7f17419399 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1020,6 +1020,9 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Comparison function used in <see cref="GetLatestDLLVersion" />.
         /// </summary>
+        /// <param name="a">Item to compare.</param>
+        /// <param name="b">Item to compare with.</param>
+        /// <returns>Boolean result of the operation.</returns>
         private static int VersionCompare(
             (Version PluginVersion, string Name, string Path) a,
             (Version PluginVersion, string Name, string Path) b)
@@ -1034,6 +1037,12 @@ namespace Emby.Server.Implementations
             return compare;
         }
 
+        /// <summary>
+        /// Returns a list of plugsin to install.
+        /// </summary>
+        /// <param name="path">Path to check.</param>
+        /// <param name="cleanup">True if an attempt should be made to delete old plugs.</param>
+        /// <returns>Enumerable list of dlls to load.</returns>
         private IEnumerable<string> GetPlugins(string path, bool cleanup = true)
         {
             var dllList = new List<string>();

From b4edb7c90d82a8a3e1e542e0e5e26cb3a1f70a6a Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 17:24:02 +0100
Subject: [PATCH 032/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 7f17419399..9aeb0c42a2 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1058,7 +1058,7 @@ namespace Emby.Server.Implementations
 
                     if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
                     {
-                        targetAbi = new Version("0.0.0.1");
+                        targetAbi = new Version(0, 0, 0, 1);
                     }
 
                     if (!Version.TryParse(manifest.Version, out var version))

From 008aa51eb731c926df3c584fed8d7ccad1d8c94a Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 17:24:30 +0100
Subject: [PATCH 033/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 9aeb0c42a2..cf55f392d8 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1063,7 +1063,7 @@ namespace Emby.Server.Implementations
 
                     if (!Version.TryParse(manifest.Version, out var version))
                     {
-                        version = new Version("0.0.0.1");
+                        version = new Version(0, 0, 0, 1);
                     }
 
                     if (targetAbi <= ApplicationVersion)

From 12fb827405473d9f499848ce2098008fc96d0321 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 17:29:10 +0100
Subject: [PATCH 034/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index cf55f392d8..db70b6203c 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1054,7 +1054,7 @@ namespace Emby.Server.Implementations
             {
                 try
                 {
-                    var manifest = serializer.DeserializeFromFile<PlugInManifest>(dir + "\\meta.json");
+                    var manifest = serializer.DeserializeFromFile<PlugInManifest>(Path.Combine(dir, "meta.json");
 
                     if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
                     {

From ea0eb9a6ffc8a667c9d9d455121d3f48d72fa360 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 17:42:40 +0100
Subject: [PATCH 035/247] Update PlugInManifest.cs

Added comments.
---
 .../Plugins/PlugInManifest.cs                 | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/Emby.Server.Implementations/Plugins/PlugInManifest.cs b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
index e334d65e50..fa48d73c55 100644
--- a/Emby.Server.Implementations/Plugins/PlugInManifest.cs
+++ b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
@@ -1,5 +1,3 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
 using System;
 
 namespace Emby.Server.Implementations.Plugins
@@ -9,24 +7,54 @@ namespace Emby.Server.Implementations.Plugins
     /// </summary>
     public class PlugInManifest
     {
+        /// <summary>
+        /// Gets or sets the category of the plugin.
+        /// </summary>  
         public string Category { get; set; }
 
+        /// <summary>
+        /// Gets or sets the changelog information.
+        /// </summary>  
         public string Changelog { get; set; }
 
+        /// <summary>
+        /// Gets or sets the description of the plugin.
+        /// </summary>  
         public string Description { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Global Unique Identifier for the plugin.
+        /// </summary>  
         public Guid Guid { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Name of the plugin.
+        /// </summary>  
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets an overview of the plugin.
+        /// </summary>      
         public string Overview { get; set; }
 
+        /// <summary>
+        /// Gets or sets the owner of the plugin.
+        /// </summary>  
         public string Owner { get; set; }
 
+        /// <summary>
+        /// Gets or sets the compatibility version for the plugin.
+        /// </summary>     
         public string TargetAbi { get; set; }
 
+        /// <summary>
+        /// Gets or sets the timestamp of the plugin.
+        /// </summary>     
         public DateTime Timestamp { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Version number of the plugin.
+        /// </summary>     
         public string Version { get; set; }
-}
+    }
 }

From 6c2c2cb872b0e98ff27d1cc8d664a185e63e39ac Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 17:45:17 +0100
Subject: [PATCH 036/247] Update ApplicationHost.cs

Global jsonserializer added
---
 Emby.Server.Implementations/ApplicationHost.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index db70b6203c..ea4c77f3cc 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -121,6 +121,7 @@ namespace Emby.Server.Implementations
         private readonly IFileSystem _fileSystemManager;
         private readonly INetworkManager _networkManager;
         private readonly IXmlSerializer _xmlSerializer;
+        private readonly IJsonSerializer _jsonSerializer;
         private readonly IStartupOptions _startupOptions;
 
         private IMediaEncoder _mediaEncoder;
@@ -251,6 +252,8 @@ namespace Emby.Server.Implementations
             IServiceCollection serviceCollection)
         {
             _xmlSerializer = new MyXmlSerializer();
+            _jsonSerializer = new JsonSerializer();            
+            
             ServiceCollection = serviceCollection;
 
             _networkManager = networkManager;
@@ -1049,12 +1052,11 @@ namespace Emby.Server.Implementations
             var versions = new List<(Version PluginVersion, string Name, string Path)>();
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
 
-            var serializer = new JsonSerializer();
             foreach (var dir in directories)
             {
                 try
                 {
-                    var manifest = serializer.DeserializeFromFile<PlugInManifest>(Path.Combine(dir, "meta.json");
+                    var manifest = _jsonSerializer.DeserializeFromFile<PlugInManifest>(Path.Combine(dir, "meta.json");
 
                     if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
                     {

From 107d606a7069e43bafacd0e8254631230219111f Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 17:51:14 +0100
Subject: [PATCH 037/247] Update ApplicationHost.cs

---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index ea4c77f3cc..9540a879af 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1056,7 +1056,7 @@ namespace Emby.Server.Implementations
             {
                 try
                 {
-                    var manifest = _jsonSerializer.DeserializeFromFile<PlugInManifest>(Path.Combine(dir, "meta.json");
+                    var manifest = _jsonSerializer.DeserializeFromFile<PlugInManifest>(Path.Combine(dir, "meta.json"));
 
                     if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
                     {

From 7b4b101ecacb6026cf2ca4142f0ca0fbb0f637fd Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 13 Sep 2020 18:06:13 +0100
Subject: [PATCH 038/247] Update ApplicationHost.cs

---
 Emby.Server.Implementations/ApplicationHost.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 9540a879af..2206fabadf 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1021,7 +1021,7 @@ namespace Emby.Server.Implementations
         protected abstract void RestartInternal();
 
         /// <summary>
-        /// Comparison function used in <see cref="GetLatestDLLVersion" />.
+        /// Comparison function used in <see cref="GetPlugins" />.
         /// </summary>
         /// <param name="a">Item to compare.</param>
         /// <param name="b">Item to compare with.</param>
@@ -1068,7 +1068,7 @@ namespace Emby.Server.Implementations
                         version = new Version(0, 0, 0, 1);
                     }
 
-                    if (targetAbi <= ApplicationVersion)
+                    if (targetAbi >= ApplicationVersion)
                     {
                         // Only load Plugins for this version or below.
                         versions.Add((version, manifest.Name, dir));

From 58924fd1da70cfdbdde835d302dca0812b984187 Mon Sep 17 00:00:00 2001
From: Oleg Shevchenko <olsh.me@gmail.com>
Date: Sun, 13 Sep 2020 22:38:31 +0300
Subject: [PATCH 039/247] Fix parameters validation in
 ImageProcessor.GetCachePath

---
 CONTRIBUTORS.md                | 1 +
 Emby.Drawing/ImageProcessor.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f0724b4129..f1fe65064b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -198,3 +198,4 @@
  - [tikuf](https://github.com/tikuf/)
  - [Tim Hobbs](https://github.com/timhobbs)
  - [SvenVandenbrande](https://github.com/SvenVandenbrande)
+ - [olsh](https://github.com/olsh)
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index f585b90ca1..ed20292f6b 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -455,7 +455,7 @@ namespace Emby.Drawing
                 throw new ArgumentException("Path can't be empty.", nameof(path));
             }
 
-            if (path.IsEmpty)
+            if (filename.IsEmpty)
             {
                 throw new ArgumentException("Filename can't be empty.", nameof(filename));
             }

From 17f66b49430f5fed7475de6a3400326dca2ec143 Mon Sep 17 00:00:00 2001
From: kevin <kevinkamani17@gmail.com>
Date: Mon, 14 Sep 2020 10:39:04 +0000
Subject: [PATCH 040/247] Added translation using Weblate (Albanian)

---
 Emby.Server.Implementations/Localization/Core/sq.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Emby.Server.Implementations/Localization/Core/sq.json

diff --git a/Emby.Server.Implementations/Localization/Core/sq.json b/Emby.Server.Implementations/Localization/Core/sq.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/sq.json
@@ -0,0 +1 @@
+{}

From 3a75365930c652d6c278e225f0c5ff23538216db Mon Sep 17 00:00:00 2001
From: kevin <kevinkamani17@gmail.com>
Date: Mon, 14 Sep 2020 10:39:45 +0000
Subject: [PATCH 041/247] Translated using Weblate (Albanian) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sq/

---
 .../Localization/Core/sq.json                 | 118 +++++++++++++++++-
 1 file changed, 117 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/sq.json b/Emby.Server.Implementations/Localization/Core/sq.json
index 0967ef424b..347ba5f970 100644
--- a/Emby.Server.Implementations/Localization/Core/sq.json
+++ b/Emby.Server.Implementations/Localization/Core/sq.json
@@ -1 +1,117 @@
-{}
+{
+    "MessageApplicationUpdatedTo": "Serveri Jellyfin u përditesua në versionin {0}",
+    "Inherit": "Trashgimi",
+    "TaskDownloadMissingSubtitlesDescription": "Kërkon në internet për titra që mungojnë bazuar tek konfigurimi i metadata-ve.",
+    "TaskDownloadMissingSubtitles": "Shkarko titra që mungojnë",
+    "TaskRefreshChannelsDescription": "Rifreskon informacionin e kanaleve të internetit.",
+    "TaskRefreshChannels": "Rifresko Kanalet",
+    "TaskCleanTranscodeDescription": "Fshin skedarët e transkodimit që janë më të vjetër se një ditë.",
+    "TaskCleanTranscode": "Fshi dosjen e transkodimit",
+    "TaskUpdatePluginsDescription": "Shkarkon dhe instalon përditësimi për plugin që janë konfiguruar të përditësohen automatikisht.",
+    "TaskUpdatePlugins": "Përditëso Plugin",
+    "TaskRefreshPeopleDescription": "Përditëson metadata të aktorëve dhe regjizorëve në librarinë tuaj.",
+    "TaskRefreshPeople": "Rifresko aktorët",
+    "TaskCleanLogsDescription": "Fshin skëdarët log që janë më të vjetër se {0} ditë.",
+    "TaskCleanLogs": "Fshi dosjen Log",
+    "TaskRefreshLibraryDescription": "Skanon librarinë media për skedarë të rinj dhe rifreskon metadata.",
+    "TaskRefreshLibrary": "Skano librarinë media",
+    "TaskRefreshChapterImagesDescription": "Krijon imazh për videot që kanë kapituj.",
+    "TaskRefreshChapterImages": "Ekstrakto Imazhet e Kapitullit",
+    "TaskCleanCacheDescription": "Fshi skedarët e cache-s që nuk i duhen më sistemit.",
+    "TaskCleanCache": "Pastro memorjen cache",
+    "TasksChannelsCategory": "Kanalet nga interneti",
+    "TasksApplicationCategory": "Aplikacioni",
+    "TasksLibraryCategory": "Libraria",
+    "TasksMaintenanceCategory": "Mirëmbajtje",
+    "VersionNumber": "Versioni {0}",
+    "ValueSpecialEpisodeName": "Speciale - {0}",
+    "ValueHasBeenAddedToLibrary": "{0} u shtua tek libraria juaj",
+    "UserStoppedPlayingItemWithValues": "{0} mbaroi së shikuari {1} tek {2}",
+    "UserStartedPlayingItemWithValues": "{0} po shikon {1} tek {2}",
+    "UserPolicyUpdatedWithName": "Politika e përdoruesit u përditësua për {0}",
+    "UserPasswordChangedWithName": "Fjalëkalimi u ndryshua për përdoruesin {0}",
+    "UserOnlineFromDevice": "{0} është në linjë nga {1}",
+    "UserOfflineFromDevice": "{0} u shkëput nga {1}",
+    "UserLockedOutWithName": "Përdoruesi {0} u përjashtua",
+    "UserDownloadingItemWithValues": "{0} po shkarkon {1}",
+    "UserDeletedWithName": "Përdoruesi {0} u fshi",
+    "UserCreatedWithName": "Përdoruesi {0} u krijua",
+    "User": "Përdoruesi",
+    "TvShows": "Seriale TV",
+    "System": "Sistemi",
+    "Sync": "Sinkronizo",
+    "SubtitleDownloadFailureFromForItem": "Titrat deshtuan të shkarkohen nga {0} për {1}",
+    "StartupEmbyServerIsLoading": "Serveri Jellyfin po ngarkohet. Ju lutemi provoni përseri pas pak.",
+    "Songs": "Këngë",
+    "Shows": "Seriale",
+    "ServerNameNeedsToBeRestarted": "{0} duhet të ristartoj",
+    "ScheduledTaskStartedWithName": "{0} filloi",
+    "ScheduledTaskFailedWithName": "{0} dështoi",
+    "ProviderValue": "Ofruesi: {0}",
+    "PluginUpdatedWithName": "{0} u përditësua",
+    "PluginUninstalledWithName": "{0} u çinstalua",
+    "PluginInstalledWithName": "{0} u instalua",
+    "Plugin": "Plugin",
+    "Playlists": "Listat për luajtje",
+    "Photos": "Fotografitë",
+    "NotificationOptionVideoPlaybackStopped": "Luajtja e videos ndaloi",
+    "NotificationOptionVideoPlayback": "Luajtja e videos filloi",
+    "NotificationOptionUserLockedOut": "Përdoruesi u përjashtua",
+    "NotificationOptionTaskFailed": "Ushtrimi i planifikuar dështoi",
+    "NotificationOptionServerRestartRequired": "Kërkohet ristartim i serverit",
+    "NotificationOptionPluginUpdateInstalled": "Përditësimi i plugin u instalua",
+    "NotificationOptionPluginUninstalled": "Plugin u çinstalua",
+    "NotificationOptionPluginInstalled": "Plugin u instalua",
+    "NotificationOptionPluginError": "Plugin dështoi",
+    "NotificationOptionNewLibraryContent": "Një përmbajtje e re u shtua",
+    "NotificationOptionInstallationFailed": "Instalimi dështoi",
+    "NotificationOptionCameraImageUploaded": "Fotoja nga kamera u ngarkua",
+    "NotificationOptionAudioPlaybackStopped": "Luajtja e audios ndaloi",
+    "NotificationOptionAudioPlayback": "Luajtja e audios filloi",
+    "NotificationOptionApplicationUpdateInstalled": "Përditësimi i aplikacionit u instalua",
+    "NotificationOptionApplicationUpdateAvailable": "Një perditësim i aplikacionit është gati",
+    "NewVersionIsAvailable": "Një version i ri i Jellyfin është gati për tu shkarkuar.",
+    "NameSeasonUnknown": "Sezon i panjohur",
+    "NameSeasonNumber": "Sezoni {0}",
+    "NameInstallFailed": "Instalimi i {0} dështoi",
+    "MusicVideos": "Video muzikore",
+    "Music": "Muzikë",
+    "Movies": "Filma",
+    "MixedContent": "Përmbajtje e përzier",
+    "MessageServerConfigurationUpdated": "Konfigurimet e serverit u përditësuan",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Seksioni i konfigurimit të serverit {0} u përditësua",
+    "MessageApplicationUpdated": "Serveri Jellyfin u përditësua",
+    "Latest": "Të fundit",
+    "LabelRunningTimeValue": "Kohëzgjatja: {0}",
+    "LabelIpAddressValue": "Adresa IP: {0}",
+    "ItemRemovedWithName": "{0} u fshi nga libraria",
+    "ItemAddedWithName": "{0} u shtua tek libraria",
+    "HomeVideos": "Video personale",
+    "HeaderRecordingGroups": "Grupet e regjistrimit",
+    "HeaderNextUp": "Në vazhdim",
+    "HeaderLiveTV": "TV Live",
+    "HeaderFavoriteSongs": "Kënget e preferuara",
+    "HeaderFavoriteShows": "Serialet e preferuar",
+    "HeaderFavoriteEpisodes": "Episodet e preferuar",
+    "HeaderFavoriteArtists": "Artistët e preferuar",
+    "HeaderFavoriteAlbums": "Albumet e preferuar",
+    "HeaderContinueWatching": "Vazhdo të shikosh",
+    "HeaderCameraUploads": "Ngarkimet nga Kamera",
+    "HeaderAlbumArtists": "Artistët e albumeve",
+    "Genres": "Zhanre",
+    "Folders": "Dosje",
+    "Favorites": "Të preferuara",
+    "FailedLoginAttemptWithUserName": "Përpjekja për hyrje dështoi nga {0}",
+    "DeviceOnlineWithName": "{0} u lidh",
+    "DeviceOfflineWithName": "{0} u shkëput",
+    "Collections": "Koleksione",
+    "ChapterNameValue": "Kapituj",
+    "Channels": "Kanale",
+    "CameraImageUploadedFrom": "Një foto e re nga kamera u ngarkua nga {0}",
+    "Books": "Libra",
+    "AuthenticationSucceededWithUserName": "{0} u identifikua me sukses",
+    "Artists": "Artistë",
+    "Application": "Aplikacioni",
+    "AppDeviceValues": "Aplikacioni: {0}, Pajisja: {1}",
+    "Albums": "Albumet"
+}

From b83b8f526729771ce52571bf6447a2d5eeac4b8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2020 12:02:19 +0000
Subject: [PATCH 042/247] Bump SkiaSharp from 2.80.1 to 2.80.2

Bumps SkiaSharp from 2.80.1 to 2.80.2.

Signed-off-by: dependabot[bot] <support@github.com>
---
 Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index c71c76f08f..6b378034a5 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="BlurHashSharp" Version="1.1.0" />
     <PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.1.0" />
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.1" />
   </ItemGroup>
 

From fc827a7b25114e0b987cf913702a242e2f9b89a2 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Mon, 14 Sep 2020 12:12:19 +0000
Subject: [PATCH 043/247] Added translation using Weblate (Vietnamese)

---
 Emby.Server.Implementations/Localization/Core/vi.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Emby.Server.Implementations/Localization/Core/vi.json

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -0,0 +1 @@
+{}

From 9183688cabc9b221abc0c2b7a64afd09203aaff2 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Mon, 14 Sep 2020 12:13:31 +0000
Subject: [PATCH 044/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 .../Localization/Core/vi.json                 | 118 +++++++++++++++++-
 1 file changed, 117 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index 0967ef424b..8b4334d7a6 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -1 +1,117 @@
-{}
+{
+    "Collections": "Bộ Sưu Tập",
+    "Favorites": "Sở Thích",
+    "Folders": "Thư Mục",
+    "Genres": "Thể Loại",
+    "HeaderAlbumArtists": "Bộ Sưu Tập Nghệ sĩ",
+    "HeaderContinueWatching": "Tiếp Tục Xem",
+    "HeaderLiveTV": "TV Trực Tiếp",
+    "Movies": "Phim",
+    "Photos": "Ảnh",
+    "Playlists": "Danh Sách Chơi",
+    "Shows": "Các Chương Trình",
+    "Songs": "Các Bài Hát",
+    "Sync": "Đồng Bộ",
+    "ValueSpecialEpisodeName": "Đặc Biệt - {0}",
+    "Albums": "Bộ Sưu Tập",
+    "Artists": "Nghệ Sĩ",
+    "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình thông tin chi tiết.",
+    "TaskDownloadMissingSubtitles": "Tải xuống phụ đề bị thiếu",
+    "TaskRefreshChannelsDescription": "Làm mới thông tin kênh internet.",
+    "TaskRefreshChannels": "Làm Mới Kênh",
+    "TaskCleanTranscodeDescription": "Xóa các tệp chuyển mã cũ hơn một ngày.",
+    "TaskCleanTranscode": "Làm Sạch Thư Mục Chuyển Mã",
+    "TaskUpdatePluginsDescription": "Tải xuống và cài đặt các bản cập nhật cho các plugin được định cấu hình để cập nhật tự động.",
+    "TaskUpdatePlugins": "Cập Nhật Plugins",
+    "TaskRefreshPeopleDescription": "Cập nhật thông tin chi tiết cho diễn viên và đạo diễn trong thư viện phương tiện của bạn.",
+    "TaskRefreshPeople": "Làm mới Người dùng",
+    "TaskCleanLogsDescription": "Xóa tập tin nhật ký cũ hơn {0} ngày.",
+    "TaskCleanLogs": "Làm sạch nhật ký",
+    "TaskRefreshLibraryDescription": "Quét thư viện phương tiện của bạn để tìm các tệp mới và làm mới thông tin chi tiết.",
+    "TaskRefreshLibrary": "Quét Thư viện Phương tiện",
+    "TaskRefreshChapterImagesDescription": "Tạo hình thu nhỏ cho các video có chương.",
+    "TaskRefreshChapterImages": "Trích xuất hình ảnh chương",
+    "TaskCleanCacheDescription": "Xóa các tệp cache không còn cần thiết của hệ thống.",
+    "TaskCleanCache": "Làm Sạch Thư Mục Cache",
+    "TasksChannelsCategory": "Kênh Internet",
+    "TasksApplicationCategory": "Ứng Dụng",
+    "TasksLibraryCategory": "Thư Viện",
+    "TasksMaintenanceCategory": "Bảo Trì",
+    "VersionNumber": "Phiên Bản {0}",
+    "ValueHasBeenAddedToLibrary": "{0} đã được thêm vào thư viện của bạn",
+    "UserStoppedPlayingItemWithValues": "{0} đã phát xong {1} trên {2}",
+    "UserStartedPlayingItemWithValues": "{0} đang phát {1} trên {2}",
+    "UserPolicyUpdatedWithName": "Chính sách người dùng đã được cập nhật cho {0}",
+    "UserPasswordChangedWithName": "Mật khẩu đã được thay đổi cho người dùng {0}",
+    "UserOnlineFromDevice": "{0} trực tuyến từ {1}",
+    "UserOfflineFromDevice": "{0} đã ngắt kết nối từ {1}",
+    "UserLockedOutWithName": "User {0} đã bị khóa",
+    "UserDownloadingItemWithValues": "{0} đang tải xuống {1}",
+    "UserDeletedWithName": "Người Dùng {0} đã được xóa",
+    "UserCreatedWithName": "Người Dùng {0} đã được tạo",
+    "User": "Người Dùng",
+    "TvShows": "Chương Trình TV",
+    "System": "Hệ Thống",
+    "SubtitleDownloadFailureFromForItem": "Không thể tải xuống phụ đề từ {0} cho {1}",
+    "StartupEmbyServerIsLoading": "Jellyfin Server đang tải. Vui lòng thử lại trong thời gian ngắn.",
+    "ServerNameNeedsToBeRestarted": "{0} cần được khởi động lại",
+    "ScheduledTaskStartedWithName": "{0} đã bắt đầu",
+    "ScheduledTaskFailedWithName": "{0} đã thất bại",
+    "ProviderValue": "Provider: {0}",
+    "PluginUpdatedWithName": "{0} đã cập nhật",
+    "PluginUninstalledWithName": "{0} đã được gỡ bỏ",
+    "PluginInstalledWithName": "{0} đã được cài đặt",
+    "Plugin": "Plugin",
+    "NotificationOptionVideoPlaybackStopped": "Phát lại video đã dừng",
+    "NotificationOptionVideoPlayback": "Đã bắt đầu phát lại video",
+    "NotificationOptionUserLockedOut": "Người dùng bị khóa",
+    "NotificationOptionTaskFailed": "Lỗi tác vụ đã lên lịch",
+    "NotificationOptionServerRestartRequired": "Yêu cầu khởi động lại Server",
+    "NotificationOptionPluginUpdateInstalled": "Cập nhật Plugin đã được cài đặt",
+    "NotificationOptionPluginUninstalled": "Đã gỡ bỏ Plugin",
+    "NotificationOptionPluginInstalled": "Đã cài đặt Plugin",
+    "NotificationOptionPluginError": "Thất bại Plugin",
+    "NotificationOptionNewLibraryContent": "Nội dung mới được thêm vào",
+    "NotificationOptionInstallationFailed": "Cài đặt thất bại",
+    "NotificationOptionCameraImageUploaded": "Đã tải lên hình ảnh máy ảnh",
+    "NotificationOptionAudioPlaybackStopped": "Phát lại âm thanh đã dừng",
+    "NotificationOptionAudioPlayback": "Phát lại âm thanh đã bắt đầu",
+    "NotificationOptionApplicationUpdateInstalled": "Bản cập nhật ứng dụng đã được cài đặt",
+    "NotificationOptionApplicationUpdateAvailable": "Bản cập nhật ứng dụng hiện sẵn có",
+    "NewVersionIsAvailable": "Một phiên bản mới của Jellyfin Server sẵn có để tải.",
+    "NameSeasonUnknown": "Không Rõ Mùa",
+    "NameSeasonNumber": "Mùa {0}",
+    "NameInstallFailed": "{0} cài đặt thất bại",
+    "MusicVideos": "Video Nhạc",
+    "Music": "Nhạc",
+    "MixedContent": "Nội dung hỗn hợp",
+    "MessageServerConfigurationUpdated": "Cấu hình máy chủ đã được cập nhật",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Phần cấu hình máy chủ {0} đã được cập nhật",
+    "MessageApplicationUpdatedTo": "Jellyfin Server đã được cập nhật lên {0}",
+    "MessageApplicationUpdated": "Jellyfin Server đã được cập nhật",
+    "Latest": "Gần Nhất",
+    "LabelRunningTimeValue": "Thời Gian Chạy: {0}",
+    "LabelIpAddressValue": "Địa Chỉ IP: {0}",
+    "ItemRemovedWithName": "{0} đã xóa khỏi thư viện",
+    "ItemAddedWithName": "{0} được thêm vào thư viện",
+    "Inherit": "Thừa hưởng",
+    "HomeVideos": "Video nhà",
+    "HeaderRecordingGroups": "Nhóm Ghi Video",
+    "HeaderNextUp": "Tiếp Theo",
+    "HeaderFavoriteSongs": "Bài Hát Yêu Thích",
+    "HeaderFavoriteShows": "Chương Trình Yêu Thích",
+    "HeaderFavoriteEpisodes": "Tập Phim Yêu Thích",
+    "HeaderFavoriteArtists": "Nghệ Sĩ Yêu Thích",
+    "HeaderFavoriteAlbums": "Album Ưa Thích",
+    "HeaderCameraUploads": "Máy Ảnh Tải Lên",
+    "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập thất bại từ {0}",
+    "DeviceOnlineWithName": "{0} đã kết nối",
+    "DeviceOfflineWithName": "{0} đã ngắt kết nối",
+    "ChapterNameValue": "Chương {0}",
+    "Channels": "Kênh",
+    "CameraImageUploadedFrom": "Một hình ảnh máy ảnh mới đã được tải lên từ {0}",
+    "Books": "Sách",
+    "AuthenticationSucceededWithUserName": "{0} xác thực thành công",
+    "Application": "Ứng Dụng",
+    "AppDeviceValues": "Ứng Dụng: {0}, Thiết Bị: {1}"
+}

From 68d08e94fded259adc2b2cd3d9379d6ab1e8b384 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 16:18:39 +0100
Subject: [PATCH 045/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 2206fabadf..878ea30fc7 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1041,7 +1041,7 @@ namespace Emby.Server.Implementations
         }
 
         /// <summary>
-        /// Returns a list of plugsin to install.
+        /// Returns a list of plugins to install.
         /// </summary>
         /// <param name="path">Path to check.</param>
         /// <param name="cleanup">True if an attempt should be made to delete old plugs.</param>

From cdf96d266317b2a16e8fcba2f18804f8a1b58bcb Mon Sep 17 00:00:00 2001
From: Android Dev Notes <awesomedevnotes@gmail.com>
Date: Mon, 14 Sep 2020 21:30:20 +0530
Subject: [PATCH 046/247] Fix typos

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 55d6917ae0..5e731d2100 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ To run the project with Visual Studio Code you will first need to open the repos
 
 Second, you need to [install the recommended extensions for the workspace](https://code.visualstudio.com/docs/editor/extension-gallery#_recommended-extensions). Note that extension recommendations are classified as either "Workspace Recommendations" or "Other Recommendations", but only the "Workspace Recommendations" are required.
 
-After the required extensions are installed, you can can run the server by pressing `F5`.
+After the required extensions are installed, you can run the server by pressing `F5`.
 
 #### Running From The Command Line
 

From f73e744785fc8016e858c9f676ac0b04ee4f564b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 17:58:10 +0100
Subject: [PATCH 047/247] Update
 Emby.Server.Implementations/Plugins/PlugInManifest.cs

Co-authored-by: dkanada <dkanada@users.noreply.github.com>
---
 Emby.Server.Implementations/Plugins/PlugInManifest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Plugins/PlugInManifest.cs b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
index fa48d73c55..b874676d84 100644
--- a/Emby.Server.Implementations/Plugins/PlugInManifest.cs
+++ b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
@@ -5,7 +5,7 @@ namespace Emby.Server.Implementations.Plugins
     /// <summary>
     /// Defines a Plugin manifest file.
     /// </summary>
-    public class PlugInManifest
+    public class PluginManifest
     {
         /// <summary>
         /// Gets or sets the category of the plugin.

From a626ce5bd00ad1076ea704673ecd38d270938264 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Mon, 14 Sep 2020 14:10:44 +0000
Subject: [PATCH 048/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index 8b4334d7a6..bf4cfe75ca 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -4,7 +4,7 @@
     "Folders": "Thư Mục",
     "Genres": "Thể Loại",
     "HeaderAlbumArtists": "Bộ Sưu Tập Nghệ sĩ",
-    "HeaderContinueWatching": "Tiếp Tục Xem",
+    "HeaderContinueWatching": "Tiếp Tục Xem Tiếp",
     "HeaderLiveTV": "TV Trực Tiếp",
     "Movies": "Phim",
     "Photos": "Ảnh",
@@ -14,7 +14,7 @@
     "Sync": "Đồng Bộ",
     "ValueSpecialEpisodeName": "Đặc Biệt - {0}",
     "Albums": "Bộ Sưu Tập",
-    "Artists": "Nghệ Sĩ",
+    "Artists": "Các Nghệ Sĩ",
     "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình thông tin chi tiết.",
     "TaskDownloadMissingSubtitles": "Tải xuống phụ đề bị thiếu",
     "TaskRefreshChannelsDescription": "Làm mới thông tin kênh internet.",
@@ -108,9 +108,9 @@
     "DeviceOnlineWithName": "{0} đã kết nối",
     "DeviceOfflineWithName": "{0} đã ngắt kết nối",
     "ChapterNameValue": "Chương {0}",
-    "Channels": "Kênh",
+    "Channels": "Các Kênh",
     "CameraImageUploadedFrom": "Một hình ảnh máy ảnh mới đã được tải lên từ {0}",
-    "Books": "Sách",
+    "Books": "Các Quyển Sách",
     "AuthenticationSucceededWithUserName": "{0} xác thực thành công",
     "Application": "Ứng Dụng",
     "AppDeviceValues": "Ứng Dụng: {0}, Thiết Bị: {1}"

From d27d2a8990afb80ba137688121f85b831599d45a Mon Sep 17 00:00:00 2001
From: Jim Cartlidge <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 18:23:50 +0100
Subject: [PATCH 049/247] Renamed file.

---
 .../ApplicationHost.cs                        | 37 ++++++++++++-------
 .../Plugins/PlugInManifest.cs                 | 20 +++++-----
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 878ea30fc7..d1e28cce5c 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1051,27 +1051,38 @@ namespace Emby.Server.Implementations
             var dllList = new List<string>();
             var versions = new List<(Version PluginVersion, string Name, string Path)>();
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
+            string metafile;
 
             foreach (var dir in directories)
             {
                 try
                 {
-                    var manifest = _jsonSerializer.DeserializeFromFile<PlugInManifest>(Path.Combine(dir, "meta.json"));
-
-                    if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
+                    metafile = Path.Combine(dir, "meta.json");
+                    if (File.Exists(metafile))
                     {
-                        targetAbi = new Version(0, 0, 0, 1);
+                        var manifest = _jsonSerializer.DeserializeFromFile<PluginManifest>(metafile);
+
+                        if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
+                        {
+                            targetAbi = new Version(0, 0, 0, 1);
+                        }
+
+                        if (!Version.TryParse(manifest.Version, out var version))
+                        {
+                            version = new Version(0, 0, 0, 1);
+                        }
+
+                        if (ApplicationVersion <= targetAbi)
+                        {
+                            // Only load Plugins if the plugin is built for this version or below.
+                            versions.Add((version, manifest.Name, dir));
+                        }
                     }
-
-                    if (!Version.TryParse(manifest.Version, out var version))
+                    else
                     {
-                        version = new Version(0, 0, 0, 1);
-                    }
-
-                    if (targetAbi >= ApplicationVersion)
-                    {
-                        // Only load Plugins for this version or below.
-                        versions.Add((version, manifest.Name, dir));
+                        metafile = dir.Split(new char[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries).Last();
+                        // Add it under the path name and version 0.0.0.1.
+                        versions.Add((new Version("0.0.0.1"), metafile, dir));
                     }
                 }
                 catch
diff --git a/Emby.Server.Implementations/Plugins/PlugInManifest.cs b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
index b874676d84..33762791bc 100644
--- a/Emby.Server.Implementations/Plugins/PlugInManifest.cs
+++ b/Emby.Server.Implementations/Plugins/PlugInManifest.cs
@@ -9,52 +9,52 @@ namespace Emby.Server.Implementations.Plugins
     {
         /// <summary>
         /// Gets or sets the category of the plugin.
-        /// </summary>  
+        /// </summary>
         public string Category { get; set; }
 
         /// <summary>
         /// Gets or sets the changelog information.
-        /// </summary>  
+        /// </summary>
         public string Changelog { get; set; }
 
         /// <summary>
         /// Gets or sets the description of the plugin.
-        /// </summary>  
+        /// </summary>
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets the Global Unique Identifier for the plugin.
-        /// </summary>  
+        /// </summary>
         public Guid Guid { get; set; }
 
         /// <summary>
         /// Gets or sets the Name of the plugin.
-        /// </summary>  
+        /// </summary>
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets an overview of the plugin.
-        /// </summary>      
+        /// </summary>
         public string Overview { get; set; }
 
         /// <summary>
         /// Gets or sets the owner of the plugin.
-        /// </summary>  
+        /// </summary>
         public string Owner { get; set; }
 
         /// <summary>
         /// Gets or sets the compatibility version for the plugin.
-        /// </summary>     
+        /// </summary>
         public string TargetAbi { get; set; }
 
         /// <summary>
         /// Gets or sets the timestamp of the plugin.
-        /// </summary>     
+        /// </summary>
         public DateTime Timestamp { get; set; }
 
         /// <summary>
         /// Gets or sets the Version number of the plugin.
-        /// </summary>     
+        /// </summary>
         public string Version { get; set; }
     }
 }

From f80e181eda2d1bb9348bb2b7e050e51d9948cb41 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 18:44:17 +0100
Subject: [PATCH 050/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index d1e28cce5c..4cb107f804 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1080,7 +1080,7 @@ namespace Emby.Server.Implementations
                     }
                     else
                     {
-                        metafile = dir.Split(new char[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries).Last();
+                        metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
                         // Add it under the path name and version 0.0.0.1.
                         versions.Add((new Version("0.0.0.1"), metafile, dir));
                     }

From e88d3ba8c2fd502ee159c0554467e9af064dfd1c Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 18:44:29 +0100
Subject: [PATCH 051/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 4cb107f804..8eed609d42 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1082,7 +1082,7 @@ namespace Emby.Server.Implementations
                     {
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
                         // Add it under the path name and version 0.0.0.1.
-                        versions.Add((new Version("0.0.0.1"), metafile, dir));
+                        versions.Add(new Version(0, 0, 0, 1), metafile, dir));
                     }
                 }
                 catch

From 51c416c83250988a20c2bd1c21a9fa4d528437a3 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 20:23:35 +0100
Subject: [PATCH 052/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 8eed609d42..b9e2f5b672 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1072,7 +1072,7 @@ namespace Emby.Server.Implementations
                             version = new Version(0, 0, 0, 1);
                         }
 
-                        if (ApplicationVersion <= targetAbi)
+                        if (ApplicationVersion >= targetAbi)
                         {
                             // Only load Plugins if the plugin is built for this version or below.
                             versions.Add((version, manifest.Name, dir));

From 69c4b44d248367fb45019242ab95d68ef0eff7e3 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 20:52:18 +0100
Subject: [PATCH 053/247] Update ApplicationHost.cs

---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index b9e2f5b672..3dce001c7d 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1080,7 +1080,7 @@ namespace Emby.Server.Implementations
                     }
                     else
                     {
-                        metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
+                        metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1]);
                         // Add it under the path name and version 0.0.0.1.
                         versions.Add(new Version(0, 0, 0, 1), metafile, dir));
                     }

From 02951bb8ce19f5487f2960c3a71fb23f870f9f9a Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 20:57:00 +0100
Subject: [PATCH 054/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 3dce001c7d..c4447770fb 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1082,7 +1082,7 @@ namespace Emby.Server.Implementations
                     {
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1]);
                         // Add it under the path name and version 0.0.0.1.
-                        versions.Add(new Version(0, 0, 0, 1), metafile, dir));
+                        versions.Add(new Version(0, 0, 0, 1), metafile, dir);
                     }
                 }
                 catch

From 5baf87663f80a2e4f899b596d6f14aaa2f01687b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 20:57:49 +0100
Subject: [PATCH 055/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index c4447770fb..d4d3a1d3b6 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1080,7 +1080,7 @@ namespace Emby.Server.Implementations
                     }
                     else
                     {
-                        metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1]);
+                        metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
                         // Add it under the path name and version 0.0.0.1.
                         versions.Add(new Version(0, 0, 0, 1), metafile, dir);
                     }

From a2c50e8005280887ad744739469cd64df13bfabb Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 14 Sep 2020 21:02:13 +0100
Subject: [PATCH 056/247] Update Emby.Server.Implementations/ApplicationHost.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
---
 Emby.Server.Implementations/ApplicationHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index d4d3a1d3b6..83617111b1 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1082,7 +1082,7 @@ namespace Emby.Server.Implementations
                     {
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
                         // Add it under the path name and version 0.0.0.1.
-                        versions.Add(new Version(0, 0, 0, 1), metafile, dir);
+                        versions.Add((new Version(0, 0, 0, 1), metafile, dir));
                     }
                 }
                 catch

From 86ad04b6571a9e44744f135caac768e8f1acdcde Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Sep 2020 12:02:00 +0100
Subject: [PATCH 057/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 59 +++++++++++++----------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index bca9e81cd0..44b5e070fb 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -6,7 +6,6 @@ using System.Globalization;
 using System.Linq;
 using System.Security;
 using System.Text;
-using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Server
@@ -20,8 +19,9 @@ namespace Emby.Dlna.Server
         private readonly string _serverAddress;
         private readonly string _serverName;
         private readonly string _serverId;
+        private readonly string _customName;
 
-        public DescriptionXmlBuilder(DeviceProfile profile, string serverUdn, string serverAddress, string serverName, string serverId)
+        public DescriptionXmlBuilder(DeviceProfile profile, string serverUdn, string serverAddress, string serverName, string serverId, string customName)
         {
             if (string.IsNullOrEmpty(serverUdn))
             {
@@ -38,6 +38,7 @@ namespace Emby.Dlna.Server
             _serverAddress = serverAddress;
             _serverName = serverName;
             _serverId = serverId;
+            _customName = customName;
         }
 
         private static bool EnableAbsoluteUrls => false;
@@ -168,7 +169,12 @@ namespace Emby.Dlna.Server
         {
             if (string.IsNullOrEmpty(_profile.FriendlyName))
             {
-                return "Jellyfin - " + _serverName;
+                if (string.IsNullOrEmpty(_customName))
+                {
+                    return "Jellyfin - " + _serverName;
+                }
+
+                return _customName;
             }
 
             var characterList = new List<char>();
@@ -235,13 +241,13 @@ namespace Emby.Dlna.Server
                     .Append(SecurityElement.Escape(service.ServiceId ?? string.Empty))
                     .Append("</serviceId>");
                 builder.Append("<SCPDURL>")
-                    .Append(BuildUrl(service.ScpdUrl))
+                    .Append(BuildUrl(service.ScpdUrl, true))
                     .Append("</SCPDURL>");
                 builder.Append("<controlURL>")
-                    .Append(BuildUrl(service.ControlUrl))
+                    .Append(BuildUrl(service.ControlUrl, true))
                     .Append("</controlURL>");
                 builder.Append("<eventSubURL>")
-                    .Append(BuildUrl(service.EventSubUrl))
+                    .Append(BuildUrl(service.EventSubUrl, true))
                     .Append("</eventSubURL>");
 
                 builder.Append("</service>");
@@ -250,7 +256,7 @@ namespace Emby.Dlna.Server
             builder.Append("</serviceList>");
         }
 
-        private string BuildUrl(string url)
+        private string BuildUrl(string url, bool absoluteUrl = false)
         {
             if (string.IsNullOrEmpty(url))
             {
@@ -261,7 +267,7 @@ namespace Emby.Dlna.Server
 
             url = "/dlna/" + _serverUdn + "/" + url;
 
-            if (EnableAbsoluteUrls)
+            if (EnableAbsoluteUrls || absoluteUrl)
             {
                 url = _serverAddress.TrimEnd('/') + url;
             }
@@ -269,7 +275,7 @@ namespace Emby.Dlna.Server
             return SecurityElement.Escape(url);
         }
 
-        private IEnumerable<DeviceIcon> GetIcons()
+        private static IEnumerable<DeviceIcon> GetIcons()
             => new[]
             {
                 new DeviceIcon
@@ -329,25 +335,26 @@ namespace Emby.Dlna.Server
 
         private IEnumerable<DeviceService> GetServices()
         {
-            var list = new List<DeviceService>();
-
-            list.Add(new DeviceService
+            var list = new List<DeviceService>
             {
-                ServiceType = "urn:schemas-upnp-org:service:ContentDirectory:1",
-                ServiceId = "urn:upnp-org:serviceId:ContentDirectory",
-                ScpdUrl = "contentdirectory/contentdirectory.xml",
-                ControlUrl = "contentdirectory/control",
-                EventSubUrl = "contentdirectory/events"
-            });
+                new DeviceService
+                {
+                    ServiceType = "urn:schemas-upnp-org:service:ContentDirectory:1",
+                    ServiceId = "urn:upnp-org:serviceId:ContentDirectory",
+                    ScpdUrl = "contentdirectory/contentdirectory.xml",
+                    ControlUrl = "contentdirectory/control",
+                    EventSubUrl = "contentdirectory/events"
+                },
 
-            list.Add(new DeviceService
-            {
-                ServiceType = "urn:schemas-upnp-org:service:ConnectionManager:1",
-                ServiceId = "urn:upnp-org:serviceId:ConnectionManager",
-                ScpdUrl = "connectionmanager/connectionmanager.xml",
-                ControlUrl = "connectionmanager/control",
-                EventSubUrl = "connectionmanager/events"
-            });
+                new DeviceService
+                {
+                    ServiceType = "urn:schemas-upnp-org:service:ConnectionManager:1",
+                    ServiceId = "urn:upnp-org:serviceId:ConnectionManager",
+                    ScpdUrl = "connectionmanager/connectionmanager.xml",
+                    ControlUrl = "connectionmanager/control",
+                    EventSubUrl = "connectionmanager/events"
+                }
+            };
 
             if (_profile.EnableMSMediaReceiverRegistrar)
             {

From c2e2e5ac0ce298e550a02eeb2e853497d7f9e647 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Sep 2020 12:03:17 +0100
Subject: [PATCH 058/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index 44b5e070fb..14f47e0417 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -256,6 +256,12 @@ namespace Emby.Dlna.Server
             builder.Append("</serviceList>");
         }
 
+        /// <summary>
+        /// Builds a valid url for inclusion in the xml.
+        /// </summary>
+        /// <param name="url">Url to include.</param>
+        /// <param name="absoluteUrl">Optional. When set to true, the absolute url is always used.</param>
+        /// <returns>The url to use for the element.</returns>
         private string BuildUrl(string url, bool absoluteUrl = false)
         {
             if (string.IsNullOrEmpty(url))

From a6400d12c9bd8e32497f6510fe7491fd0325650a Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Sep 2020 12:08:23 +0100
Subject: [PATCH 059/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 53 ++++++++++-------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index 14f47e0417..d449d5fe82 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -4,8 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Security;
+using System.Security;a
 using System.Text;
+using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Server
@@ -19,9 +20,8 @@ namespace Emby.Dlna.Server
         private readonly string _serverAddress;
         private readonly string _serverName;
         private readonly string _serverId;
-        private readonly string _customName;
 
-        public DescriptionXmlBuilder(DeviceProfile profile, string serverUdn, string serverAddress, string serverName, string serverId, string customName)
+        public DescriptionXmlBuilder(DeviceProfile profile, string serverUdn, string serverAddress, string serverName, string serverId)
         {
             if (string.IsNullOrEmpty(serverUdn))
             {
@@ -38,7 +38,6 @@ namespace Emby.Dlna.Server
             _serverAddress = serverAddress;
             _serverName = serverName;
             _serverId = serverId;
-            _customName = customName;
         }
 
         private static bool EnableAbsoluteUrls => false;
@@ -169,12 +168,7 @@ namespace Emby.Dlna.Server
         {
             if (string.IsNullOrEmpty(_profile.FriendlyName))
             {
-                if (string.IsNullOrEmpty(_customName))
-                {
-                    return "Jellyfin - " + _serverName;
-                }
-
-                return _customName;
+                return "Jellyfin - " + _serverName;
             }
 
             var characterList = new List<char>();
@@ -281,7 +275,7 @@ namespace Emby.Dlna.Server
             return SecurityElement.Escape(url);
         }
 
-        private static IEnumerable<DeviceIcon> GetIcons()
+        private IEnumerable<DeviceIcon> GetIcons()
             => new[]
             {
                 new DeviceIcon
@@ -341,26 +335,25 @@ namespace Emby.Dlna.Server
 
         private IEnumerable<DeviceService> GetServices()
         {
-            var list = new List<DeviceService>
-            {
-                new DeviceService
-                {
-                    ServiceType = "urn:schemas-upnp-org:service:ContentDirectory:1",
-                    ServiceId = "urn:upnp-org:serviceId:ContentDirectory",
-                    ScpdUrl = "contentdirectory/contentdirectory.xml",
-                    ControlUrl = "contentdirectory/control",
-                    EventSubUrl = "contentdirectory/events"
-                },
+            var list = new List<DeviceService>();
 
-                new DeviceService
-                {
-                    ServiceType = "urn:schemas-upnp-org:service:ConnectionManager:1",
-                    ServiceId = "urn:upnp-org:serviceId:ConnectionManager",
-                    ScpdUrl = "connectionmanager/connectionmanager.xml",
-                    ControlUrl = "connectionmanager/control",
-                    EventSubUrl = "connectionmanager/events"
-                }
-            };
+            list.Add(new DeviceService
+            {
+                ServiceType = "urn:schemas-upnp-org:service:ContentDirectory:1",
+                ServiceId = "urn:upnp-org:serviceId:ContentDirectory",
+                ScpdUrl = "contentdirectory/contentdirectory.xml",
+                ControlUrl = "contentdirectory/control",
+                EventSubUrl = "contentdirectory/events"
+            });
+
+            list.Add(new DeviceService
+            {
+                ServiceType = "urn:schemas-upnp-org:service:ConnectionManager:1",
+                ServiceId = "urn:upnp-org:serviceId:ConnectionManager",
+                ScpdUrl = "connectionmanager/connectionmanager.xml",
+                ControlUrl = "connectionmanager/control",
+                EventSubUrl = "connectionmanager/events"
+            });
 
             if (_profile.EnableMSMediaReceiverRegistrar)
             {

From d99db543daf770a059830627dbdc255ae6abe42e Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Sep 2020 12:08:37 +0100
Subject: [PATCH 060/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index d449d5fe82..1f429d0de3 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Security;a
+using System.Security;
 using System.Text;
 using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;

From 2dbf73b98962bcab1de06f8699e621e4e75a96fb Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 16 Sep 2020 14:16:44 +0200
Subject: [PATCH 061/247] Minor improvements

---
 Emby.Dlna/DlnaManager.cs                      | 16 ++++-----
 .../Data/SqliteExtensions.cs                  |  4 ++-
 .../Controllers/DynamicHlsController.cs       | 36 +++++++++----------
 Jellyfin.Api/Controllers/LiveTvController.cs  |  2 +-
 .../Controllers/SubtitleController.cs         |  8 +++--
 .../Manager/MetadataService.cs                | 19 +++-------
 RSSDP/DisposableManagedObjectBase.cs          |  4 +--
 7 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 5612376a55..1807ac6a13 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -126,14 +126,14 @@ namespace Emby.Dlna
             var builder = new StringBuilder();
 
             builder.AppendLine("No matching device profile found. The default will need to be used.");
-            builder.AppendFormat(CultureInfo.InvariantCulture, "FriendlyName:{0}", profile.FriendlyName ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "Manufacturer:{0}", profile.Manufacturer ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "ManufacturerUrl:{0}", profile.ManufacturerUrl ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "ModelDescription:{0}", profile.ModelDescription ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "ModelName:{0}", profile.ModelName ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "ModelNumber:{0}", profile.ModelNumber ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "ModelUrl:{0}", profile.ModelUrl ?? string.Empty).AppendLine();
-            builder.AppendFormat(CultureInfo.InvariantCulture, "SerialNumber:{0}", profile.SerialNumber ?? string.Empty).AppendLine();
+            builder.Append("FriendlyName:").AppendLine(profile.FriendlyName);
+            builder.Append("Manufacturer:").AppendLine(profile.Manufacturer);
+            builder.Append("ManufacturerUrl:").AppendLine(profile.ManufacturerUrl);
+            builder.Append("ModelDescription:").AppendLine(profile.ModelDescription);
+            builder.Append("ModelName:").AppendLine(profile.ModelName);
+            builder.Append("ModelNumber:").AppendLine(profile.ModelNumber);
+            builder.Append("ModelUrl:").AppendLine(profile.ModelUrl);
+            builder.Append("SerialNumber:").AppendLine(profile.SerialNumber);
 
             _logger.LogInformation(builder.ToString());
         }
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 716e5071d5..70a6df977f 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -234,7 +234,9 @@ namespace Emby.Server.Implementations.Data
         {
             if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
-                bindParam.Bind(value.ToByteArray());
+                Span<byte> byteValue = stackalloc byte[16];
+                value.TryWriteBytes(byteValue);
+                bindParam.Bind(byteValue);
             }
             else
             {
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 670b41611b..5fd9780c5d 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1144,30 +1144,30 @@ namespace Jellyfin.Api.Controllers
 
             var builder = new StringBuilder();
 
-            builder.AppendLine("#EXTM3U");
-            builder.AppendLine("#EXT-X-PLAYLIST-TYPE:VOD");
-            builder.AppendLine("#EXT-X-VERSION:3");
-            builder.AppendLine("#EXT-X-TARGETDURATION:" + Math.Ceiling(segmentLengths.Length > 0 ? segmentLengths.Max() : state.SegmentLength).ToString(CultureInfo.InvariantCulture));
-            builder.AppendLine("#EXT-X-MEDIA-SEQUENCE:0");
+            builder.AppendLine("#EXTM3U")
+                .AppendLine("#EXT-X-PLAYLIST-TYPE:VOD")
+                .AppendLine("#EXT-X-VERSION:3")
+                .Append("#EXT-X-TARGETDURATION:")
+                .Append(Math.Ceiling(segmentLengths.Length > 0 ? segmentLengths.Max() : state.SegmentLength))
+                .AppendLine()
+                .AppendLine("#EXT-X-MEDIA-SEQUENCE:0");
 
-            var queryString = Request.QueryString;
             var index = 0;
-
             var segmentExtension = GetSegmentFileExtension(streamingRequest.SegmentContainer);
+            var queryString = Request.QueryString;
 
             foreach (var length in segmentLengths)
             {
-                builder.AppendLine("#EXTINF:" + length.ToString("0.0000", CultureInfo.InvariantCulture) + ", nodesc");
-                builder.AppendLine(
-                    string.Format(
-                        CultureInfo.InvariantCulture,
-                        "hls1/{0}/{1}{2}{3}",
-                        name,
-                        index.ToString(CultureInfo.InvariantCulture),
-                        segmentExtension,
-                        queryString));
-
-                index++;
+                builder.Append("#EXTINF:")
+                    .Append(length.ToString("0.0000", CultureInfo.InvariantCulture))
+                    .Append(", nodesc")
+                    .Append("hls1/")
+                    .Append(name)
+                    .Append('/')
+                    .Append(index++)
+                    .Append(segmentExtension)
+                    .Append(queryString)
+                    .AppendLine();
             }
 
             builder.AppendLine("#EXT-X-ENDLIST");
diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.cs
index 32ebfbd988..3557e63047 100644
--- a/Jellyfin.Api/Controllers/LiveTvController.cs
+++ b/Jellyfin.Api/Controllers/LiveTvController.cs
@@ -1017,9 +1017,9 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] bool validateListings = false,
             [FromQuery] bool validateLogin = false)
         {
-            using var sha = SHA1.Create();
             if (!string.IsNullOrEmpty(pw))
             {
+                using var sha = SHA1.Create();
                 listingsProviderInfo.Password = Hex.Encode(sha.ComputeHash(Encoding.UTF8.GetBytes(pw)));
             }
 
diff --git a/Jellyfin.Api/Controllers/SubtitleController.cs b/Jellyfin.Api/Controllers/SubtitleController.cs
index 78c9d43981..cc682ed542 100644
--- a/Jellyfin.Api/Controllers/SubtitleController.cs
+++ b/Jellyfin.Api/Controllers/SubtitleController.cs
@@ -281,7 +281,8 @@ namespace Jellyfin.Api.Controllers
             var builder = new StringBuilder();
             builder.AppendLine("#EXTM3U")
                 .Append("#EXT-X-TARGETDURATION:")
-                .AppendLine(segmentLength.ToString(CultureInfo.InvariantCulture))
+                .Append(segmentLength)
+                .AppendLine()
                 .AppendLine("#EXT-X-VERSION:3")
                 .AppendLine("#EXT-X-MEDIA-SEQUENCE:0")
                 .AppendLine("#EXT-X-PLAYLIST-TYPE:VOD");
@@ -296,8 +297,9 @@ namespace Jellyfin.Api.Controllers
                 var lengthTicks = Math.Min(remaining, segmentLengthTicks);
 
                 builder.Append("#EXTINF:")
-                    .Append(TimeSpan.FromTicks(lengthTicks).TotalSeconds.ToString(CultureInfo.InvariantCulture))
-                    .AppendLine(",");
+                    .Append(TimeSpan.FromTicks(lengthTicks).TotalSeconds)
+                    .Append(',')
+                    .AppendLine();
 
                 var endPositionTicks = Math.Min(runtime, positionTicks + segmentLengthTicks);
 
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 42785b0574..f110eafa5a 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -297,7 +297,7 @@ namespace MediaBrowser.Providers.Manager
         }
 
         /// <summary>
-        /// Befores the save.
+        /// Before the save.
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="isFullRefresh">if set to <c>true</c> [is full refresh].</param>
@@ -355,13 +355,12 @@ namespace MediaBrowser.Providers.Manager
 
         protected virtual IList<BaseItem> GetChildrenForMetadataUpdates(TItemType item)
         {
-            var folder = item as Folder;
-            if (folder != null)
+            if (item is Folder folder)
             {
                 return folder.GetRecursiveChildren();
             }
 
-            return new List<BaseItem>();
+            return Array.Empty<BaseItem>();
         }
 
         protected virtual ItemUpdateType UpdateMetadataFromChildren(TItemType item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
@@ -814,7 +813,7 @@ namespace MediaBrowser.Providers.Manager
 
             try
             {
-                refreshResult.UpdateType = refreshResult.UpdateType | await provider.FetchAsync(item, options, cancellationToken).ConfigureAwait(false);
+                refreshResult.UpdateType |= await provider.FetchAsync(item, options, cancellationToken).ConfigureAwait(false);
             }
             catch (OperationCanceledException)
             {
@@ -882,16 +881,6 @@ namespace MediaBrowser.Providers.Manager
             return refreshResult;
         }
 
-        private string NormalizeLanguage(string language)
-        {
-            if (string.IsNullOrWhiteSpace(language))
-            {
-                return "en";
-            }
-
-            return language;
-        }
-
         private void MergeNewData(TItemType source, TIdType lookupInfo)
         {
             // Copy new provider id's that may have been obtained
diff --git a/RSSDP/DisposableManagedObjectBase.cs b/RSSDP/DisposableManagedObjectBase.cs
index 66a0c5ec45..745ec359c9 100644
--- a/RSSDP/DisposableManagedObjectBase.cs
+++ b/RSSDP/DisposableManagedObjectBase.cs
@@ -43,13 +43,13 @@ namespace Rssdp.Infrastructure
         {
             var builder = new StringBuilder();
 
-            const string argFormat = "{0}: {1}\r\n";
+            const string ArgFormat = "{0}: {1}\r\n";
 
             builder.AppendFormat("{0}\r\n", header);
 
             foreach (var pair in values)
             {
-                builder.AppendFormat(argFormat, pair.Key, pair.Value);
+                builder.AppendFormat(ArgFormat, pair.Key, pair.Value);
             }
 
             builder.Append("\r\n");

From ad00b93be54115674750b1b89421f9e5ea1807cb Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Sep 2020 14:14:10 +0100
Subject: [PATCH 062/247] Rename PlugInManifest.cs to PluginManifest.cs

---
 .../Plugins/{PlugInManifest.cs => PluginManifest.cs}              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Emby.Server.Implementations/Plugins/{PlugInManifest.cs => PluginManifest.cs} (100%)

diff --git a/Emby.Server.Implementations/Plugins/PlugInManifest.cs b/Emby.Server.Implementations/Plugins/PluginManifest.cs
similarity index 100%
rename from Emby.Server.Implementations/Plugins/PlugInManifest.cs
rename to Emby.Server.Implementations/Plugins/PluginManifest.cs

From 0007756a5ee0b0da3ac238ccc76f4be198ee4eed Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 16 Sep 2020 15:35:37 +0200
Subject: [PATCH 063/247] Fix

---
 Jellyfin.Api/Controllers/DynamicHlsController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 5fd9780c5d..54481c9be7 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1160,7 +1160,7 @@ namespace Jellyfin.Api.Controllers
             {
                 builder.Append("#EXTINF:")
                     .Append(length.ToString("0.0000", CultureInfo.InvariantCulture))
-                    .Append(", nodesc")
+                    .AppendLine(", nodesc")
                     .Append("hls1/")
                     .Append(name)
                     .Append('/')

From 5cca8bffea339f1043d692f337ab002dbee3a03b Mon Sep 17 00:00:00 2001
From: spookbits <71300703+spooksbit@users.noreply.github.com>
Date: Wed, 16 Sep 2020 13:17:14 -0400
Subject: [PATCH 064/247] Removed browser auto-load functionality from the
 server. Added profiles in launchSettings to start either the web client or
 the swagger API page. Removed --noautorunwebapp as this is the default
 functionality.

---
 CONTRIBUTORS.md                               |  1 +
 .../Browser/BrowserLauncher.cs                | 51 ------------
 .../EntryPoints/StartupWizard.cs              | 83 -------------------
 .../IStartupOptions.cs                        |  5 --
 Jellyfin.Server/Jellyfin.Server.csproj        |  2 +-
 .../Properties/launchSettings.json            |  8 +-
 Jellyfin.Server/StartupOptions.cs             |  4 -
 .../Configuration/ServerConfiguration.cs      |  3 -
 .../JellyfinApplicationFactory.cs             |  3 +-
 9 files changed, 10 insertions(+), 150 deletions(-)
 delete mode 100644 Emby.Server.Implementations/Browser/BrowserLauncher.cs
 delete mode 100644 Emby.Server.Implementations/EntryPoints/StartupWizard.cs

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f1fe65064b..2ec147ba2f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -103,6 +103,7 @@
  - [sl1288](https://github.com/sl1288)
  - [sorinyo2004](https://github.com/sorinyo2004)
  - [sparky8251](https://github.com/sparky8251)
+ - [spookbits](https://github.com/spookbits)
  - [stanionascu](https://github.com/stanionascu)
  - [stevehayles](https://github.com/stevehayles)
  - [SuperSandro2000](https://github.com/SuperSandro2000)
diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
deleted file mode 100644
index f8108d1c2d..0000000000
--- a/Emby.Server.Implementations/Browser/BrowserLauncher.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.Browser
-{
-    /// <summary>
-    /// Assists in opening application URLs in an external browser.
-    /// </summary>
-    public static class BrowserLauncher
-    {
-        /// <summary>
-        /// Opens the home page of the web client.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenWebApp(IServerApplicationHost appHost)
-        {
-            TryOpenUrl(appHost, "/web/index.html");
-        }
-
-        /// <summary>
-        /// Opens the swagger API page.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenSwaggerPage(IServerApplicationHost appHost)
-        {
-            TryOpenUrl(appHost, "/api-docs/swagger");
-        }
-
-        /// <summary>
-        /// Opens the specified URL in an external browser window. Any exceptions will be logged, but ignored.
-        /// </summary>
-        /// <param name="appHost">The application host.</param>
-        /// <param name="relativeUrl">The URL to open, relative to the server base URL.</param>
-        private static void TryOpenUrl(IServerApplicationHost appHost, string relativeUrl)
-        {
-            try
-            {
-                string baseUrl = appHost.GetLocalApiUrl("localhost");
-                appHost.LaunchUrl(baseUrl + relativeUrl);
-            }
-            catch (Exception ex)
-            {
-                var logger = appHost.Resolve<ILogger<IServerApplicationHost>>();
-                logger?.LogError(ex, "Failed to open browser window with URL {URL}", relativeUrl);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
deleted file mode 100644
index 2e738deeb5..0000000000
--- a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System.Threading.Tasks;
-using Emby.Server.Implementations.Browser;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Extensions;
-using MediaBrowser.Controller.Plugins;
-using Microsoft.Extensions.Configuration;
-
-namespace Emby.Server.Implementations.EntryPoints
-{
-    /// <summary>
-    /// Class StartupWizard.
-    /// </summary>
-    public sealed class StartupWizard : IServerEntryPoint
-    {
-        private readonly IServerApplicationHost _appHost;
-        private readonly IConfiguration _appConfig;
-        private readonly IServerConfigurationManager _config;
-        private readonly IStartupOptions _startupOptions;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartupWizard"/> class.
-        /// </summary>
-        /// <param name="appHost">The application host.</param>
-        /// <param name="appConfig">The application configuration.</param>
-        /// <param name="config">The configuration manager.</param>
-        /// <param name="startupOptions">The application startup options.</param>
-        public StartupWizard(
-            IServerApplicationHost appHost,
-            IConfiguration appConfig,
-            IServerConfigurationManager config,
-            IStartupOptions startupOptions)
-        {
-            _appHost = appHost;
-            _appConfig = appConfig;
-            _config = config;
-            _startupOptions = startupOptions;
-        }
-
-        /// <inheritdoc />
-        public Task RunAsync()
-        {
-            Run();
-            return Task.CompletedTask;
-        }
-
-        private void Run()
-        {
-            if (!_appHost.CanLaunchWebBrowser)
-            {
-                return;
-            }
-
-            // Always launch the startup wizard if possible when it has not been completed
-            if (!_config.Configuration.IsStartupWizardCompleted && _appConfig.HostWebClient())
-            {
-                BrowserLauncher.OpenWebApp(_appHost);
-                return;
-            }
-
-            // Do nothing if the web app is configured to not run automatically
-            if (!_config.Configuration.AutoRunWebApp || _startupOptions.NoAutoRunWebApp)
-            {
-                return;
-            }
-
-            // Launch the swagger page if the web client is not hosted, otherwise open the web client
-            if (_appConfig.HostWebClient())
-            {
-                BrowserLauncher.OpenWebApp(_appHost);
-            }
-            else
-            {
-                BrowserLauncher.OpenSwaggerPage(_appHost);
-            }
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/IStartupOptions.cs b/Emby.Server.Implementations/IStartupOptions.cs
index e7e72c686b..4bef59543f 100644
--- a/Emby.Server.Implementations/IStartupOptions.cs
+++ b/Emby.Server.Implementations/IStartupOptions.cs
@@ -16,11 +16,6 @@ namespace Emby.Server.Implementations
         /// </summary>
         bool IsService { get; }
 
-        /// <summary>
-        /// Gets the value of the --noautorunwebapp command line option.
-        /// </summary>
-        bool NoAutoRunWebApp { get; }
-
         /// <summary>
         /// Gets the value of the --package-name command line option.
         /// </summary>
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 0ac309a0b0..b66314a8ea 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
   <PropertyGroup>
diff --git a/Jellyfin.Server/Properties/launchSettings.json b/Jellyfin.Server/Properties/launchSettings.json
index b6e2bcf976..ebdd0dedaa 100644
--- a/Jellyfin.Server/Properties/launchSettings.json
+++ b/Jellyfin.Server/Properties/launchSettings.json
@@ -2,14 +2,20 @@
   "profiles": {
     "Jellyfin.Server": {
       "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "web",
+      "applicationUrl": "http://localhost:8096",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Jellyfin.Server (nowebclient)": {
       "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "api-docs/swagger",
+      "applicationUrl": "http://localhost:8096",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+          "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "commandLineArgs": "--nowebclient"
     }
diff --git a/Jellyfin.Server/StartupOptions.cs b/Jellyfin.Server/StartupOptions.cs
index 41a1430d26..b634340927 100644
--- a/Jellyfin.Server/StartupOptions.cs
+++ b/Jellyfin.Server/StartupOptions.cs
@@ -63,10 +63,6 @@ namespace Jellyfin.Server
         [Option("service", Required = false, HelpText = "Run as headless service.")]
         public bool IsService { get; set; }
 
-        /// <inheritdoc />
-        [Option("noautorunwebapp", Required = false, HelpText = "Run headless if startup wizard is complete.")]
-        public bool NoAutoRunWebApp { get; set; }
-
         /// <inheritdoc />
         [Option("package-name", Required = false, HelpText = "Used when packaging Jellyfin (example, synology).")]
         public string? PackageName { get; set; }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 48d1a7346a..8b78ad842e 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -83,8 +83,6 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         public bool QuickConnectAvailable { get; set; }
 
-        public bool AutoRunWebApp { get; set; }
-
         public bool EnableRemoteAccess { get; set; }
 
         /// <summary>
@@ -306,7 +304,6 @@ namespace MediaBrowser.Model.Configuration
             DisableLiveTvChannelUserDataName = true;
             EnableNewOmdbSupport = true;
 
-            AutoRunWebApp = true;
             EnableRemoteAccess = true;
             QuickConnectAvailable = false;
 
diff --git a/tests/Jellyfin.Api.Tests/JellyfinApplicationFactory.cs b/tests/Jellyfin.Api.Tests/JellyfinApplicationFactory.cs
index 77f1640fa3..bd3d356870 100644
--- a/tests/Jellyfin.Api.Tests/JellyfinApplicationFactory.cs
+++ b/tests/Jellyfin.Api.Tests/JellyfinApplicationFactory.cs
@@ -47,8 +47,7 @@ namespace Jellyfin.Api.Tests
             // Specify the startup command line options
             var commandLineOpts = new StartupOptions
             {
-                NoWebClient = true,
-                NoAutoRunWebApp = true
+                NoWebClient = true
             };
 
             // Use a temporary directory for the application paths

From ac32b140122f669e6b8b6b2294b83a96b6842314 Mon Sep 17 00:00:00 2001
From: spooksbit <71300703+spooksbit@users.noreply.github.com>
Date: Wed, 16 Sep 2020 15:11:35 -0400
Subject: [PATCH 065/247] Update Jellyfin.Server/Properties/launchSettings.json

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Jellyfin.Server/Properties/launchSettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Server/Properties/launchSettings.json b/Jellyfin.Server/Properties/launchSettings.json
index ebdd0dedaa..d8be520b7b 100644
--- a/Jellyfin.Server/Properties/launchSettings.json
+++ b/Jellyfin.Server/Properties/launchSettings.json
@@ -15,7 +15,7 @@
       "launchUrl": "api-docs/swagger",
       "applicationUrl": "http://localhost:8096",
       "environmentVariables": {
-          "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "commandLineArgs": "--nowebclient"
     }

From 246ab260f71731c03e8199cbb52e0a7457aaf997 Mon Sep 17 00:00:00 2001
From: spookbits <71300703+spooksbit@users.noreply.github.com>
Date: Wed, 16 Sep 2020 17:09:24 -0400
Subject: [PATCH 066/247] Do not implicitly reference ASP.NET Core Analyzers.
 Also do not explicitly reference AspNetCore.App (fixes compiler warning).

---
 Jellyfin.Server/Jellyfin.Server.csproj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index b66314a8ea..ffab18f863 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -13,6 +13,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
+    <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,10 +24,6 @@
     <EmbeddedResource Include="Resources/Configuration/*" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <!-- Code Analyzers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />

From 826148dc843616df4157de9f03e025fa60f6147d Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 11:01:46 +0100
Subject: [PATCH 067/247] Added versioning to files without meta.json

---
 Emby.Server.Implementations/ApplicationHost.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 276d0fe30a..abec4126af 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1086,9 +1086,20 @@ namespace Emby.Server.Implementations
                     }
                     else
                     {
+                        // No metafile, so lets see if the folder is versioned.
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
-                        // Add it under the path name and version 0.0.0.1.
-                        versions.Add((new Version(0, 0, 0, 1), metafile, dir));
+                        
+                        int p = dir.LastIndexOf('_');
+                        if (p != -1 && Version.TryParse(dir.Substring(p + 1), out Version ver))
+                        {
+                            // Versioned folder.
+                            versions.Add((ver, metafile, dir));
+                        }
+                        else
+                        {
+                            // Un-versioned folder - Add it under the path name and version 0.0.0.1.                        
+                            versions.Add((new Version(0, 0, 0, 1), metafile, dir));
+                        }   
                     }
                 }
                 catch

From 92b63db569f2e425673eba7d05e66411a9c4c21f Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 15:57:11 +0100
Subject: [PATCH 068/247] Update ApplicationHost.cs

---
 Emby.Server.Implementations/ApplicationHost.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index abec4126af..7a46fdf2e7 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1089,8 +1089,8 @@ namespace Emby.Server.Implementations
                         // No metafile, so lets see if the folder is versioned.
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
                         
-                        int p = dir.LastIndexOf('_');
-                        if (p != -1 && Version.TryParse(dir.Substring(p + 1), out Version ver))
+                        int versionIndex = dir.LastIndexOf('_');
+                        if (versionIndex != -1 && Version.TryParse(dir.Substring(versionIndex + 1), out Version ver))
                         {
                             // Versioned folder.
                             versions.Add((ver, metafile, dir));

From 81db323f88ddd87b4f75f9231206e83fbe4356b1 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 17:54:09 +0100
Subject: [PATCH 069/247] Update SessionController.cs

---
 Jellyfin.Api/Controllers/SessionController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index b00675d679..9820ded444 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -155,13 +155,13 @@ namespace Jellyfin.Api.Controllers
         /// <param name="startPositionTicks">The starting position of the first item.</param>
         /// <response code="204">Instruction sent to session.</response>
         /// <returns>A <see cref="NoContentResult"/>.</returns>
-        [HttpPost("Sessions/{sessionId}/Playing/{command}")]
+        [HttpPost("Sessions/{sessionId}/Playing")]
         [Authorize(Policy = Policies.DefaultAuthorization)]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult Play(
             [FromRoute, Required] string sessionId,
             [FromRoute, Required] PlayCommand command,
-            [FromQuery] Guid[] itemIds,
+            [FromQuery] Guid itemIds,
             [FromQuery] long? startPositionTicks)
         {
             var playRequest = new PlayRequest
@@ -187,7 +187,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="playstateRequest">The <see cref="PlaystateRequest"/>.</param>
         /// <response code="204">Playstate command sent to session.</response>
         /// <returns>A <see cref="NoContentResult"/>.</returns>
-        [HttpPost("Sessions/{sessionId}/Playing")]
+        [HttpPost("Sessions/{sessionId}/Playing/{command}")]
         [Authorize(Policy = Policies.DefaultAuthorization)]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SendPlaystateCommand(

From 9fc1a8b6198b80e2fe2dfcceab8614146c7fc6f4 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 18:20:27 +0100
Subject: [PATCH 070/247] Inverted if statement

---
 Jellyfin.Api/Helpers/StreamingHelpers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 89ab2da627..f4ec29bdef 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -169,7 +169,7 @@ namespace Jellyfin.Api.Helpers
 
             string? containerInternal = Path.GetExtension(state.RequestedUrl);
 
-            if (string.IsNullOrEmpty(streamingRequest.Container))
+            if (!string.IsNullOrEmpty(streamingRequest.Container))
             {
                 containerInternal = streamingRequest.Container;
             }

From 604edea6a68236f9ebe9a446608214304ac936b8 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 18:26:27 +0100
Subject: [PATCH 071/247] Update DynamicHlsController.cs

Removed container fields
---
 .../Controllers/DynamicHlsController.cs        | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 670b41611b..31e09a7e26 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
@@ -113,7 +113,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets a video hls playlist stream.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -170,7 +169,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetMasterHlsVideoPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromRoute, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -223,7 +221,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new HlsVideoRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -281,7 +278,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets an audio hls playlist stream.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -338,7 +334,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetMasterHlsAudioPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -391,7 +386,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new HlsAudioRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -449,7 +443,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets a video stream using HTTP live streaming.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -504,7 +497,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetVariantHlsVideoPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -557,7 +549,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new VideoRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -615,7 +606,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets an audio stream using HTTP live streaming.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -670,7 +660,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetVariantHlsAudioPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -723,7 +712,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new StreamingRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -841,7 +829,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] Guid itemId,
             [FromRoute, Required] string playlistId,
             [FromRoute, Required] int segmentId,
-            [FromRoute, Required] string container,
+            [FromRoute] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -1011,7 +999,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] Guid itemId,
             [FromRoute, Required] string playlistId,
             [FromRoute, Required] int segmentId,
-            [FromRoute, Required] string container,
+            [FromRoute] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,

From 8738fe570a54d367f3c13255ba18b21b12ac47ac Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 18:27:07 +0100
Subject: [PATCH 072/247] Update SessionController.cs

---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 9820ded444..e2e95182e2 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -166,7 +166,7 @@ namespace Jellyfin.Api.Controllers
         {
             var playRequest = new PlayRequest
             {
-                ItemIds = itemIds,
+                ItemIds = new [] { itemIds },
                 StartPositionTicks = startPositionTicks,
                 PlayCommand = command
             };

From d428ca55cd09efa757b38a5f749cedb42eca10a9 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 18:41:12 +0100
Subject: [PATCH 073/247] Update DynamicHlsController.cs

---
 Jellyfin.Api/Controllers/DynamicHlsController.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 31e09a7e26..0ce9bed652 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -278,6 +278,7 @@ namespace Jellyfin.Api.Controllers
         /// Gets an audio hls playlist stream.
         /// </summary>
         /// <param name="itemId">The item id.</param>
+        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -334,6 +335,7 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetMasterHlsAudioPlaylist(
             [FromRoute, Required] Guid itemId,
+            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -386,6 +388,7 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new HlsAudioRequestDto
             {
                 Id = itemId,
+                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -443,6 +446,7 @@ namespace Jellyfin.Api.Controllers
         /// Gets a video stream using HTTP live streaming.
         /// </summary>
         /// <param name="itemId">The item id.</param>
+        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -497,6 +501,7 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetVariantHlsVideoPlaylist(
             [FromRoute, Required] Guid itemId,
+            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -549,6 +554,7 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new VideoRequestDto
             {
                 Id = itemId,
+                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -606,6 +612,7 @@ namespace Jellyfin.Api.Controllers
         /// Gets an audio stream using HTTP live streaming.
         /// </summary>
         /// <param name="itemId">The item id.</param>
+        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -660,6 +667,7 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetVariantHlsAudioPlaylist(
             [FromRoute, Required] Guid itemId,
+            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -712,6 +720,7 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new StreamingRequestDto
             {
                 Id = itemId,
+                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,

From ea7b3699c208ab542e4fc157acad2e9519891654 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 17 Sep 2020 18:47:36 +0100
Subject: [PATCH 074/247] Update SessionController.cs

removed space
---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index e2e95182e2..6ae645e8fe 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -166,7 +166,7 @@ namespace Jellyfin.Api.Controllers
         {
             var playRequest = new PlayRequest
             {
-                ItemIds = new [] { itemIds },
+                ItemIds = new[] { itemIds },
                 StartPositionTicks = startPositionTicks,
                 PlayCommand = command
             };

From 226e517f1174bdf150057202176c166676c12f90 Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Fri, 18 Sep 2020 10:02:15 +0200
Subject: [PATCH 075/247] Update SkiaSharp.NativeAssets.Linux to 2.80.2

---
 Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index 6b378034a5..f86b142449 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="BlurHashSharp" Version="1.1.0" />
     <PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.1.0" />
     <PackageReference Include="SkiaSharp" Version="2.80.2" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" />
   </ItemGroup>
 
   <ItemGroup>

From f363d8afd59ed84d5f199a320776659853c83915 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <71051936+hoanghuy309@users.noreply.github.com>
Date: Fri, 18 Sep 2020 22:31:09 +0700
Subject: [PATCH 076/247] Update LocalizationManager.cs

---
 Emby.Server.Implementations/Localization/LocalizationManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index 90e2766b84..30aaf3a058 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -413,6 +413,7 @@ namespace Emby.Server.Implementations.Localization
             yield return new LocalizationOption("Swedish", "sv");
             yield return new LocalizationOption("Swiss German", "gsw");
             yield return new LocalizationOption("Turkish", "tr");
+            yield return new LocalizationOption("Tiếng Việt", "vi");
         }
     }
 }

From 675fcab4514df6853c560f9c567e78d0e9c52fa8 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Sat, 19 Sep 2020 07:00:32 +0000
Subject: [PATCH 077/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index bf4cfe75ca..c3da35acbb 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -29,8 +29,8 @@
     "TaskCleanLogs": "Làm sạch nhật ký",
     "TaskRefreshLibraryDescription": "Quét thư viện phương tiện của bạn để tìm các tệp mới và làm mới thông tin chi tiết.",
     "TaskRefreshLibrary": "Quét Thư viện Phương tiện",
-    "TaskRefreshChapterImagesDescription": "Tạo hình thu nhỏ cho các video có chương.",
-    "TaskRefreshChapterImages": "Trích xuất hình ảnh chương",
+    "TaskRefreshChapterImagesDescription": "Tạo hình thu nhỏ cho video có cảnh quay.",
+    "TaskRefreshChapterImages": "Trích Xuất Ảnh Cảnh Quay",
     "TaskCleanCacheDescription": "Xóa các tệp cache không còn cần thiết của hệ thống.",
     "TaskCleanCache": "Làm Sạch Thư Mục Cache",
     "TasksChannelsCategory": "Kênh Internet",
@@ -107,7 +107,7 @@
     "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập thất bại từ {0}",
     "DeviceOnlineWithName": "{0} đã kết nối",
     "DeviceOfflineWithName": "{0} đã ngắt kết nối",
-    "ChapterNameValue": "Chương {0}",
+    "ChapterNameValue": "Cảnh Quay {0}",
     "Channels": "Các Kênh",
     "CameraImageUploadedFrom": "Một hình ảnh máy ảnh mới đã được tải lên từ {0}",
     "Books": "Các Quyển Sách",

From dc73d044de83110c28b33000cf0d5d8628f3d99e Mon Sep 17 00:00:00 2001
From: David <daullmer@gmail.com>
Date: Sat, 19 Sep 2020 13:58:35 +0200
Subject: [PATCH 078/247] Fix TMDB Season Images

---
 .../Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
index e7e2fd05b8..dcc7f87002 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
@@ -112,9 +112,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
         private async Task<List<Poster>> FetchImages(Season item, string tmdbId, string language, CancellationToken cancellationToken)
         {
-            await TmdbSeasonProvider.Current.EnsureSeasonInfo(tmdbId, item.IndexNumber.GetValueOrDefault(), language, cancellationToken).ConfigureAwait(false);
+            var seasonNumber = item.IndexNumber.GetValueOrDefault();
+            await TmdbSeasonProvider.Current.EnsureSeasonInfo(tmdbId, seasonNumber, language, cancellationToken).ConfigureAwait(false);
 
-            var path = TmdbSeriesProvider.Current.GetDataFilePath(tmdbId, language);
+            var path = TmdbSeasonProvider.Current.GetDataFilePath(tmdbId, seasonNumber, language);
 
             if (!string.IsNullOrEmpty(path))
             {

From 4dae7d0521fd0052a87515aefb3e3bd7f2fda3f7 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 13:58:18 +0100
Subject: [PATCH 079/247] Update Jellyfin.Api/Controllers/SessionController.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 6ae645e8fe..9d7f2a502c 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -166,7 +166,7 @@ namespace Jellyfin.Api.Controllers
         {
             var playRequest = new PlayRequest
             {
-                ItemIds = new[] { itemIds },
+                ItemIds = itemIds.Split(','),
                 StartPositionTicks = startPositionTicks,
                 PlayCommand = command
             };

From eee977a77ba775babeca61fed54793f9fc6f57dc Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 13:58:39 +0100
Subject: [PATCH 080/247] Update Jellyfin.Api/Controllers/SessionController.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 9d7f2a502c..228d6c8341 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -161,7 +161,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult Play(
             [FromRoute, Required] string sessionId,
             [FromRoute, Required] PlayCommand command,
-            [FromQuery] Guid itemIds,
+            [FromQuery] string itemIds,
             [FromQuery] long? startPositionTicks)
         {
             var playRequest = new PlayRequest

From d8e8d298ea8cff3e1b47e7110d2abd80bd34b981 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 13:58:56 +0100
Subject: [PATCH 081/247] Update Jellyfin.Api/Controllers/SessionController.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 228d6c8341..3aa1642da5 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -160,7 +160,7 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult Play(
             [FromRoute, Required] string sessionId,
-            [FromRoute, Required] PlayCommand command,
+            [FromQuery, Required] PlayRequest playRequest,
             [FromQuery] string itemIds,
             [FromQuery] long? startPositionTicks)
         {

From 50060175b1ad3db835a68d9f109af6c07efeda0b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 14:53:08 +0100
Subject: [PATCH 082/247] Update DynamicHlsController.cs

---
 Jellyfin.Api/Controllers/DynamicHlsController.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 0ce9bed652..31e09a7e26 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -278,7 +278,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets an audio hls playlist stream.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -335,7 +334,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetMasterHlsAudioPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -388,7 +386,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new HlsAudioRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -446,7 +443,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets a video stream using HTTP live streaming.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -501,7 +497,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetVariantHlsVideoPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -554,7 +549,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new VideoRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,
@@ -612,7 +606,6 @@ namespace Jellyfin.Api.Controllers
         /// Gets an audio stream using HTTP live streaming.
         /// </summary>
         /// <param name="itemId">The item id.</param>
-        /// <param name="container">The video container. Possible values are: ts, webm, asf, wmv, ogv, mp4, m4v, mkv, mpeg, mpg, avi, 3gp, wmv, wtv, m2ts, mov, iso, flv. </param>
         /// <param name="static">Optional. If true, the original file will be streamed statically without any encoding. Use either no url extension or the original file extension. true/false.</param>
         /// <param name="params">The streaming parameters.</param>
         /// <param name="tag">The tag.</param>
@@ -667,7 +660,6 @@ namespace Jellyfin.Api.Controllers
         [ProducesPlaylistFile]
         public async Task<ActionResult> GetVariantHlsAudioPlaylist(
             [FromRoute, Required] Guid itemId,
-            [FromQuery, Required] string container,
             [FromQuery] bool? @static,
             [FromQuery] string? @params,
             [FromQuery] string? tag,
@@ -720,7 +712,6 @@ namespace Jellyfin.Api.Controllers
             var streamingRequest = new StreamingRequestDto
             {
                 Id = itemId,
-                Container = container,
                 Static = @static ?? true,
                 Params = @params,
                 Tag = tag,

From 7050525f6b70d9725cb76a6954004a3979e4bfda Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 15:01:34 +0100
Subject: [PATCH 083/247] Update SessionController.cs

---
 Jellyfin.Api/Controllers/SessionController.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 3aa1642da5..a1ec391129 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -1,4 +1,4 @@
-#pragma warning disable CA1801
+#pragma warning disable CA1801
 
 using System;
 using System.Collections.Generic;
@@ -150,7 +150,7 @@ namespace Jellyfin.Api.Controllers
         /// Instructs a session to play an item.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The type of play command to issue (PlayNow, PlayNext, PlayLast). Clients who have not yet implemented play next and play last may play now.</param>
+        /// <param name="playCommand">The type of play command to issue (PlayNow, PlayNext, PlayLast). Clients who have not yet implemented play next and play last may play now.</param>
         /// <param name="itemIds">The ids of the items to play, comma delimited.</param>
         /// <param name="startPositionTicks">The starting position of the first item.</param>
         /// <response code="204">Instruction sent to session.</response>
@@ -160,15 +160,15 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult Play(
             [FromRoute, Required] string sessionId,
-            [FromQuery, Required] PlayRequest playRequest,
-            [FromQuery] string itemIds,
+            [FromQuery, Required] PlayCommand playCommand,
+            [FromQuery] Guid itemIds,
             [FromQuery] long? startPositionTicks)
         {
             var playRequest = new PlayRequest
             {
-                ItemIds = itemIds.Split(','),
+                ItemIds = new[] { itemIds },
                 StartPositionTicks = startPositionTicks,
-                PlayCommand = command
+                PlayCommand = playCommand
             };
 
             _sessionManager.SendPlayCommand(
@@ -184,6 +184,7 @@ namespace Jellyfin.Api.Controllers
         /// Issues a playstate command to a client.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
+        /// <param name="command">The <see cref="PlayCommand"/>.</param>
         /// <param name="playstateRequest">The <see cref="PlaystateRequest"/>.</param>
         /// <response code="204">Playstate command sent to session.</response>
         /// <returns>A <see cref="NoContentResult"/>.</returns>
@@ -192,7 +193,8 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SendPlaystateCommand(
             [FromRoute, Required] string sessionId,
-            [FromBody] PlaystateRequest playstateRequest)
+            [FromRoute, Required] PlayCommand command,
+            [FromQuery] PlaystateRequest playstateRequest)
         {
             _sessionManager.SendPlaystateCommand(
                 RequestHelpers.GetSession(_sessionManager, _authContext, Request).Id,

From 701d54260d44d7750ddc757f9957a9f0bdee781b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 15:46:47 +0100
Subject: [PATCH 084/247] Update SessionController.cs

---
 Jellyfin.Api/Controllers/SessionController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index a1ec391129..1d7dc7c8ae 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -161,12 +161,12 @@ namespace Jellyfin.Api.Controllers
         public ActionResult Play(
             [FromRoute, Required] string sessionId,
             [FromQuery, Required] PlayCommand playCommand,
-            [FromQuery] Guid itemIds,
+            [FromQuery, Required] string itemIds,
             [FromQuery] long? startPositionTicks)
         {
             var playRequest = new PlayRequest
             {
-                ItemIds = new[] { itemIds },
+                ItemIds = itemIds.Split(',').Select(p => Guid.Parse(p)).ToArray(),
                 StartPositionTicks = startPositionTicks,
                 PlayCommand = playCommand
             };

From 5464eaed4ae0e1927883fce89d02ed2b6e60a745 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 16:40:39 +0100
Subject: [PATCH 085/247] Update EncoderValidator.cs

---
 MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index c8bf5557b0..3287f9814e 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -212,7 +212,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (match.Success)
             {
-                return new Version(match.Groups[1].Value);
+                if (Version.TryParse(match.Groups[1].Value, out var result))
+                {
+                    return result;
+                }
             }
 
             var versionMap = GetFFmpegLibraryVersions(output);

From bbf196c7bd1f7a32d5410e790b8d8752d34cd339 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sat, 19 Sep 2020 16:44:35 +0100
Subject: [PATCH 086/247] Update TranscodingJobHelper.cs

---
 Jellyfin.Api/Helpers/TranscodingJobHelper.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
index 67e4503729..64d1227f7c 100644
--- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
+++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
@@ -504,6 +504,11 @@ namespace Jellyfin.Api.Helpers
                 }
             }
 
+            if (string.IsNullOrEmpty(_mediaEncoder.EncoderPath))
+            {
+                throw new ArgumentException("FFMPEG path not set.");
+            }
+
             var process = new Process
             {
                 StartInfo = new ProcessStartInfo

From 484cd887664132096d3c7fb2263485c297e73adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Fernandez=20Pr=C3=ADncipe?= <xplcts@hotmail.com>
Date: Sat, 19 Sep 2020 12:24:21 +0000
Subject: [PATCH 087/247] Translated using Weblate (Galician) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/gl/

---
 Emby.Server.Implementations/Localization/Core/gl.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/gl.json b/Emby.Server.Implementations/Localization/Core/gl.json
index 94034962df..faee2519a1 100644
--- a/Emby.Server.Implementations/Localization/Core/gl.json
+++ b/Emby.Server.Implementations/Localization/Core/gl.json
@@ -1,3 +1,11 @@
 {
-    "Albums": "Álbumes"
+    "Albums": "Álbumes",
+    "Collections": "Colecións",
+    "ChapterNameValue": "Capítulos {0}",
+    "Channels": "Canles",
+    "CameraImageUploadedFrom": "Cargouse unha nova imaxe da cámara desde {0}",
+    "Books": "Libros",
+    "AuthenticationSucceededWithUserName": "{0} autenticouse correctamente",
+    "Artists": "Artistas",
+    "Application": "Aplicativo"
 }

From d39b70de324316ff1f48e2795aca45db3488ff0d Mon Sep 17 00:00:00 2001
From: jeremletrol81 <jeremletrol@msn.com>
Date: Sun, 20 Sep 2020 10:50:50 +0000
Subject: [PATCH 088/247] Translated using Weblate (French) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fr/

---
 Emby.Server.Implementations/Localization/Core/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/fr.json b/Emby.Server.Implementations/Localization/Core/fr.json
index 47ebe12540..7fc9968219 100644
--- a/Emby.Server.Implementations/Localization/Core/fr.json
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -107,7 +107,7 @@
     "TaskCleanLogsDescription": "Supprime les journaux de plus de {0} jours.",
     "TaskCleanLogs": "Nettoyer le répertoire des journaux",
     "TaskRefreshLibraryDescription": "Scanne toute les bibliothèques pour trouver les nouveaux fichiers et rafraîchit les métadonnées.",
-    "TaskRefreshLibrary": "Scanner toute les Bibliothèques",
+    "TaskRefreshLibrary": "Scanner toutes les Bibliothèques",
     "TaskRefreshChapterImagesDescription": "Crée des images de miniature pour les vidéos ayant des chapitres.",
     "TaskRefreshChapterImages": "Extraire les images de chapitre",
     "TaskCleanCacheDescription": "Supprime les fichiers de cache dont le système n'a plus besoin.",

From 9cb37ae9c217146d94949a31df86ec3c85687ad8 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 20 Sep 2020 12:44:10 +0100
Subject: [PATCH 089/247] Update Jellyfin.Api/Controllers/SessionController.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 1d7dc7c8ae..3720e821f7 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -166,7 +166,7 @@ namespace Jellyfin.Api.Controllers
         {
             var playRequest = new PlayRequest
             {
-                ItemIds = itemIds.Split(',').Select(p => Guid.Parse(p)).ToArray(),
+                ItemIds = RequestHelpers.GetGuids(itemIds),
                 StartPositionTicks = startPositionTicks,
                 PlayCommand = playCommand
             };

From 228b33a23bfe21c3601933ad3168a2e590f4f430 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 20 Sep 2020 14:02:41 +0200
Subject: [PATCH 090/247] Minor improvements

---
 .../AudioBook/AudioBookFilePathParser.cs      |  9 ++----
 .../AudioBookFilePathParserResult.cs          |  3 +-
 .../Extensions/StringExtensions.cs            |  6 +---
 .../Library/NameExtensions.cs                 |  3 +-
 .../AudioBook/AudioBookFileInfoTests.cs       | 30 +++++++++++++++++++
 .../Jellyfin.Naming.Tests/Video/ExtraTests.cs | 16 +++++-----
 .../Library/PathExtensionsTests.cs            |  1 +
 7 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 tests/Jellyfin.Naming.Tests/AudioBook/AudioBookFileInfoTests.cs

diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
index eb9393b0bd..14edd64926 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
@@ -1,6 +1,6 @@
+#nullable enable
 #pragma warning disable CS1591
 
-using System;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -19,12 +19,7 @@ namespace Emby.Naming.AudioBook
 
         public AudioBookFilePathParserResult Parse(string path)
         {
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
-            var result = new AudioBookFilePathParserResult();
+            AudioBookFilePathParserResult result = default;
             var fileName = Path.GetFileNameWithoutExtension(path);
             foreach (var expression in _options.AudioBookPartsExpressions)
             {
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs b/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
index e28a58db78..7bfc4479d2 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
@@ -1,8 +1,9 @@
+#nullable enable
 #pragma warning disable CS1591
 
 namespace Emby.Naming.AudioBook
 {
-    public class AudioBookFilePathParserResult
+    public struct AudioBookFilePathParserResult
     {
         public int? PartNumber { get; set; }
 
diff --git a/MediaBrowser.Controller/Extensions/StringExtensions.cs b/MediaBrowser.Controller/Extensions/StringExtensions.cs
index 3cc1f328a9..182c8ef658 100644
--- a/MediaBrowser.Controller/Extensions/StringExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/StringExtensions.cs
@@ -1,3 +1,4 @@
+#nullable enable
 #pragma warning disable CS1591
 
 using System;
@@ -15,11 +16,6 @@ namespace MediaBrowser.Controller.Extensions
     {
         public static string RemoveDiacritics(this string text)
         {
-            if (text == null)
-            {
-                throw new ArgumentNullException(nameof(text));
-            }
-
             var chars = Normalize(text, NormalizationForm.FormD)
                 .Where(ch => CharUnicodeInfo.GetUnicodeCategory(ch) != UnicodeCategory.NonSpacingMark);
 
diff --git a/MediaBrowser.Controller/Library/NameExtensions.cs b/MediaBrowser.Controller/Library/NameExtensions.cs
index 21f33ad190..1c90bb4e02 100644
--- a/MediaBrowser.Controller/Library/NameExtensions.cs
+++ b/MediaBrowser.Controller/Library/NameExtensions.cs
@@ -1,3 +1,4 @@
+#nullable enable
 #pragma warning disable CS1591
 
 using System;
@@ -9,7 +10,7 @@ namespace MediaBrowser.Controller.Library
 {
     public static class NameExtensions
     {
-        private static string RemoveDiacritics(string name)
+        private static string RemoveDiacritics(string? name)
         {
             if (name == null)
             {
diff --git a/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookFileInfoTests.cs b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookFileInfoTests.cs
new file mode 100644
index 0000000000..a214bc57c4
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/AudioBook/AudioBookFileInfoTests.cs
@@ -0,0 +1,30 @@
+using Emby.Naming.AudioBook;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.AudioBook
+{
+    public class AudioBookFileInfoTests
+    {
+        [Fact]
+        public void CompareTo_Same_Success()
+        {
+            var info = new AudioBookFileInfo();
+            Assert.Equal(0, info.CompareTo(info));
+        }
+
+        [Fact]
+        public void CompareTo_Null_Success()
+        {
+            var info = new AudioBookFileInfo();
+            Assert.Equal(1, info.CompareTo(null));
+        }
+
+        [Fact]
+        public void CompareTo_Empty_Success()
+        {
+            var info1 = new AudioBookFileInfo();
+            var info2 = new AudioBookFileInfo();
+            Assert.Equal(0, info1.CompareTo(info2));
+        }
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
index a2722a1753..8dfb8f8591 100644
--- a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
@@ -44,14 +44,14 @@ namespace Jellyfin.Naming.Tests.Video
         }
 
         [Theory]
-        [InlineData(ExtraType.BehindTheScenes, "behind the scenes" )]
-        [InlineData(ExtraType.DeletedScene, "deleted scenes" )]
-        [InlineData(ExtraType.Interview, "interviews" )]
-        [InlineData(ExtraType.Scene, "scenes" )]
-        [InlineData(ExtraType.Sample, "samples" )]
-        [InlineData(ExtraType.Clip, "shorts" )]
-        [InlineData(ExtraType.Clip, "featurettes" )]
-        [InlineData(ExtraType.Unknown, "extras" )]
+        [InlineData(ExtraType.BehindTheScenes, "behind the scenes")]
+        [InlineData(ExtraType.DeletedScene, "deleted scenes")]
+        [InlineData(ExtraType.Interview, "interviews")]
+        [InlineData(ExtraType.Scene, "scenes")]
+        [InlineData(ExtraType.Sample, "samples")]
+        [InlineData(ExtraType.Clip, "shorts")]
+        [InlineData(ExtraType.Clip, "featurettes")]
+        [InlineData(ExtraType.Unknown, "extras")]
         public void TestDirectories(ExtraType type, string dirName)
         {
             Test(dirName + "/300.mp4", type, _videoOptions);
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
index c771f5f4ae..6d768af890 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
@@ -10,6 +10,7 @@ namespace Jellyfin.Server.Implementations.Tests.Library
         [InlineData("Superman: Red Son [imdbid=tt10985510]", "imdbid", "tt10985510")]
         [InlineData("Superman: Red Son - tt10985510", "imdbid", "tt10985510")]
         [InlineData("Superman: Red Son", "imdbid", null)]
+        [InlineData("Superman: Red Son", "something", null)]
         public void GetAttributeValue_ValidArgs_Correct(string input, string attribute, string? expectedResult)
         {
             Assert.Equal(expectedResult, PathExtensions.GetAttributeValue(input, attribute));

From d6f01d6503c2846dade8314a3d8d624140b03f8e Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 20 Sep 2020 14:35:46 +0100
Subject: [PATCH 091/247] Update DynamicHlsController.cs

---
 Jellyfin.Api/Controllers/DynamicHlsController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 31e09a7e26..7cf96dd341 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1453,7 +1453,7 @@ namespace Jellyfin.Api.Controllers
 
             var args = "-codec:v:0 " + codec;
 
-            // if (state.EnableMpegtsM2TsMode)
+            // if  (state.EnableMpegtsM2TsMode)
             // {
             //     args += " -mpegts_m2ts_mode 1";
             // }

From f71812abc07bfe3784c4779d6e4fa8d87be7aa94 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 20 Sep 2020 14:36:46 +0100
Subject: [PATCH 092/247] Update SessionController.cs

---
 Jellyfin.Api/Controllers/SessionController.cs | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 3720e821f7..a7bddc1715 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -1,5 +1,3 @@
-#pragma warning disable CA1801
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -184,8 +182,9 @@ namespace Jellyfin.Api.Controllers
         /// Issues a playstate command to a client.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The <see cref="PlayCommand"/>.</param>
-        /// <param name="playstateRequest">The <see cref="PlaystateRequest"/>.</param>
+        /// <param name="command">The <see cref="PlaystateCommand"/>.</param>
+        /// <param name="seekPositionTicks">The optional position ticks.</param>
+        /// <param name="controllingUserId">The optional controlling user id.</param>
         /// <response code="204">Playstate command sent to session.</response>
         /// <returns>A <see cref="NoContentResult"/>.</returns>
         [HttpPost("Sessions/{sessionId}/Playing/{command}")]
@@ -193,13 +192,19 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SendPlaystateCommand(
             [FromRoute, Required] string sessionId,
-            [FromRoute, Required] PlayCommand command,
-            [FromQuery] PlaystateRequest playstateRequest)
+            [FromRoute, Required] PlaystateCommand command,
+            [FromQuery] long? seekPositionTicks,
+            [FromQuery] string? controllingUserId)
         {
             _sessionManager.SendPlaystateCommand(
                 RequestHelpers.GetSession(_sessionManager, _authContext, Request).Id,
                 sessionId,
-                playstateRequest,
+                new PlaystateRequest()
+                {
+                    Command = command,
+                    ControllingUserId = controllingUserId,
+                    SeekPositionTicks = seekPositionTicks,
+                },
                 CancellationToken.None);
 
             return NoContent();
@@ -436,9 +441,9 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult ReportViewing(
             [FromQuery] string? sessionId,
-            [FromQuery] string? itemId)
+            [FromQuery, Required] string? itemId)
         {
-            string session = RequestHelpers.GetSession(_sessionManager, _authContext, Request).Id;
+            string session = sessionId ?? RequestHelpers.GetSession(_sessionManager, _authContext, Request).Id;
 
             _sessionManager.ReportNowViewingItem(session, itemId);
             return NoContent();

From 983aa05e76a7045289e9a7fb3e0c5a3c90ef8365 Mon Sep 17 00:00:00 2001
From: josteinh <jostein+github@hove-henriksen.no>
Date: Mon, 21 Sep 2020 08:07:42 +0000
Subject: [PATCH 093/247] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)=20Translation:=20Jellyfin/Jellyfin=20Translat?=
 =?UTF-8?q?e-URL:=20https://translate.jellyfin.org/projects/jellyfin/jelly?=
 =?UTF-8?q?fin-core/nb=5FNO/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Emby.Server.Implementations/Localization/Core/nb.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json
index a97c2e17ad..07a5991211 100644
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -50,7 +50,7 @@
     "NotificationOptionAudioPlayback": "Lydavspilling startet",
     "NotificationOptionAudioPlaybackStopped": "Lydavspilling stoppet",
     "NotificationOptionCameraImageUploaded": "Kamerabilde lastet opp",
-    "NotificationOptionInstallationFailed": "Installasjonsfeil",
+    "NotificationOptionInstallationFailed": "Installasjonen feilet",
     "NotificationOptionNewLibraryContent": "Nytt innhold lagt til",
     "NotificationOptionPluginError": "Pluginfeil",
     "NotificationOptionPluginInstalled": "Plugin installert",

From 1f2e227610cd2eaf9abd38ee5b2310ed3e878421 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Mon, 21 Sep 2020 10:19:32 +0000
Subject: [PATCH 094/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index c3da35acbb..c9201a4a60 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -1,6 +1,6 @@
 {
     "Collections": "Bộ Sưu Tập",
-    "Favorites": "Sở Thích",
+    "Favorites": "Yêu Thích",
     "Folders": "Thư Mục",
     "Genres": "Thể Loại",
     "HeaderAlbumArtists": "Bộ Sưu Tập Nghệ sĩ",

From 849835b486755c5e8f0ae0fb563937b3c532aece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=A5=EA=B1=B4?= <jghaha114@gmail.com>
Date: Mon, 21 Sep 2020 11:10:24 +0000
Subject: [PATCH 095/247] Translated using Weblate (Korean) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/

---
 Emby.Server.Implementations/Localization/Core/ko.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json
index 9e3ecd5a8e..a33953c273 100644
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -84,8 +84,8 @@
     "UserDeletedWithName": "사용자 {0} 삭제됨",
     "UserDownloadingItemWithValues": "{0}이(가) {1}을 다운로드 중입니다",
     "UserLockedOutWithName": "유저 {0} 은(는) 잠금처리 되었습니다",
-    "UserOfflineFromDevice": "{1}로부터 {0}의 연결이 끊겼습니다",
-    "UserOnlineFromDevice": "{0}은 {1}에서 온라인 상태입니다",
+    "UserOfflineFromDevice": "{1}에서 {0}의 연결이 끊킴",
+    "UserOnlineFromDevice": "{0}이 {1}으로 접속",
     "UserPasswordChangedWithName": "사용자 {0}의 비밀번호가 변경되었습니다",
     "UserPolicyUpdatedWithName": "{0}의 사용자 정책이 업데이트되었습니다",
     "UserStartedPlayingItemWithValues": "{2}에서 {0}이 {1} 재생 중",

From 7da03d67a74f37734bf26e1b3dbe5a8672c328f9 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Mon, 21 Sep 2020 10:49:03 +0000
Subject: [PATCH 096/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index c9201a4a60..57fe6c7a20 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -8,7 +8,7 @@
     "HeaderLiveTV": "TV Trực Tiếp",
     "Movies": "Phim",
     "Photos": "Ảnh",
-    "Playlists": "Danh Sách Chơi",
+    "Playlists": "Danh sách phát",
     "Shows": "Các Chương Trình",
     "Songs": "Các Bài Hát",
     "Sync": "Đồng Bộ",

From 3459655bb401595f62c21513964876b2f4549fed Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Mon, 21 Sep 2020 16:53:00 +0200
Subject: [PATCH 097/247] Use GeneralCommandType enum in GeneralCommand name

---
 CONTRIBUTORS.md                               |  1 +
 Emby.Dlna/PlayTo/PlayToController.cs          | 85 +++++++++----------
 .../Session/SessionManager.cs                 |  4 +-
 Jellyfin.Api/Controllers/SessionController.cs | 14 +--
 MediaBrowser.Model/Session/GeneralCommand.cs  |  2 +-
 5 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f1fe65064b..efd83012e9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -135,6 +135,7 @@
  - [YouKnowBlom](https://github.com/YouKnowBlom)
  - [KristupasSavickas](https://github.com/KristupasSavickas)
  - [Pusta](https://github.com/pusta)
+ - [nielsvanvelzen](https://github.com/nielsvanvelzen)
 
 # Emby Contributors
 
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 328759c5bc..460ac2d8d1 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -669,62 +669,57 @@ namespace Emby.Dlna.PlayTo
 
         private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            if (Enum.TryParse(command.Name, true, out GeneralCommandType commandType))
+            switch (command.Name)
             {
-                switch (commandType)
-                {
-                    case GeneralCommandType.VolumeDown:
-                        return _device.VolumeDown(cancellationToken);
-                    case GeneralCommandType.VolumeUp:
-                        return _device.VolumeUp(cancellationToken);
-                    case GeneralCommandType.Mute:
-                        return _device.Mute(cancellationToken);
-                    case GeneralCommandType.Unmute:
-                        return _device.Unmute(cancellationToken);
-                    case GeneralCommandType.ToggleMute:
-                        return _device.ToggleMute(cancellationToken);
-                    case GeneralCommandType.SetAudioStreamIndex:
-                        if (command.Arguments.TryGetValue("Index", out string index))
+                case GeneralCommandType.VolumeDown:
+                    return _device.VolumeDown(cancellationToken);
+                case GeneralCommandType.VolumeUp:
+                    return _device.VolumeUp(cancellationToken);
+                case GeneralCommandType.Mute:
+                    return _device.Mute(cancellationToken);
+                case GeneralCommandType.Unmute:
+                    return _device.Unmute(cancellationToken);
+                case GeneralCommandType.ToggleMute:
+                    return _device.ToggleMute(cancellationToken);
+                case GeneralCommandType.SetAudioStreamIndex:
+                    if (command.Arguments.TryGetValue("Index", out string index))
+                    {
+                        if (int.TryParse(index, NumberStyles.Integer, _usCulture, out var val))
                         {
-                            if (int.TryParse(index, NumberStyles.Integer, _usCulture, out var val))
-                            {
-                                return SetAudioStreamIndex(val);
-                            }
-
-                            throw new ArgumentException("Unsupported SetAudioStreamIndex value supplied.");
+                            return SetAudioStreamIndex(val);
                         }
 
-                        throw new ArgumentException("SetAudioStreamIndex argument cannot be null");
-                    case GeneralCommandType.SetSubtitleStreamIndex:
-                        if (command.Arguments.TryGetValue("Index", out index))
-                        {
-                            if (int.TryParse(index, NumberStyles.Integer, _usCulture, out var val))
-                            {
-                                return SetSubtitleStreamIndex(val);
-                            }
+                        throw new ArgumentException("Unsupported SetAudioStreamIndex value supplied.");
+                    }
 
-                            throw new ArgumentException("Unsupported SetSubtitleStreamIndex value supplied.");
+                    throw new ArgumentException("SetAudioStreamIndex argument cannot be null");
+                case GeneralCommandType.SetSubtitleStreamIndex:
+                    if (command.Arguments.TryGetValue("Index", out index))
+                    {
+                        if (int.TryParse(index, NumberStyles.Integer, _usCulture, out var val))
+                        {
+                            return SetSubtitleStreamIndex(val);
                         }
 
-                        throw new ArgumentException("SetSubtitleStreamIndex argument cannot be null");
-                    case GeneralCommandType.SetVolume:
-                        if (command.Arguments.TryGetValue("Volume", out string vol))
-                        {
-                            if (int.TryParse(vol, NumberStyles.Integer, _usCulture, out var volume))
-                            {
-                                return _device.SetVolume(volume, cancellationToken);
-                            }
+                        throw new ArgumentException("Unsupported SetSubtitleStreamIndex value supplied.");
+                    }
 
-                            throw new ArgumentException("Unsupported volume value supplied.");
+                    throw new ArgumentException("SetSubtitleStreamIndex argument cannot be null");
+                case GeneralCommandType.SetVolume:
+                    if (command.Arguments.TryGetValue("Volume", out string vol))
+                    {
+                        if (int.TryParse(vol, NumberStyles.Integer, _usCulture, out var volume))
+                        {
+                            return _device.SetVolume(volume, cancellationToken);
                         }
 
-                        throw new ArgumentException("Volume argument cannot be null");
-                    default:
-                        return Task.CompletedTask;
-                }
+                        throw new ArgumentException("Unsupported volume value supplied.");
+                    }
+
+                    throw new ArgumentException("Volume argument cannot be null");
+                default:
+                    return Task.CompletedTask;
             }
-
-            return Task.CompletedTask;
         }
 
         private async Task SetAudioStreamIndex(int? newIndex)
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index ca8e0e29bb..e42d478533 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1037,7 +1037,7 @@ namespace Emby.Server.Implementations.Session
 
             var generalCommand = new GeneralCommand
             {
-                Name = GeneralCommandType.DisplayMessage.ToString()
+                Name = GeneralCommandType.DisplayMessage
             };
 
             generalCommand.Arguments["Header"] = command.Header;
@@ -1268,7 +1268,7 @@ namespace Emby.Server.Implementations.Session
         {
             var generalCommand = new GeneralCommand
             {
-                Name = GeneralCommandType.DisplayContent.ToString(),
+                Name = GeneralCommandType.DisplayContent,
                 Arguments =
                 {
                     ["ItemId"] = command.ItemId,
diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index b00675d679..5a2a3cdc09 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -217,16 +217,15 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string sessionId,
             [FromRoute, Required] string command)
         {
-            var name = command;
-            if (Enum.TryParse(name, true, out GeneralCommandType commandType))
+            if (!Enum.TryParse(command, true, out GeneralCommandType commandType))
             {
-                name = commandType.ToString();
+                return BadRequest();
             }
 
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authContext, Request);
             var generalCommand = new GeneralCommand
             {
-                Name = name,
+                Name = commandType,
                 ControllingUserId = currentSession.UserId
             };
 
@@ -249,11 +248,16 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string sessionId,
             [FromRoute, Required] string command)
         {
+            if (!Enum.TryParse(command, true, out GeneralCommandType commandType))
+            {
+                return BadRequest();
+            }
+
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authContext, Request);
 
             var generalCommand = new GeneralCommand
             {
-                Name = command,
+                Name = commandType,
                 ControllingUserId = currentSession.UserId
             };
 
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 9794bd2929..77bb6bcf77 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Session
 {
     public class GeneralCommand
     {
-        public string Name { get; set; }
+        public GeneralCommandType Name { get; set; }
 
         public Guid ControllingUserId { get; set; }
 

From 891c538f818be7a339fcdfacaf34adb4a329d514 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Mon, 21 Sep 2020 17:49:45 +0200
Subject: [PATCH 098/247] Use GeneralCommandType in SessionController
 parameters

---
 Jellyfin.Api/Controllers/SessionController.cs | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 5a2a3cdc09..c257a46dcf 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -215,17 +215,12 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SendSystemCommand(
             [FromRoute, Required] string sessionId,
-            [FromRoute, Required] string command)
+            [FromRoute, Required] GeneralCommandType command)
         {
-            if (!Enum.TryParse(command, true, out GeneralCommandType commandType))
-            {
-                return BadRequest();
-            }
-
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authContext, Request);
             var generalCommand = new GeneralCommand
             {
-                Name = commandType,
+                Name = command,
                 ControllingUserId = currentSession.UserId
             };
 
@@ -246,18 +241,13 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public ActionResult SendGeneralCommand(
             [FromRoute, Required] string sessionId,
-            [FromRoute, Required] string command)
+            [FromRoute, Required] GeneralCommandType command)
         {
-            if (!Enum.TryParse(command, true, out GeneralCommandType commandType))
-            {
-                return BadRequest();
-            }
-
             var currentSession = RequestHelpers.GetSession(_sessionManager, _authContext, Request);
 
             var generalCommand = new GeneralCommand
             {
-                Name = commandType,
+                Name = command,
                 ControllingUserId = currentSession.UserId
             };
 

From 03cbf5cfbfeae399e6e91e1271e328d6d7c096df Mon Sep 17 00:00:00 2001
From: Nelson Tham <nelsontham@gmail.com>
Date: Mon, 21 Sep 2020 19:02:54 +0000
Subject: [PATCH 099/247] Translated using Weblate (Chinese (Traditional))
 Translation: Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant/

---
 Emby.Server.Implementations/Localization/Core/zh-TW.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/zh-TW.json b/Emby.Server.Implementations/Localization/Core/zh-TW.json
index 01108fe84d..7b6540c3e3 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-TW.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -96,7 +96,7 @@
     "TaskDownloadMissingSubtitles": "下載遺失的字幕",
     "TaskRefreshChannels": "重新整理頻道",
     "TaskUpdatePlugins": "更新外掛",
-    "TaskRefreshPeople": "重新整理人員",
+    "TaskRefreshPeople": "刷新用戶",
     "TaskCleanLogsDescription": "刪除超過 {0} 天的舊紀錄檔。",
     "TaskCleanLogs": "清空紀錄資料夾",
     "TaskRefreshLibraryDescription": "重新掃描媒體庫的新檔案並更新描述資料。",

From 5a74710df313a8d32225410af520b4af6ee99121 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Mon, 21 Sep 2020 17:00:50 -0400
Subject: [PATCH 100/247] Optimize images Used: - `oxipng --zopfli --opt max
 --strip all` - `jpegoptim --all-progressive --strip-all`

---
 Emby.Dlna/Images/logo240.jpg  | Bin 11520 -> 11483 bytes
 Emby.Dlna/Images/people48.png | Bin 286 -> 278 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Emby.Dlna/Images/logo240.jpg b/Emby.Dlna/Images/logo240.jpg
index da1cb5e071b7b4407803f549f1be3e0bf64f95cc..78a27f1b544ab929cdde18d4b7744019cf0267d3 100644
GIT binary patch
literal 11483
zcmb8VWmp`|5-7ZjyF+kycXx;2uECvP!5sn#9^BoX0KuK$?(Xg`!S9myJ?DJi^V~nT
zcXp<yt4n*Tx~pg27Tz`hD6*0=k^mqO41fyy0p6AYVgPWk_ws%Q2Neh?i1z{m1qBHO
z3j+rS3j+%ahk%R#2af~~3yX+~h=h!Sf{Fr%fQF8Sf)1*qyb}SwV}e7#fDlpOVc|io
z|BvOZ8-NM}xBy&$15p8Bs6cR3;9Cy>9{>b^!~z2TS0JH*P#{KNASfOX2ml9y%KxB1
za7YL+DCoB(00IaL3<Vqo003SS77_oi%ikLQ^-=HnH2=IF&I;<ze_-HkXT!e@4yc%Z
zmcmuais4b^Z4dkl11@B_)sIh(=^I=3%&0?aGGK;g&0qfq7<)YT$k0+&!eOLhEl*RX
zw6kB}*d+W96s-Sj{?|?2w6X?e{!FTDoVsR`giFT8KS0>y=BkXW!l%?Y4NPb6iPV-k
z4b9M^NOk0|dr1C&yFf45k7gC8wa-kcmws`a#^K>+^oh!-s$}7yET*N)xnTJ7Pe1zh
zmoy<My#fxKn=57a#uXOuRP*cA8o%6z(y-F!DwlS%&Ubnc6-kfaHb)*l?(+Hu>`Ly*
z$}V$&xH?}S=*;ovuts$yBA!(o&7bdGKbTideO~pkDlW|&>YHr*(+RLAc(p^!^p=+?
zQrxOZ?w)+_g;<u?d@=vXK9gD}Xoo9BgpK5<A_X1&!S0-Kc5ys3zcjjYc8-Vlz3Y(u
zX;w*Ed(Uhy#={!`8H%>~yZy}Ca>JHQ?$5F#cUaxl^$w|&L6BmMeriHvb{ilZy#7xa
zy(P`5aq9M6Ng8{50WP1NKd(BZ)*;Cr+A0d`@IGrW7J6FAtL-6;rF5-<2Kz2c<n%?a
zpeD81*YbJ}3tD$Pruk0W$#yxkgoCow9(^vU*YM==`ar1g_o?<+YOd9-@N@r+cRq;M
zx_LoINux??>Bvgy_E&zVkw^FgUQ^o&4$AylJbho^hp{p07!zv?9X#$`t<+L{h8HqE
zC6Hb|&<(e&b5HUDLhK&f(9nVW;mD%Px|(b610Gh*KFdSEac3{Rf4e`CrF>1$;r%By
z=dkAMgI`T20Nm+lqM4&%T1MR}D@Dt~0y%G@Lu{JtvsDQPrm?j=OM=Js`KZlv;Mja$
z_3b6Piglr&*HIlIqA=h?W&hMk+lRucU_tk;t{;~hpY=bTy|g&87v|5XhZdnLtCM{#
zDZ9K0g}1&Tnt67cFO{u}5?qqndz}DKRvg|ytxpx^R(wqR7TZ4vHat}`Is+0{J+y><
zQ^mTx#_QO&0)??E_u+F@3k8RfI^@;57wY%|pw8K~{L>4@Y-nlD(BLF@6X4t{<6cB)
zdP{Vu=|wH|@p4PBF<}2b$Nb*e<__w*;D?>Pcd2#Htp1J<qCx1bq3Mmn{*1H^ZO`of
z3cXfX+52+=fT(+JcmvFOQ({sUAC+J45BerTysUDq%}*4T%S(K6>*|lH>ipZ2oFQ)_
zOZ(x<T3$j;XxKL#dN`l{(<z^(qAFaRiuGL6gAM+gynR~#U$=df>|e|>J9%CkT#QWx
zfy<cNyW0mIbL^~b?N{59K}}Y4@&cBnNMX6wmqgqBsyz-;ncQE;$^Y!%8`!T3JT>jw
z@1!4&@7F}o$jgA7TO%~-#zkoSWuo5swjAl~*UURrnjX*v<lO1<5{l}Wl(FUV@0W6U
zn&J`;W9tbg-_+91ryMG?293V_-JKb=)arjm=&zyWW%A2FgDNjm1{Wu5Ew7~xJGv_G
zy?)>r?-~$ib=YEmQfqc7XJ9Y`;-P^F;sFwaGB;h`s^IVAVF0)J@aWPmz#t`Luf4h0
zEerq-(%7iDd7LlqH=VVQH$S}04|2RbRv{BH@hk6t9WLAQ^rin%y0GMFTzvHBhwxvc
z{(C|OMO11O01zAk2=Tv|3jqcW2>?Q&V4xB+3!|Z9Vv(>Yk%Pi33@GXXA;I1N42k+A
zoj+eoxR4K$lAYZIq659}x3(n1ZB$~&hFA^l{oeqU+-LDOa;hvQcONC#sCf{0>DH?5
zwVpZhlFtT6DoDp~kG3w}0A|lP;!<-}3b-sP!8tIW@u)Y!q>Era*KeU5QIe@+8{`Jj
z^!7;RG7F53abbU7cTdvt*~|z^7f<D4!A)VF3+C()!w5h28If(kVjF9GYPOokb|O@7
z5@|^2eYW3^06I~!FX7mWM^8k^5T3;7$Mm=0EA_DJ;=1Gu&P3BiF^xv{If$(((hd8y
z;3RByw8nC!5+xBt?q{@ysa|fLCK6KEGhYm^3D7(M?xQ7N`PT_5Tt49nPG%qWqYOJ)
zREm$n(e(-8VE34yIY!9*RH}k{%|q66jBNa_J2T>wFVfcReyMdP<26j)PQAv5{^znT
zM*O;OjfUb%^2+^;CKH1~ftDGgKR9>LmL-&=J8O;&XN0bnGGa3!C&WRsm!hVBCYvT2
zR;C$qqnGUU>OM)@JE<^LcT6hCAL1k$77dJdY4M9z{P$k3A>r+$bsK%nFsR9mgBm65
z@z$D8a}-2(0;`Duw{3-lTH|oC@OUbnOTu_dcO9;b(6nM69;@j2g-2=*p%9FRC{qry
zb<;k^R4xivO75`)3m5#<t27#-rtnRDHn<<+Xf_5Rw`HyQ%Yuy6&2+V4^ajor44ba_
z1|zom>=9%=|FDr4RbJ*ku%sm-2l|;467^>6_Pl(zWs?C;*5cYzhv-wflBhpeHb4K;
zr*)-Z-%~~jBV&0*V2{gKBUhYrz1kF%Kbt#tzqG~HO>#SryCKzoG`%P0VrJ-!97;He
zv69O=kg6|=I!Pl6rzz*ith)Osf=DB=T@$Dho4-B~U!sXl7*Cs<-4}5>ym%n_bH^FH
zX>!4LY`Yq1>JsKw<zi;`VvF{V$L(WKf^QCm#_#bmqwy)`85I`nooTHbF|}y~7Q2%+
zqDvbj&w2Ev;nljJ8RxH)`TcT`<XOg|hSWO)gg2phb>}vru|x1;dti*oso|vM`K4=t
z@$uS+#r4z?jcSt~_$lgMYxfr<{dg^3SSwUmL!GDCz)xjHk~BtA%gllEr<b!&&YykP
z@id3Gj~@J8yn9PEjCYxs1aDeX^__QG^M2J;48H+FL4L`H3R=tnL9Pe^4Fv`M?y#VH
za0paLG<0GT77=9>3}#^{Oj1@+qX05CF{PLsaus98>dUUl&A+Y+S|kYpUo~|aT+91^
zw=@ilG$XceGiX$fj~e&d&h3_W6%}T-5V9DLER@BcC*?_5?9qHQZD26ZQq<?*<TvgO
z$1=-tqFh~P%AI;@^QgE_uKwFr#Wn13%J>GT?>NMw*LrVbxJs4hD;{i!KP#!mqSy9L
zD2mu;*aQJPC=oM43p=f<uO2|utl5%Ve&E<}x)~OE(8Z<FYt^RN$8M(DZ|mNKW6{r;
zvuMy+xGit;G=T1U{eEBJ+9KtVhyump!?8@8#8Oh6cs`HZCDLn;{wjDFeHHwwIMF}y
z2gE<Mb>(iCpU)M9)|C{yEQBXgbiA{ALE0P6q227VaOp)TkX}Rw60C4|wrKy7-#iJr
zWs7bfi@vU&%Umx?_luX9M+1F>@$DXG;#oMB;pk-hs{#7AjU$8NKd2z`D;>Z2Fsf*<
z=+~=D3)gKyY$hy@RAVj$Q8-;G5hSy4q^r$8##ga1n4hzq_Uk`wfpk?_zW4h4$;8|g
zS2qDfa(rUo6Vl6m*Jd)$`HXiiNU|n34`lm@r@~2){otKiy4IJg`d4Q_GIM{*EBR6Q
zCkwpK>e8771EhNgg+~g=YCetQ-0#-LvO4cryjv?c9vZ20Tr9()pE?p)X7Siw-dylZ
z@yG(B*BZ4`>{|GTG!}iq1H<UTR&xC^NCE9`7Xfelsz@(SdVPE<5NhqOLEnNjFH1KN
z+4r#=Wq7!J`m%LwV#Tn!@-9o!>MhhOvYXAv@QV0yt!nei=U>b7)zW|Epx6Gr-UcGw
ztbKp`ZWL>QV@178pG=$|)=eNqI1<;MT)CF)QA7IbZz7ovd3lIv&YE!aksnfi5IEv#
zR`)qx8?kyygk$*-&YXG~dOtmJmrV7kfSwDwQI`jT&%CK#S@9sAamr^)VY@dcRx~ps
zpz#Q2{A{t~qRFyZmj#le&msNwGOwUR@$huB?n&bpNQsenCVZ>Qc)rD~Fsq*r=daWH
zJvBCh<H0^4p|E^DjE;s=GD-OzzX3k25k1vCZ@ufTZCRV@VxgCLt$psC`4q)3MwIWK
zq4=Aj*MN4|(RNLQ)saA=17k4pLGY;+#G*G`Fx=o-{`fWPIdc`V{rBIdf4$+q7vtV6
z36{#-2k)=;M{j`Z<#4*Nm7YS+-HU&0{jbUYb4ew{EZIUn87({BWyi($7DE0=^m1pD
zxpVv@Vjue-d;f<^t@+q&@}Ez&T&sPrZR^*}FF2!q>v}@1(+&iLS#3O7;~>>gIL`!$
zXz)$&@gDl+9{XkNwGL`L`$dvwejp7!#2vM^=RX#a{RzG0$if>h9_M=lSUT_%x|+Fj
zMqhHhm~s0iW?~QOXk^R^#l8VRp@<0;018A<kf3z$-@FTS3jl>86i_T;!6ac8QDzlZ
zAte(v!ccM)`x}11{)V3l8d`Rgm86mG9bYJn*f_DX=)lcxl0=n>U9S;}%`tr2`f}QP
zSQ+i?Z`z2IsRoApsiLt;4q5i}eOe{!dNb{o#p}zmYz7tjIE$V>Jx`K4qw2(PPPkZG
zy0_S3p<kw)QDAaHzkP%+ssU>aVx3d5$~87*rREBzE}!XEQ?gD@OhJYtxRGPa408*l
zw)BZeGq~X;a%WAw4@S#V^;A=_Ce`0~v{@H_!g$JCU|%!-*@=Pip+p26^}8Np8S2z<
zL4q+#Ff@9|r~F_9N<zz;R;nu6IUQ>^UdpvT2gJHTp~P~yg@X(e4(xB+74&n)52v|S
zC;1b0&J+~pp~2+YlRD(<V-iT);@dckP7AkM_B0r+sc^|I-AC1*f<9mdGY`|4v7=nm
zc(617!kP`%{CQ~Ro<mNpX23q?<$OL9Z;w_@xJ0F2w2VuEJtVKN_t4}$vxOIl<#mfA
zC6V2ya~b(V8t&>_+OPuNTz1eFa{*?$<OAmy%#aiIvFgNfF%wTLT_vS&bNJFq?MCT$
zLxy2a0yvzPbf~AfE@K|X7jTgf><d=hl1Vy9+4<c8GCA#IUYW|1mbC%y{l4K0yLpJm
zN}`U~Dq)fGR}5-<1g>AX6%5<psQ;m<)ozx47v_l;xvlSQnfc}7!#N^Xynlv0S88C$
z(i6v;L|*QM1<i_>Nu_oxOoye5M>uV}Jof4vfR}A_x7E+BW=}Q1foGk6%!X=Urkf25
zDzt9HF4I~24Ui-`O&FIu{)HvgeUg3dV*#&ejId^|hs!4-Ts%j4+(J}K?;c8zI54ZY
z2dOLE2bfne0}`muF%KeHrlO}p{@)2y`_XQ+ql_H##=_N0{r3_l14wv@xYMZ?hRVPP
zd5P?KawE|W`!=Qyx@(ZDjVKhz5!ots+jG3bJmLx-Oxwm=8I@;T%RkS8wTP)8^DM<M
zP=@+?WpLI|=T|<U-k_J~(B8tZ+Lryo6KL;4Oxslct$r1SyB~wku};cu(=P7N&mXdB
z{UBV^?;>j3*AfRCV<Z$o0V|bnQ}=xd`rbSAQTpDsxqV6XsjUcJwuhu>;%sft_;Zuv
ztvxz&sge6^K~n?jQ;=f*V-TfLfvw?}JMw^5M#mt#Vy8Lb8@S)~;b%@2LSxb7pTUe~
zUX`da2{v>X-B1|FR+$+{E~ChQp!TF*n1pg{^rPE!MN!Uw#aHe??Ugd^s#6602~HsJ
zB(B#mIUgI819L0h00kf)7XhUKU|<k1@K6xY|2X+SK2A(R3i5I?(1OE}nN?U+#mG1y
zr)v@tgUu<X8Z&nDf}BH4$t3WS{onimN(k(A4#%jbu1pv;QixgPfUB&XC7%*j0Gi{z
z%j|9lD}(qde|WesfhZf#1hYC~bGxa0v)946kvqx;rNkp>B4>;9D(Gi7OJc1sYMgu}
zT~u3PrMw1rCg~lvDsmpCB|GY1F>0cRP!Bi5No2y+3Duu(y%{+*)ci@8G(oG1-FOOX
z(3dpMtD3!dNNdu#6HA{RZiPSp+A1LRhm^A_3F1;%=u1czi?_<nO>^WPRLTxvu==b~
z@7aX%`PWndE+DA(Ma<^ARY|N}@CdaQuYfuHc%w$06(#rxx6-czQdWhDl%PWb#%iUy
z7x6XQ+b+>*(O65e=vT@sXRY~^k{?DcuAIrL<Mbsq>~X<NtThSQQ!o);;KkKFGtV;d
z3$||a(WKhEh^2h!uvYn71z`Tnl}5WtL2z=kW~+mW;_7n4y79cCsLVqpqP=8rDK6|e
z#(^YG!?V^3lfQS<6+E8$i>)yQ1{2IvIPVe+Rx&lLw%uw<Q(UJrj3?(ZOuoT6@+8{R
zRT-9qOx2ESW#*L63^GrpYxIN+3QnbI^ui@a(eaOl9pgrdDy2`)$ISk6NX}M~Bgyn=
z-Fv2W=~aq{lL;OvlMF%(?M`t;mz~9-45sCGIaZE{%MC^%z0L0~SeJ*F#E>hJ42~=b
zYF;Xl4JO{y6}CY4XuA~Ic)9FKGm+9MMK=FcrtUGi6f9R;GTsatsbr^9D#3x;Uz}=!
zqb?eS*IspDnKuigBf3pGe~5$N)bfN;R(?)F((<WS!N)OP>SA>75wMs1mic|IP{iK#
zSX$M_o<98w*B$yTa&MFrFU2NoqX<5BKe7PYIJ-bJke)1ntr9-M(bqcU?u&WP`WN4v
zVETF*l~I70Q}JH7!gOU>Y}r0M(r-AcF41U9GPsxY&1%i%^>Q_I%MV1;*A74$j5x&M
zFa8C7oF6Flw(3)j?3=ArzhiG2{KCiLa=|+;^a1N<tlI1TzQj%gjV<<t;ZhG{)5##C
zPihnc_rWDR_P%3TUGgRKYY}$`Jqd`K;kN=QX5BfLc~`CL;MK>!QgZ9vd5(o2To>z0
zH?erz&+7w4pPG7&XqB_!<@ne=j%r=Ysmb+C&5)CRfYm_G*M1%EhgT&_E_1W-&rcQk
zW%P-<eaunNCDkxIew)dmIG=pYd#CTzg)(8RQScd|v}wM7DOV}a<7*sWotmp2{I98u
zzOvdOtnw`?xARkFw9bVge#H~D;g39FRjtZgG;51jEFQBB*JM-lnfC1iuZI2msLx$L
z#z+_Uo+`pC8O9R`tHtw+yuJ^yPBWU&ohm!^EL`zRoy=Ifkj|`VoT^i!jQrfATzx!}
zYkCzGOmxDr5E_7<8~X9ldD{F%9a{v8d^_`~7O`9hUvoYB=MrQ=&&yH!0v4u8)RV)A
zoU;n*?HeG$ad5Deo!+CrbEqhPwH-AqTjY4tQ6*NPiwK-Nqf&bl`(~GrSHrusnq^u>
zar$-B!%IJ}Q#0pIY2%bK`3*3D=0!`&$p7fo6|wSwxBOy!a%}NpJortpXiAX1VNWpT
zvY><ICfr=>@+N$`B62Wd=YcQn#rSEwtQDq4iTW;-MGPUQdQl#8@l(I$g<!IQiH=_1
z<B#ctn!Y-o$Qz<cROYc=s(domJ-XCojZD>yFF2#}MRGXb8z=-&Rbqg&&iolsy4x6X
z!;On4Yp7`%_D)euYcw(tE>8Gn#lZOw`?^95=f9L07#omg^-;qJ28v8v-FwNGJExYz
zWRBP+7Vo`Ah1~0Am^>j2k_^xCCEfrQUz^6Kn54_?^mJ+OgLHcOCp`PRQl9hX1QEt}
z39C(8K@GjJRqhgtm;}e+v9Ne6MMI3too7^I^d8hJ0UwGo&(w)53v6fwES{J^!JQTb
z6w)EUp&|dfaSjBalCThq1fVDzImYB%Fbh|AO<ry){b!d)hy*kV+xPMOq<jN39T`M3
z8Z;dcMX!;H#hq2Um0o`g`snV0yydX8(3P$J#4V}snK*<m&}|zJL&d0^U@*`<CU;Hu
zF%F*9P~ayuqz(`*@!Eb&5EXXEO_T;gmh9AwWA{t9S$|R<XBoA-MHZp&R6+5XZu$ZT
zxGrEA0KkH)B0Zr18maB+by8rt#0=5C=I*zQ+$m<~>Fc7%#7X`csD~fr)Vj#0JxR@x
z5TC_pyyioOO(vJ4#c%N73`*~=q!>5h&rM!^C8>mRtNG&A3X>Lt%w=~Th!g0_?Bte?
zkA`O&k>1`W5OmrTH`KD{AOyiFQeSK>*wl*-b(BJhy9N!ODxsw2^JPf|$JGR#QL6XO
z$3rg~-F}bvqRT}+rf5sIlFzf8^I6xq%Ug1&Bl->CV|^u)Wwx2Uks_;*<VUIJK%l;k
z?Mc_nO^!ZQv_3cwNnT{v0p0ESO)V7Y5*%XC&@pWFtBd<2kjj|Tg0?@U#X_)#3(BS&
zd7WJ7YY<nfupcx``lHNB3Ke2)wIZ9|H7gL<H{zQ5F$qa$36(fh+=u7as`hEz)C;rO
z%;4~eK_RfZR^ZCdZ*QVJdDwfs`gLP0FD+}Lz48RBmgQqF-|bEOAw+XMsfP1M*3(i<
z+3m*Jd^zuq#N|Cw#F|m2X~b&QfqIXM$J6MGj(9e7n9bJ7!YS$G^nr%GpD~HKTb>*x
zd7Snam4yiL+JtbLs@7gyzFG;x_qvrhYN;R0F`g<1IrqTiE>xPiY0fp|A|KbQvTsm{
z*$nwHQByni((Dv)IvmTSvm8~!8zPX;6PyJdFAPosq*S+UTYij?ROj$>rLr#*2eWa(
z``W;SqQ>%=w4oE>XC=vf7_VE6+nrcS!2+hCDQ9S>sn6r*@9Q_tx&&{eASo<|te*{D
z9Bt(DpFtVu97la8xa$jQIfePHJP?{VCzg<xU!VRe#a-m!e4}6h9P@*&T<jP?v#>nm
zMhZX~Sr(Ez#d6NFRfi*(xvg)c;n_jLn1>9Hm12^h*=0^|<))p?CknHwi<6{w@M?UX
zM(*mK^=w4+CADdb05By`G26*)g>vri@%H;r-D09zKcH~b8O!3<R~UftoePDO$2dJ!
zEl577utIGNLzw|MUh(12c#rNCD<J@>6U1mG>6(nSon>rAJNYMGA4n4XD7Y+ujq>`u
z_YkD4GL%bER-UhB!KEK;hrSn8>mtUL{FaMkd!1V5`e<I#D58KXnm+oQ+eqA(uSJxl
zEKug?tIAJ#BW3gFdsqKm@n{N0aC+8*=A+CBbEfGhlT91=UG%z-f|EQFHs1!kMIYG@
z@ES>hej|oE>}<?AJ4_T^FI|R2h(5X1-DZNMq9Nn;<#~bSOy8Klw4E*THrWFNmb_~+
zVLnT*=Jz(x!^e>3N+n*0o@vX*D07XwRx^Di`P}6XMye(q|8*$s6cTSqYN97h-mRz`
zRzO=-Afge=T3m7en}U73qFW=836NATw0$CUsI=*k-zSc7(!1t*me9`*EvoCh8TvvF
zZ}Gzst6%)OgPEW%rz`5-IQQb{D3OERNS0FNh7amWCi=)}pJN-R{0A&6o;N@^D0=;U
z1qgWGE<+)YmHGc2O)>wyZKwSYD6Uc!<v;b*_Fa{K>#i+y#Q&m0`+>Fh{H;?p>9D7A
z|3ieWc~BV;`nUeP7%NXs_!qGZ9n|t2?Y;g=EfXJi{|AH^mym_FN<LgD4yvC|l8;oA
ze{=+OFkX-`2MpR=4U)&2o}*DoV<}b!%8+jh^vq8fpda6&$xvzzn#YnHWSv07$_-t~
z+E%?#YB!N*kdkM~Fh7N|qQg?{;!tQmDg`Rqk;+^e{}mu^d<^}m@vi{nKfv<e0C&3}
zuCX7lcVIadl|%K+d=~mQgr(mAfF;;B0GBU`H8Xlah?2PA*c;%hgA+vTQAPSo^)OcS
z5=bm-vZrxKM=6l3|2wkYXA{uQ<o{(hK_Ld^2mvvm?0{L=sCx54>GJPv^1cy?@&=%P
zkT<c`MP?@TrW&E-5j=R9Ki&;5(R6+FHc<&)Vkv$DI9TpgJIJ1`kEU1`P(F(CwEd(b
zg_2p|^cYtcrZiYq9LSk%_?9IYsjgf;Zb>IwcDWl0*uff9HyQ#T9cNG)U&Q7q$C)dA
ze$}NA)l+6+Gty27_23#*m+2g9@BjGc%nRR1ox^$wpM4%xZ6GhUBx0?*6SoD?ufB6K
zTB$F(0!H~6M^c+sHN~Awu#IDW#nR1>RsGY!(W?bIrD>Vzc!j)6X8&CZZB-gF4=_7O
zmWMVtJwX|d`p!pKExgl)wgvQJBobYVWN5Pm!-*J7oMZqQc8Yr@VO7d)2jR%`%jDJJ
z&~uGCJqPWdK_$CwwYtH(hy;ysr1XkIY}j%fJA>VMTo=RdT=?dc)rqAVHpyR?jAno1
zer6pzHH0;~F{k?I_Ub;UmM2?fE22USi%=&k3XtowoXA_IP^Gvy99n4ufaHkracj7Y
z#IqFT8{^m?S63OHS}3lWVyfq!KG1OEy6%QRXPd70#Otvc$zAW(Rt?)JjdN6@_&|+H
zX~I#QxBTQPTZ;7^k>6pQl20nK*+dlco2s6LV(nyUY2w%}zjII0OyLV}&tap9ips2G
z?RfsR;<5gUN4;#}){V!Y+zW1LzUfrPl|pdYc9qU$Ux5ZyUnt)Y|9L<C8=ytZ(YHgJ
zHqJK71JaaDlmU<bbBKBpwJpYn4SR0|%G%wB=TNGcSS|e<t9$wc1rCU`A^t(90l0wx
zI<d+&C-n|{V<KAj1l|-{r<2e#%bRqVIF?KeoU2NmLiC1(1$F~%T1TO!pyh)j^zDe3
zASAzQ26fL7?-kuyEYlE3x|6bs=3c8tH<!m@b#8VZv>vmUc(z$I>=<~GIBD4(D#xHR
z0sd|s0sc-7=WDEjG01g4l6WfU5#@swXsh4o>Q_~3o~0(TqXT?fUP|LB4`;Nc??r1S
z!6%x#Y4IVTv~v85`g>7B-X(xKt?KGi@@y|%{p^K{!+?RAat)cQv@AIEjziwv0@r^n
z7K?@Aimo43F6cc~dpN=j0Slc!hY_j5u8&gYEPBG*UC#R_*n<dl_j?cBll!-)5?tZU
zN8yG?zUtCev0wVDyGzP<7g;MCuz)`luYZ?$|LoI2fn4t27kr>)9?JVVPuVeN(kLLN
zx@(hJ_~P=PW#0Q19mp{mf|?Y*?;=i%JV-gqagv=Pf3r$Z-=oJt>_rFjGlZ~{HKOwn
z1w%5EKt7H+(E3rK9(u~H1tY3CT!k2eNOr5wLD%5#U$a|+dwz@f4O0|V1SZfCf~Loi
zSd9u2U!Q$=eu@Mx7>4WIKUj${U6!6N_A5dUEf|4&2n5QY3rp57F*PEIRe}joZ2xQt
zDJNqHR}!PZ+~0*?F1&rf5O{XJ(SlJqi_+{kV2OCFh~o1{fRVumMm^|BjsFpYfiWsm
zJzBZy-0<lnE?|oOBxn^3n+1d*84&YA=o*I@!M?0!cI4i$RRFv2AgX)-kpGlRIv)c9
zX25tDwZ$FKX<yvZ)sN1&$vWl4>8<=w0ueSksYG&3gq+1uw4U94Ru3VF2R_OD!6MJ{
zH)=JrPd2Li9ynz(aE+30clu&;iQ=!8gTS+oRtm(QVR=2nh9IGPhQ8U>VlLrS@`sr_
zITL47@@9;0$tM1zC-*0$*Z7-VOAZizucUJ&te*vIAR+mR|5g;p6{i1sJih^m?E+|4
zjZvt9k(C?Y3rkx7f*^3MaPVKECQFkUOKQYL+-J;bYKQ~-R{9l=vxx_A`g?@QyI>Gk
z&qX^$5O#0Ic0?#S!tWvavlg?12ptLC&c~MVW=3JqfI}pBZvdDYbeZ}&Qn26tDxYsd
zd-a?<#D#$v%&-S6(6onEvjq>rA~$rDcMv=VOw=TX!XyGW&swImgY~hyxaCB}1JgE4
z1y@8J$}rWzql%kG%hf8ndDW|GusD$!N<d^wbiM$!0M$Vr#6@X4j|IETyfkDAaOJ}Z
zf7qmEDY_2FpWuTIKgH?ict0NOCC_O<hr(L87JrKgx13PS#X=58o-CduYXw6ww)`0N
zB|O<-)h`By9x>b{D4nW686x>PpAwqZf()I3E_dE;fy5-rKPqeC8ae=INJ0;utR+PS
z^Z2!JfbfUq%6EycB{hPbCjo9q16a+=B%TBxN}hz(oEH@eN8%2V3=zJHlc1*K@qYa!
z=}_?aLmBj86O1@9F)1-U1gZz)0n+93P7d2R{KQX`pTv+crouFhe;|FnNUX&8cXu){
z=kL@;-KtZYamafNH<K{?`-^t^*Pwi$g!^%oWud~h7k!ma$-_}f9=pFuyEBxo|5VyZ
zDE6C}+NK%)%T!yEfwVzp$R|s?@8x(^TZog56RRjnH{u+gkD6Rn`RX6^XX&AYJzN%)
z?FOdP_W$u|Q0fK*g9HcvZ|(;ASc(J%v>#_g{65=OGYfZ3Ui^PkH;_*cYq`J_o&!_s
z5e|^(8}OmR8^z4B*=hA0u#tWvPL+FYAbH^T)aX4`gcSo*CVT_cs6(Vu@bDPLMjDDB
z0}UVu<~g?TW_I;f*w{*6B1nC@J~cGcWuuiDVg;bLa^uMb>^9%{OYV*Kl?!L2cgOEH
z$fM3ki`S6djrVp^XcE&Z2b#*>L-WwNvr-gh29e{(z^?ih*i+UBpa}=b^*pI2#cBlv
zr_u05g?1e{a64?ClmixZqg|vH+oW4uo-22MFh+t8z(M)r0Vn@ZP@MdMyF(<o>W?mh
z3POM;6K#p4kZJS$!k6gHL$wG!hNR)YtHVm>lHVu@Z8hp>jWB{oKYU>w3D;2`_z4j(
zLCjtTuSLE&Ngz2^SLYpYL-faWD4nU|&N5=GcZ~p!B2$k6#*S)Xe;t0DD)4y)LB|2j
zf4a%SUH`;}y%c7o<iZlt9~_-qk_0(U+%}fOmO8JY!b(1eJqh)Pk{@#FaHisdmRU;n
z^$vbujq$9ce@{+Jr7Kj4KZi;zWRt%Jk+#0Nr#fWKg6zjbvRtHi)X_P-JmG;<vM4<X
zVx@<@%BfDNLswVv>EoRok?2e)9K5ccIj?a>tWS1PW?nA4rlu>x{Mvd$^Ie4nr>I=`
zAt*ay$L!<<tY`NU^4}WkOo?dzKp;3FMbg&PG{)2_v)~k);?-w!Iu$aYd?6S%rXJ{4
zFD^|K8^}S1oatTqMcCQI>6L<945l0v&kQWB1D}Pu2&Ga2T+Kt(R8mPMctPs>sk0Gr
z+6;!Der26y0MbslbF<w*r6SHM->8{1?%Kp`LP-3iimwwV8)N0I#_!tunU3+8ScWTp
z#$8P^SOcDBBq&xu<@P?*k7kUqkmK7Ij&-)(I)i3jp?J9XB3kehS{JcLo3(L6h!`8C
z*d%7Ynu0Pk3F-DTaGDxYO#$`aMZsi)ewyAwCs|D4b(2>BhjN4;&(T~d`vE3ctR=xa
z{MkIRX-5^X1GW&rpC&wLq0M{rpK!RjLq~p*arBwGo0{}kt0K<Bl6B8$Ps&wM>|hRT
z3E=;P&wx4(mf|oBCP8-;3|&e9>uc~@!91|BlQAD&jsFpj=4v~tL|7pbN*rA<-<oHP
z$onOmii+7M{T^ek)+r7y=$6HXa=;W`zY{qQDitq(Q!5L@$u}q(`%u{*ajtb3r7T0F
zHXwX56-L`=7dWIbqFzFY_?379K~y4@B2BTG=z3;0Eic$6c=5+mpJ$bGtkH^-yhI5l
zgj~faNW|#?hRTXz-#F)!5?~{Ya&m^DW->f!Cd9>kZ+RyGE10N-WH`hgra%&~tHYt>
zw*qDoLUUl1t)p*n4dj=RRmu@XARF1vQi+`lxKrX`Kd9&Q*U`F#HZacc4w4a^2w4Z0
zXD9WC)%2$+`DO*bfEt3uOOfpTJz7<Pfjb~qSm$t;>h}j56>zU_G&u1pB&3em!K)}q
zqK{2FMXJWy4Do_do5BDHNcJgVA8<#wCy9$27Fl9zo^}iYI8Q?Vd@d0>fe*72)AZ7-
zK%YVn2TL$8a#C~EMh8ACu7D)E{4KUzy+{QNz72=?>;lsaNZd7iw0oD}R&y~=W5$C#
zaYw7kY8mpfClO7hI|Bwhmy>lwsBWQOGo+Q4+LcybRnXo`dG<(%_!>mV43C5W(~~Kp
zX?lF5<9hg-yiVvJq89F8>P~P>fe*1y-&&{TzbH#npI?4BF`PhM-eVFu!C_z|#F0)9
z5f5_2@4lu+=O^~)>L*b}=v|;zAgU&bL>T~I0Dgk=gz7TH3JK_}LQrIVOl>91(y{9K
zr96hE;mB?(zcq7@6H5Li?qn|pwmW1IFH2n+pEL^Wl;<FJ1c^k*g8hia4nAW>Ut80?
z&O(9WL)dRs^vy?ORVJx#M7*B(WaB8%d?E$)4(mo2szVLRnK(}~*EP^<$YHNXFNvu}
zzg_~rGX*UPzN%Wr2hQJwy_O41WoL9EdtIo0Wpi?;I#;wy24!kM)dl)EZ?IHP-Q8k$
zlZzf^<EBsCkL^V{MI{Fgp6GpA3H!(;y$8W;2r^3pQsQ{K@?3!4W8~yLJmWb7`J#ik
z9Y`{1t37-Lwf4mnm2!LYveLE)WxfzmO6f@ezBV)@)v5vws+Yi~6Cb$Pf$#PblRz0m
z39Sb&uBVPCKIWeL=58GX8%gbFC}dB3ACndcnMJq^h4AQI`X`cJVo0R~p0ctVzuCxc
zT6{X<{izT<yD1-bY!VmcTW6y|hHEuV_vg^U4}^Zqg<iGKmfpi{#5=2H&`ZesqOZ-1
s$|Ltzzw;J-giytkZAzhk-jx_yNcI=T<wSH5q0p+{)z0}{`n@gwAD6HkCIA2c

literal 11520
zcmb7KWmsHGlOBQwhlHSmOK^hQK!D&DTn7#A?hqis5||qZ5IneR@IiySySonVx<l^X
z-F^1k@5lB$&l&4;s=K<Y>aDl>ar$u?fGZ~@D+NG6cm}|OzW|SO00{u%v#0iSMT9pb
z6r`tyhJu2O@*E8v{W;q6=jfO?nCKYT7|)+$;bCFp;Ns%pqGRH}z{h<7|BU<e5QL{Y
z5s}c~H{xPE$AJI(|7?#f06a9n5#R_B0T1vD4*?Mm;jtY61Rwz5!$Lp+{8vLjLqSDC
zevbGI{<j=100HqCA~F&(8VVXRGQ1DGJ0cP?3Mw8NKGhqs7b?b1FR3}j17Fdonm7l2
zD<|NRh)&NSq~%tNsrc1q`l)qf%q2K;^cemuGPsZ@N&iC>5(>gIWJFXn_`jm?K_S5P
zgN}lLfQtAe3H}`}3GWRGl^Fhumnu$y-_l!0;IfR%SB_8#o&-i8({lZmc&8Rr@i+^>
zM1(&c4-pR_3OEJoV!wZji-Z99e_qJ;SfdZaO5V@xYwqk7T4R4}!@x-P8Tv@pBMjKA
z$yF?<p`#H1F{*kWK3C#OU@^d$KL4f4SxRBT_%mTmP1<f@QWRD0NDQ>hr?jf&zJxT$
zRkAR0pksI8va+FH{g8J_G-f*4CUaAS9F~)4{!9|s=b<A^$_xNpK3fp#)+r6#ARe~g
zxfDJqL(?7%_E4?^vug@9k<|@ZG|lB^6z96{|JA=Rg+qbs6~vF%&W0uDAe&9j`GdKN
zv623}XRi|a@GvFXGr-4xdpUG8z-V6EyB8sAt4yg<Sp1cIfY(NJk>#~L@(3{Ep+$y?
z2hTUC$t=oLRu=kbGO9*C0w4|X!OWcTSQ~afRp(6XBzxU)6ly`u0&fl|BtM>5UhR4o
z`lZAQN%pv{F$}Xf?((~d$T?U|dOrdTP5GIu4)(=+2&P+q$upL1TInpvJBL?Z5^4Kk
zFL&OpvmJ=aemb?fvh>W0kK;akLBAkOyJ0XpR<ECAfUk;a5zIb~{RmJAeM7)ts)jI8
z;_yn5_~L`{?${&1(UtPEVr`9&b&OJ$1Cv``73#W3u2h3E$G@LEr4Sh?^x&%CRMx0m
zrKzC0T8vDk<|^77z(bn~c&2%_Q)Tf<X7Iy#x_I`0Otu_X0=v2D1~`qGW6!QKFlOEw
z(a=y2x~ItCcwp*Ai4(pmS35IPoGqeY)2W=fa^)w?3!(C;+ye!aWb&&SUAj}*O1e{-
zqm{INh}bupsfu;?9c?SA(LfP%&cXIWHa{f#aKn&qS_y#A^dsZnbg)~USZI$1Bx9Q`
z5R}v@HJ~$xu@Ks_dli-$zFtz)lcb8$URW9q9>+^Za-<B(=dl72COQx+5NztmuJ=rp
za{b%Qj=J;Jx760De8{KUMt3Bi_5?tmL2d3Fv}b!8qp~poIa@eL$;H!OL$Q;}iKb~6
z7xp3~zelCYuQsj*5eqn+D#uUX&|`d-qL5F{r&#6t?&g!^=7ybFj%@$Void$xn)PSc
z{;T14?o{x3S_6Mp*bBE;kiw#pF(quj{s@)|DWPg__pjj`TguzZ+c2pOkXO=`?jjFx
zFimk&Vv=&omnZM)yp*OPo2rbfD<Q#^<`B<OFsoNG{<j;M#l0^<nC-<c&SM~3<=G+i
z7{=UhS%l$1X&0sRW<9loNS|88cqXr#Z_v;>`<Z^`co1i$JtV%S6dF2Tx!b9i5;Tie
z(oPV~T#msZ>5gGSQ>KRp3}dF%GOCbtXKET3c*|PF-k&TapUorRQs3VCTR?VL0o4V9
z>Suz};99t*9YF1^$iE<X`xjH^-Ev7mz1RQkX%JFBOzLQChOmc>ORQC^T7f#<kLJG^
z8c}4ewfHKF=jiATEEp)Gjqj}RyO{9drYSfi-1_wR=2=?8zQ5NiKHJaD&W<c=dub|F
z9!Y`{I1kXG)t31T#>x3mIf+N}IufUT5pA%YHLRqaieP&CSc?C*Hd{(8Q7*2^ToOas
zjNxAMewp=_@3YflC%Hwgf)OP2%a_}SUfo~Wqd20t1J8-{a8>5@DE3HS+`D@?aBOeh
zi4R~zXyK*Mhf{aB77}M|dVH1<1_t%xrGzn?(3E%8zE@dzZOvMPZmzC6A+>EDzNXn2
zMe-_*L**OTjD#zkTIi)HKj&mAi<9qU5CvU*t`2Mry7VdSLt55Y%N-6i0S;b;4asOS
zgVNB*){BJT*C^uuhp)nE#KHm(R%5s|rJRmW$V?lD2Wx>21bH&sqbmwoISPxCsClHG
z47KT6EN<M(G&q017}M{!A49Fu(yWp+F3yNUg>coTT%C??NAYVVVdXsIIE;`vN%jJd
z{`*IOE^&RLtUHD!wGghROi5?{;QmpK*=L+>s8Pf(JPqkaB&6M5_f%EcM}XA%*iZd=
z2|PWX^^(gp_J(9z@q0VdXy~k*sbBM=6KK?D;$e-)%}$~wD^bf@`QtWV8|9;`22-rT
zFZqToP7Nk?>*8LoL7DQUQX=ae<jppx#E9yYxsibvl{779l;@~{yWe*kUxnrhC?LDb
zZm=A(*~?gbMzMJBA5njy{v#qbX-s?(GvDYw%jgln<?ZEMYg`+>$WB!w>~+7qqguCR
z$~ZpTS7f~}rYA-){kakk_?493c{ZNQ(f1;9l5<V5ShC*3asCI+hqR29-L$~%mn>4f
z?0LO@DosKG7NG(?$-O{5X$||L)S&v5BlR(v?VRv6={GPzfh><80)#k~Y&~t-_N|7i
zVuert>Roi~zH|Pn`gWb<lXFhP7Bt!wWxqkYgw5g*b?FG+Cm$2N2|c)E(|Z&02spIv
zn(?z373vcydannD?<csmnJ|}sv>>;hJE_5}uMOLRYC1?eWIJ6f<r3Dq%-jD=eLyTJ
zAUI#08Qbtv%OXn_KeuDt>U4cwwR-5>yujq3716^~XhX|6z%`gXDEiknU>N{lGLyD0
zW;;#pQS`8mWE)HFY11Y7gvvSMQKxP1I+X<a@V%<i`MGf-SGrB;rXa2-ULLcz8%c~r
z)&_?;y{1dh>H4Pi+^IZfb<O57R3)UtG27~bVg$BV3wsWn#T!%eYAe;eNn_rPH2OB^
zyga1!E^7bPx|Y!=Et681PVDbQcXM!DlFTM+&~7J=*<Au(SFm!_p_hiOcUugIk)~$U
z564D#W{8i@K_kfWUw{d*ruMSnepe?qzj=(;H<^RU5_8D-SdHT4^$Fr0?#m=Sue!pQ
zYt3aTA=A}Vj+I(UToYsgDHcC@p=QW&bMlr|W1OkcQS_~titC-+me1;`#aWnkP{(8O
zBP6-MX7Gvi>ZM}0+Dp0%Hpqt+Yb$l>gq6BcqcahGt$^kqSOWExK4NEm-qI`>md(2n
zLs_jDk<B};N5@Jay4g!0Dk#JUKQ}e-5!CgA=_vyk+=7qCQ?sJ;`LtNwG_CnOX3=>j
z`oQXmk$1s_Dq$;d*hMU&zcyE`Z&IKyYeNS!-rqH1kQ#q0vuJ$BgPIOFQ!P439W2r?
zcmy<{C4V^#IVLE4rM-QO6`iFl3C4}%a|6O?G6To)hJ%^{#S8S+BJzc@PThs*_9fk)
zBT1WvdQ`nPgp0Px7P81J{yeNmS|<=iLIH_T&#6+iYOuhUN{o(4wtmmj-7<0Q@nx@U
z!2Waw11hHzHdY<D*!Bp(My(AJWKS`e<%#vmT3GTF`pzur8X8Qbf@Ac*@dK2UcO$-A
zpJ=Y5H_iFj&&Ha5k-U;)r^x9Fh<yw^7`|ni`aFB)t)Fw9bd5T4gemlM&ILk2dbl5j
zw<nruUy?udU(TijH0#0hplSFZsl((^%xk4=e<3uHS3vgs*oME-^N?JaK#Q<(D=k4e
zPI&7~t=wnPKbJe^s4Mv)lBBka>~B!V7t)_le4_dYIAJ?igIYDnfq+9I#UPbo#O0|Y
ztK$V>{*sI50VBIE1Pm*7B4fA0yHZZcgb4akKIO=ENYW<gvuIJBKWF7xMRb?f{Hn(e
z!TYSP#|IEyYkz0y)wiT=?YN-q&dz;r4QwZxRYU$Y)W*+KTv~t4$|?}xmj5q5K&oY-
zUv(W2MN?R-b~v-2RHfn5rrCS%Z%?x+M(g*g)(uR?JC&t5(4@U2@|On(rckc_Nva6)
zlE}BaWdmgU;O)UybF`>-f;xif3DS4wkTaj)1qqw{`Nl<wpV<o{m2VzK9k38anze(6
zOUxO)My#B*Htj%z<jg)J`OcdD^kef`@1orpR5gTikq{7uDzqK6qZ{L($OQ!}nnyAr
zsnnO20@0|HLPN+qN->l6iu{BAohEcOZyVtq?Hezk_XPz@nyvXE8Pr`?!ymnZ7y0Sr
zlqKtUXc%vQ{P?lJfZ+A<<1?{wAlh4SW9l!78?jbcdfm9gVo__E1|fy6<=J&zgDj%N
zc_2u<arttA6GFGO3iiKObv}qmvR#wq&DbZ~GCirL7DAkddx^hb$Z?N=kq5pwU39-b
z$u;i+h}dqY+jV#748wboFNt~l0}zSY0n-(`<2{N&<XkN1j=FPNBA;?rVyiQD*#C4H
z6t%{28RlxOq*-xVC~qQ3>INC!0(NC}!V;2y_P?v#Ac;SuKe-^QZW-5<e$$l3aaI`I
z1>BiO$uvm+i30gms^MH-y<KU{e+(1J{yg0Yw61K*Ujj83V=gGtLZ4L!(Uf=8&F2+e
z>?RfWrkAOXv|n$=&j09)loff)!X?h~%L+-Zit3e4W$@75U{}=)<g1MntHCXm50r_Y
z%x#}>R%y-mI_5lCgZyBlq+meyVE?t2$CIm2_Arik-EQ;|R+jUsVNK|qo~&$)xR7b7
zex#?!q2ZD|5>Zv|JYDR7Nm9_MNio)J>ovQ%_C{nd3kzoDtSSCPFJhsM{>ZHQQ*@4s
z+!pGgT`VffpHW+<Z?Gsz!Faj$nue>Qw>9Acb=JN-tRMq<T%*{MQ>|xdb!?&m5(xOZ
zsH4`H+wJG6tU{jE{#}j0*ryY-S!1Q|{7pzj<ZTK0-rPZBZlTO@@M>PwHmFfHSCy}o
zY*#A`4HJ%PHr(}1NmyiM8?Ll{n7YO8-GsuH9MS;Nla^{M_OrbW8j<|>%O}N3Oj-H<
z#Zx5AjZKL=_Ib8vRZhH~W>(7={MKlv$bKYA#gd^qgS5pO1Lh`5;`4CyYy{5`>W1RW
zH+fNtDmzFOJAZg<G;RgH;HJ<r*uv5~M$HI}&~e@KlDW?Gb$>Vmu{d}GJ-x0iTrd11
zfV2+b2N9YA5Mx#seQwGqqtB-a;o-gV<4QiucSXei14U!4RaEPLRs3T3)&9MM-ae8b
zaAmhg(+@IFUK2PE_NAUnDIBc+a(({_oLII)u(`6fqCA9y<%<zkjBBv)H)bx!n=Zc9
z*)+@;X^opqjHD~T%CCz{GpBTmqPYlLq^adg*T=LzjKQ;S@EFP>_-cRn`it9IlV3!2
zp_wfu0N)ic;@R&0;rF7xJ8pIlZ#(uW&)Msm&|<~stJBg>>)^GYm*Vxtyuep!tZS<d
zuXisQMsf#AT#Aw$OX>>CG2oaXuR5&PeC>|cAuhsh?>v=H1b1Xl{WpI-`-_2r<8hz9
zm@g~$Z1Mcxj!To>eDJQlluqKDmo+HQ(VjgUu}x19iI*19Td?Ly{4SU?tM6G)?G{aS
zA-jlJH@H1vKeKnBI#4*6v^EJ+qGyzddEmT^W7S2!eM%3Wrr#kj>%;aSw?-AgdSpLW
zj^J9dKt@wQQAFYM{&*EUpO++NI#PJrLxJ(&d9|zWh;a}jkzjQdbKKS@p}>Z)^xrEX
zGVU77hhF>ob-L>W0Vgj}rsc$tPgJDkG401Egj@ax;eOU0{BTCf;s|0hFe-E>`pDgf
z>6fh^d0#A1+kMFDi3506KdaYK^*R@LpF3g8N{Cafi&tcGnM$vkO$tRWCz#$jwx_Q#
z+UIj@pVHb<bO;=+wMq9{pTr^L4}stlrdSt>Cy(1v2D*SP)e<AK$h}SU#hf}kZtkSr
z<0}hmm3G!aC=H21A4vd0AJuiMbbk#<P0A7I7VB(g+A!!g3~_v1(Bm`<?ZbTU1fEUv
zA2az@VyX|)*{v&YqG}-X-(J_UK&jXv@S3{T8kBu?cCFT%LRp8tD(6mF3{M!v;reWa
zC&-LVV>(70?u<k^W6E__O^rjWmLp{vE<VDDjp>)6l=<2V5UIk!EML|Q(SfaE^yJ$0
z!7?kic3LD<vygJ+HuR<KHv|QWy@kH8RFSpx)v;x%pI7*emYO!+Uo?1v2ebJLq9e0X
zgN+qr?K`gAm%{Co7jtUGXLNbS%T8QyzUX5phcWNOO~h?RPbku6>Sw;s=bqCR(x67e
zej42ymeH2+nb4pTB4?>ebx=wbS=4=sgd2<C8R{41;E2y*IvwXw)f7+nBM=LF&hHHy
z$59{t@7Ots-h$y)Oc}0fZ!e{3?MVcptcHVxS}`^iDq@&sThEa#Jww2>*F~gA|G;Vo
zzwew^hQ}YSMpsbI2|}gD4zY0x9apw$7r@K<zoA5+8Ua;nxNWlBa+wZkCB;Yf<T~t4
z*Ypk>Jf&yAFg-kQL{-(GF-hW$aD9#PscU*wJaBAKRm7TWeXK!x%E7sK%|oD4uN3Qa
zTjLG1L`@QTrO6L{xfT^bDWF*hc01UTwWxl(Q?O_L0k>12?m!UXDz<_~-BNN=p<Q0-
zy*EaDEn6_anAD%}=YnH4L?;_jg1hT0M8tkdY31j3Q=pY?b!A5M(Ot^xu$+b;oOJX!
zs3x!4rH!hCn9Fpip+t+u%k`KozxgoP!SzeB5N$ddgHH2f)2?q@i_d}TK2Qzl&+(+F
zG^=G#R-LTjVXs@)YR#Dv4b3m#u|rCtELyqkH>WDMrB?|D3usimq$7{q3DPt9`3ohC
zK9)o2%n@>ni~68n9|3%-Kplrg;Vi^0Q*t|m7C$YILZv~2^)c(QlB;uwAwCqMXI}2u
zz^9yUNzjQ7$3$?_LQE%!x%_=~P75OT>eaCul2E1AJ(z8Kxi<%5co`CPEVTQj(p|s9
zv!uN45g^*=D}T_p3Z!4OTlA;Bb37Vr8D*;1{U?#VZ^fM8l2%s!CosqJrvMNeVt<4u
z^kTvlsgl3VreWmieEMvTV@!8RHcDi+9Co=&(XnOllS18-o4GipK~E*Z*YhGxtqn%~
zd&07_!N<bTlvNd?WmH2g1QcOyuOt%1(l6)fegtUMsMTBWfib$5|FP=W|Fr607lYSu
zt8O{%y!R<>k1yD}A2k>)SrOW$^HAIZx&m9A5q~16z!TI`w%H!>e3gO*s0{;xr6ukw
ziVw-ngcu#>M)Q=D81|Llh1vpB2F@2n`p_r>TD3Wt4fF=utVlB}V{MbJopq~hKq+DW
zWS>EBo{y!KU^)m6cnFkj6cBC%&t)OoRHGQF->aaR!PX>8DqS!Rt4m=GX-nJdnlG`V
z9?A{}qNvi?rM=<V!raWO#XydaThr`rSN4|@0abl76T?cqVGza56j#vl2~8fI_ejAw
z6RY|p1J_^`U9pl?Q%vm{4cw_<f<s`_akDV116*G7NH-RSS>t1yK&xY9Katt``BB}T
ztkzS~dPO^pe35bnYpuGWKkOXG-Av2zCN^^I%5rC7@sLc0)1@_Wz6E*Wu@z{L=@p#?
z;bgIVRQVi<4?ahcl;d1`ahvRZir;Mn7Ok@cO?qsU>GbLpPn-CtKoDU+Jv{@XNY@K2
z;?`?z&cC^5(ipROls5)O7_bjQXGCtr1@4)_1<$Ep-J!WWEFXdu=$BGU`%(x`Tgq%V
z;$`c%bVXh+EwwGx)-z2Tg5ePdj*O$3dvvRty1*%*8g@(b^Bn3GeG<Q6nefp5Lw-oX
z@4~B%L6w(;)qd!Md@k8&ur%>9rWG(6PBuvR+zn4v?cEN20xXJ`+gg9s72p}IX+oF#
z8jm>jv)LqWZp#n0iO<VeY?&Y34;^6i9>p|GYz)d+&u*}?8+1o>RoYJ5ciy?!V4z5;
z=g~lMtEvA)6)HUV`oityDVZ=O>9?g&jyeKQVJeU|YawtSimb!VGd&IwN<-468mqt5
zV@Y}L%(a|m8dz#Xr1e8Y3Mdofyci2;T%CWPl6`d?u4>s9JD%{JG|_ZUk+)S)us|I!
z>VB)U@U48vM&7CKW~R~dd1*Sf$O@%g>$<!?>ZH?l@hy)>VpXBz5_$9BXj0Xy<OIF!
zwR%6%l+RI`+l*}RgaRH|-nlb|j9!thry9w6WQ95h<DzOx|6HCqA2okC#<|_wf=XD7
z*l%Xsl{Pm+n!U~yW7_N8AlzfeY6}Z(bG73(LH}vc&(8NR10UX*6(hOf*=sF??vOM}
zeIg93ZCj{s8OilOsWq;?>p&aQS@dH-uH4qNd2z~neK^)VBcF-1Wr98(vF}@8O_`Y+
zS5lzag~{R?4eEM38JN$|0x0LgAnw7>{N3K4>bZ%{l164KRQ);`Dz_UiNDob-A}_ML
z;^1bYo3N@any`SJpaTc2Y6~V9!XfO4?UcMZ1N<7bN!;5OsT?;p+zxdzXv_Koq!jHk
zo6v*U@z!mZDHX1a!;4c;9-Bj&ibn)A8Vu?APZaY+N2C8u!O)an!vjYUJa$M|#u3;P
z4+viW{K}bn)H$CCa9s4yP=;7er8N*>kkxEoM!v~(xIASg((w15<(lO4@gk{n8vN_+
z2LZo`%~qnpvG5hPg^WC#92>8u7rWg{Uoe7V&0KinpX>4~$5T+#-4_|?fu66CLOs1w
zgVn|*w2<7?N2_IWOg}`z1Vgza#mGt6^I6*7DOfRd6>R>3N69mTPYg!CkhDy-VOT*@
zoP7~fV;zlPi^&zmpQ{oGFydqLOYAHjr{g)1c=Is|&ci5}Z`5MnYQW4@M4R&OM*!yK
zj);iP_i*3o+qX}t6GGzpBF44PkGQ0lBMu|ghH^zKZDo*2M^T$#-}#qN5+HSb)=pR1
z_KIc-FN|?8ap;53w)ayRiW>o}oGk=Tir}06iQ)$5ln4I4Hr0?&WZM8=h&ezc+NH!e
z(^y;dE`M*DoL?tdX;0MnBrE7P^N4Hm*e!0*sh{NFA|c05_ojaDiP#Od%D2pn%*-=}
z$zI{3E)&FCWN_sRdw55`w(tKXsk1DE`xG?)UYI|;>mRNXPE9|t)y!-&>Sw=gnKeg8
z-d{{g9h|h7&>Yb%MHJWxcDg1-Jpv@4zhGR0(pZbxwi@D{aIq6Jg@k0vajumb_=gkP
z>%7-I!U}ePcHbH_hk54hBvF@9mK6()1=t3(_S$@W_Dp`qa^&*z_;hK}&TO8^zMY_)
zc>1oEr=_X|SLzd9KYf;#ZOwO5UPq^v9}lq5wXfB&6&GhIozFq$2unYOayznpYhG4v
zYdOe=l+OtIP<XYxp@8X&q_p47n1RaceccY<AP)&q!6~9wrKbC2j4U;_PHL~Br+Qyo
z$&$TO7#X5z9isH=Eb^qomgBKns~1fhz{u&>b7lnf?+ImA@SNVgV)Xb~2F2BE*D`q}
zQ_>+myN6%D5w-0&?rejV_*DQl^?eMu6+mO6Ve4GO)}RK-5#G8+RwF9xD}Fvf5%aEu
zst4^EVngfI6#lXh)WOqa{YLJug|0}%1ZJMquF50Fm7`5=VXel-0X?ma(d4Xt?vjw(
zHa%0^&W<lfA*WqcplUF}BVaD(5m0|PG7Fs1RK~Ho<YG-o({s=4WjexA9Bo=umP;f|
z5p7!nGkI<#*>C~NVF}B<W9fgXS>&ipeB3UdsH=Yj_%u^oC%%mBV40KqOUl(hGkJcl
z_wv}@NE>yw^sB#_w-lAtBcQv9L(<z#w2xMl_oOj6%19e0*4N^M*#U+j^9UF>B%<L#
zAIlgDoSLx6QB{4m<22DY8{pQ=a806F{6&YYit;!~C}iZrHk+Qx1`v%tZp+Y#CYuMN
zvw8L4^$=u+K89<C{F<bb!1<<K+V<AmNE>3SXzHsik7nO+`(oaF9EX2q=yFP=dd$8z
z$YZF|C-v-zWlOMh<?x1^jid8N3~*t=r~Q&)Vm$7E!;+*sVWh}%8D2`<89&y5CKc2`
z1~rq{VRLh8RZ5btd$A*>LB9bX7k%hV)a<$lrtM|9BaWpEI`;-Gm5v^yWv`go`t@Br
zSfyMoPa%_LqPDQQKAzf0Ro`5XE$X?#bqZ#8<Ud6<%CLPcyON`idDXg3jogL;GN)qd
zZ&ywIOTMN7mRBx+=i6!IGU9LY+oujv4Aq^n?`+cb6l=ETx=1q#nYvze8Xz002k*jp
zO8?BrlkVvZW1mF{-C=kc@GY&B&!>0&8>ksxexFxce=rS%&{$&s%rd2;iOCkJjJj&5
zz0=s7g}jlqIu|>~(8aT||8Dxp>-d!OS=JAC%A#-Ju;V8<bh^i9Kh$LI&QL2b*D{~;
zIkfQ`^q0j+857;<X*}DK*U7vZ+fs4~?D7r4%cy@XR3pS~u+Cg4^tWlDKwUAub2MCX
zO1nEeXvK<R6!tHw1~hmb2zX8q)wUHf+?e~U`FgbmXpIkjg5o}T33#O@%AB0YoU4^D
znR_!-q&oID&|6_im+Qz!S6%PcvZ2Zw<OHn=O<+K4x4>*?1b2RUllI{tjb%tAdFo9E
z#L6bol`;~Ic|C^MKIW_l9+Z)&{`xp{LV<;;k~m31Y`PSb7@(A7pjQ@jTpH+Td6i%5
z#^$|Y;u`sYDvy>v%8q9tlYGY)KLe(`c~Smn!QgK5l}uDu%1oq9!7tN&3A^IR{y5TD
z=}J&e0!HE?^(fjA(`WY>C1{~rk8(*xl`cb3m%2;$zm~BPDf{;9G}eIHtm95~Cj(Bo
zh_24h-s&GxA~3WtYI4sO4{(FcO;6r-Ftaws>O!(u9&p6vZhEe-;lLE{sYC*XgVgm5
z;)PHY!U2r)rq`F0iJ4<m0C<(;IX5|=wr06WCsOasW;dKfVGDRWG~z=SaGx3czL2Yl
zCI(ap9i$OCMbWS5#(l+ZYD1ZLALjI8<~}-_i5Fk6_hifJ0ryVJ12H!VdM;%kdZbfr
z9p}cRu^R@VxMEe&G#TFamxB)gj_X?O;BifNb5L^S>xgA(w3eQO3YW9s_77mwNKeJD
z5ID2^GwPn7&F_L#?s9dc{(jJG0I9fHmiZO?%pA94(&EMRf=8B>pt_!0lFAxIwWx<O
zfo|!ih4(jJDi=!|`8_`HqXWgejJu5VZXk7h31;l550R`c%1)?Z`a9t|y~;qG#Fqc2
zBc49psEw&>^v`<BdC|viNp+E8B(E)_;=|bp0Tv7TqTO%3R=rq|Pt~3SnCcgx3ogrS
z_rxJ*dLZg2Z-=ynu?}}uN7A{JyHo|Y!9!Nxi2I9i<7$;ReH%lnho@ux6*C&&rY%@V
zY-VUmv=WHx=xmFyFj13C9Dps}DYBp&M=dfgl*~}y0Iu^}HwxY^_vkGmI7jbK60iZ$
zS-awu=9vk~+ee><(*|%z_2l$*W*>Sf+h1XdcUm$t(q?%f7Aa$s+|h{!Wx(vP6?NU}
zS54a<l*=9g@}&ZOdS7&IbV=_=;veYzG+yimBG|hNW`6L*J~cos<yjbxS?)Hax!cg?
z;CTcfCmrq}w^?K|TR5D1i#7GaQbJ9h*ttKc?4OEZ{}W@~1@>s0#JKZ|yyy{g`ig~U
zouBZUT(70rAX2bARx%tGL?;{0VN*RgBj(QLbM)P{LTD)~FOF3>5eU6|$<VsL>qqQv
zfuw2sRjK&{OG6&rIAI}-N@ORFkwgSJ@ex2kaN#}culeKXLfE{hby#!XN(QFbOff*=
zVqSy#2*9Jfix0M)_u~<6w)nna*0O6cy@p$J%gbFOd$E%`)E&Da#HaOH=7>A#Jkn@c
zzWf1X1&X36<9A(*Hh%<EYo;wgQ!$(TJ7dB}BTbZptHt}j<=Y)%K_AQ=14eWQ2NnVn
zd@ZI&oxJgil;dm7yLF;H>n}s*;5A4A(d{hTh538=HIdGk$hofPCzm3}`vDMHU^Q(S
zx7&j6;3L46b<Nz~Ld#Ipw4*v`Q6%ByQsBteCBWk%*~S6#2vCYWyz4d?sW|r>hddL4
z@z9MXU!@e2cb+K@&%Zev^$4?DNo(&u?D3)RE1lBnyO7AQvZJ75C%y;Xqjb-BC`s&<
z63$kD7H412`XfB)iY>K&wyS?YguF|nWYR!sT_bAelCw~ANJr9&)z?#sDS`A*V~BS4
zx@vIY0o{!S`*-StgUC$6J=vGY%y#R8EzbQgh(iD3gi*P+$v%s_E~&3Ypc$(WHR|#(
zp;9cmx+#+l-V8ArMpD7lixi8vw1)l%B`1S*R1@?bJowp%h<$N5m=1#POL07KBwiJa
zlp=^_V%_^_;T`3b2=VhrfC5v~WR_xqsG8Z@i+w-R8y#KK7sc|Q#)ewsKys-~{(j?>
ztZ`j@VRXOw`p`UKJNDE?H3mY_?UTV*?HWnXJQEdC)Y88Ce=$JN6o}95WDq5~e}(L!
z1pNaMpOQqDZ%<C8q^0N^5Yqc(An?N&81T~!n(&S5FZa{~eny}bo)$SENgMsb{X0Y;
zQ^H65)OlU{&kje2C+|-s<Uly^4AY_J{v6F!{scTpFl_cJ@r;@2zBaf|@V!tcEd_RG
zy2##{q32djn6U1QuCb<lQm#82+EM%^LS?YW{#h+%ap1)xAY4NO={E1}hikVVd<|9Y
zWvk4LHfL5587W&*>f$mJQ3va2AT(469sT46jL9YZ5kQ+HpIezf$Ph4JpWv3P&CHpv
zZF`9_HqYl4xA1;>X4?Az;@7NGf3@w&?3aB`T6@J1poKpo^$<Jm%hjAW_;Q=`$xPwP
zLNM(Nr<~v@n&!_8kl_Fpp0$34Q=(53gij8N{NoS81_r^&cQJ7|u7{%v_++8T(ePVL
z;O9c%+JloAxWC{EtETz$Zi?0~yxi*Lq;TwB%bT$RJ=MIiKvh^9^YjVsnDw;jadE;l
zn8P+aX5ih83;=JrAkOH^TN(%oI$Irk&6m$iiCP|Z=hS_M9C|^*HrffJCmr|mccx{{
zgx{tREk1mR8IM^Pu?sVtXtz<cZXB5aN^jdDKC7PD<FBk<>NIz=+DnsJLE-$FQudKj
zRHcVjl~+4;6ZA=-1kNl9;HomP9&z)=;m)dYbL2&(X6yiWzXdCGt}c$Wc*>#qH+_I0
zkJWS>SlTCSNG~m^nhEXp)LZc1CIw)_0zcX4P9KW^Yv<^MF?Qx>!y1MvR@M=~-u&nE
zaD@8{nAC&kUwkSh)l<Huq-lb?G;*~#-PQcvP1T$0{9qKkpd7t3+HPlkR|>psrl+sx
zjW*{{ADd{O*|CVSOxbVZ3+28OPyB_|goA2&Q3F@;-!XVP2(H^d#mGOK^9dld!*vc{
zGUN~NHPH#;`op?ExqSF~!Wkv_no&b3NDAt8Uq?!sDZGET=n%V7O!1<XIF^Pt`6mSZ
zTrWn6-lBl-hufZDMa6G2=JKj~X}%;z18Z=p`!`feUpR{8GM3mX1j0QTaf*;%T&II5
zOt0n<;1K!<n3Sq**8{IuzuhkDBrC1$=6}v)Fzb2OnKUT!4!Ns#w)c5`ki7c=M777_
zp0ly|4PR_5O#zqH8AO1GoOPCut6bht8EYcWT5A_mbMwc%^w&@Ed+TqHG;WJCn(D5M
z>)t%1EPBV=av7D`3L4J{bnf{bKP>dE;oC6MMq2^7M+HuV;{^r<<6rd0jF-^%_ixel
zXyQ|8a)yaAqqP2WjFBvnG^KZj-OjF7eN^^rId%kkY=vRwE<0dBY34q^HK3;%6hjW4
zC+$`iNcP8fV6+Nb7#q!c2%u;1ig^!{Od3ygzw{<q5N%HXYI7S{plcfcrSRRQbdFSv
z;)lb$i`K64kIZEoA%23LJ(&#0UaEwaB{ZAbr<cNsGkW3kV|MZS!yqp9<(P&JXO_D)
z<^}iI%+1`b8)1^R*i0|rchV2KWTHjOy4|<8f}72!Mh1PA`JKsE4`Hwn?(IcsLDsS|
zD+<tO2L;jh?S})c-kqbvt1;`+w$w%2Bb&~|RTtp2N$oeJ{{6TVm*R`O(NhsM@pZs5
z`S6j<q3N5*l9S=nUnXK(@~97H4R)-#*LuG}-LQ{f<?$x2eTnLZKC#|`aGY3fitD(5
zhRL)I2eeCJJqxzET|?pv5mh_C_~3Kx06Za>1mF?iTBJ0ld!%`CDV%F|u(bydR$q9h
z`Gx&6(H9Lb7G4A}5EQ{A8!Thit%T^DXU7e>f<>k;a)P&~@k=Bg0r-tYcRw^^s$?lx
z8ISLY9yZk-5-X)W4zMe7ZGFD9o(Ur>;_b}N0~t0*wZ7Qt-E(JlojH(V$DB^3U2N<z
zDC$&gipHx*8kM!+Xi0N_3OGTyBMi1v9KXveUpw$AY16)UBllSaVF$tM`wK<m5<Xd(
zs97)H07ZQTB>gg){YYpkXr?&9ps&AQY|7eCrYU^2UQ4=8cN^DOgSKFAPFsV~MA6RB
zfeN}er2`t!T=v$H%wN+QIME9}YodeZtU88ZNBD8L;?x|8!vQLvX8d%JbiP2t)~uV=
iNUoFs_awE*$hRY1^1y#K-hb68{xwzkrwhg7%zpqAdZ)Gk

diff --git a/Emby.Dlna/Images/people48.png b/Emby.Dlna/Images/people48.png
index 7fb25e6b393dcec7eb9f1335107e6a37c567d54d..dae5f6057fb0bea7a33e19601b81fe5dee250971 100644
GIT binary patch
delta 250
zcmV<W00sY^0+s@hB!AsWL_t(|+G21a5dhk!0}lqFAdcgIUW^z6gNP9$MgS3D#6XM@
zBZ0uch+rTF9vCBHj2Va+5jV2hp{pAV>I;NVulT(|gAquZW0FRW%mrEkRS$y)^b+b!
z4w&4a={aS9EuaDhIAL&QfI9|-)DJSi$^9S(RLb}yAA^Vi=5skTl^O+b_7`}(X?W%5
z{ei?BpLWgxUPAw6-pYbGZ*_l3top$aslV(7c2Nz&wN%C2iRwq(F5p2+Aq`g0+L{9R
zCg8Fe2IK+w2m&}12ncYXKumy;0^-kr(*VH;-pq`F@&nkN$N&HU07*qoM6N<$f{6}k
AoB#j-

delta 258
zcmV+d0sa1#0-gepB!A^eL_t(Y$766I5ipEu7|9ykd$--Wzh|;9u^Q6v{0D;<#l&gI
z{qr9NYKYO`^$4#1|EmBZG)()C1XdBD;UKbxn?z`Mimc(MJ7EnUkTv}GC9L5%vikc(
zIB5y8hCM`Ri2RID|0kW8i0eXVSVUaXSOksgKdan{Onm95fP2pRb|IIP<Q<nnWb#g&
zf9*~^j8lB!{*o;G8oGXh6U3bQ#JHN77r-8wgHOYv|5(6I+!_l0V+HNFG$7{$Wbh#v
zhXx!Lpjv^fVKOcat8i%8fJ?)192$1w(r{tGG>p~{qZ*I^0L+Ym^7S}r)&Kwi07*qo
IM6N<$g4F$e00000


From fa1df73d105ab42516712a4425c3e89951c41266 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Tue, 22 Sep 2020 15:49:55 +0000
Subject: [PATCH 101/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 .../Localization/Core/vi.json                        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index 57fe6c7a20..aff21c05a5 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -4,16 +4,16 @@
     "Folders": "Thư Mục",
     "Genres": "Thể Loại",
     "HeaderAlbumArtists": "Bộ Sưu Tập Nghệ sĩ",
-    "HeaderContinueWatching": "Tiếp Tục Xem Tiếp",
+    "HeaderContinueWatching": "Xem Tiếp",
     "HeaderLiveTV": "TV Trực Tiếp",
     "Movies": "Phim",
     "Photos": "Ảnh",
     "Playlists": "Danh sách phát",
-    "Shows": "Các Chương Trình",
+    "Shows": "Chương Trình TV",
     "Songs": "Các Bài Hát",
     "Sync": "Đồng Bộ",
     "ValueSpecialEpisodeName": "Đặc Biệt - {0}",
-    "Albums": "Bộ Sưu Tập",
+    "Albums": "Albums",
     "Artists": "Các Nghệ Sĩ",
     "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình thông tin chi tiết.",
     "TaskDownloadMissingSubtitles": "Tải xuống phụ đề bị thiếu",
@@ -29,8 +29,8 @@
     "TaskCleanLogs": "Làm sạch nhật ký",
     "TaskRefreshLibraryDescription": "Quét thư viện phương tiện của bạn để tìm các tệp mới và làm mới thông tin chi tiết.",
     "TaskRefreshLibrary": "Quét Thư viện Phương tiện",
-    "TaskRefreshChapterImagesDescription": "Tạo hình thu nhỏ cho video có cảnh quay.",
-    "TaskRefreshChapterImages": "Trích Xuất Ảnh Cảnh Quay",
+    "TaskRefreshChapterImagesDescription": "Tạo hình thu nhỏ cho video có các phân cảnh.",
+    "TaskRefreshChapterImages": "Trích Xuất Ảnh Phân Cảnh",
     "TaskCleanCacheDescription": "Xóa các tệp cache không còn cần thiết của hệ thống.",
     "TaskCleanCache": "Làm Sạch Thư Mục Cache",
     "TasksChannelsCategory": "Kênh Internet",
@@ -107,7 +107,7 @@
     "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập thất bại từ {0}",
     "DeviceOnlineWithName": "{0} đã kết nối",
     "DeviceOfflineWithName": "{0} đã ngắt kết nối",
-    "ChapterNameValue": "Cảnh Quay {0}",
+    "ChapterNameValue": "Phân Cảnh {0}",
     "Channels": "Các Kênh",
     "CameraImageUploadedFrom": "Một hình ảnh máy ảnh mới đã được tải lên từ {0}",
     "Books": "Các Quyển Sách",

From a1511add060249e4e04d88eeb8e9ee1d6c20c2a9 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Tue, 22 Sep 2020 16:26:52 +0000
Subject: [PATCH 102/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index aff21c05a5..f190f8298d 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -110,7 +110,7 @@
     "ChapterNameValue": "Phân Cảnh {0}",
     "Channels": "Các Kênh",
     "CameraImageUploadedFrom": "Một hình ảnh máy ảnh mới đã được tải lên từ {0}",
-    "Books": "Các Quyển Sách",
+    "Books": "Sách",
     "AuthenticationSucceededWithUserName": "{0} xác thực thành công",
     "Application": "Ứng Dụng",
     "AppDeviceValues": "Ứng Dụng: {0}, Thiết Bị: {1}"

From 9bcd81a5dd14e1dc5b14a87520f54dd4205123d0 Mon Sep 17 00:00:00 2001
From: Oatavandi <oatavandi@gmail.com>
Date: Wed, 23 Sep 2020 12:30:24 +0000
Subject: [PATCH 103/247] Translated using Weblate (Tamil) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ta/

---
 Emby.Server.Implementations/Localization/Core/ta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/ta.json b/Emby.Server.Implementations/Localization/Core/ta.json
index ed6877f7d7..810b1b9abe 100644
--- a/Emby.Server.Implementations/Localization/Core/ta.json
+++ b/Emby.Server.Implementations/Localization/Core/ta.json
@@ -26,7 +26,7 @@
     "DeviceOnlineWithName": "{0} இணைக்கப்பட்டது",
     "DeviceOfflineWithName": "{0} துண்டிக்கப்பட்டது",
     "Collections": "தொகுப்புகள்",
-    "CameraImageUploadedFrom": "{0} இலிருந்து புதிய புகைப்படம் பதிவேற்றப்பட்டது",
+    "CameraImageUploadedFrom": "{0} இல் இருந்து புதிய புகைப்படம் பதிவேற்றப்பட்டது",
     "AppDeviceValues": "செயலி: {0}, சாதனம்: {1}",
     "TaskDownloadMissingSubtitles": "விடுபட்டுபோன வசன வரிகளைப் பதிவிறக்கு",
     "TaskRefreshChannels": "சேனல்களை புதுப்பி",

From 3fa3a9d57a9e1d8ab0ae34443731a74aceed9563 Mon Sep 17 00:00:00 2001
From: Ryan Petris <ryan@petris.net>
Date: Wed, 23 Sep 2020 14:23:04 -0700
Subject: [PATCH 104/247] Preemptively throw a LiveTvConflictException when the
 tracked live streams for a given device/tuner will exceed the number of
 supported streams.

---
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 28e30fac8b..2f4c601172 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -563,6 +563,19 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         protected override async Task<ILiveStream> GetChannelStream(TunerHostInfo info, ChannelInfo channelInfo, string streamId, List<ILiveStream> currentLiveStreams, CancellationToken cancellationToken)
         {
+            var tunerCount = info.TunerCount;
+
+            if (tunerCount > 0)
+            {
+                var tunerHostId = info.Id;
+                var liveStreams = currentLiveStreams.Where(i => string.Equals(i.TunerHostId, tunerHostId, StringComparison.OrdinalIgnoreCase));
+
+                if (liveStreams.Count() >= tunerCount)
+                {
+                    throw new LiveTvConflictException("HDHomeRun simultaneous stream limit has been reached.");
+                }
+            }
+
             var profile = streamId.Split('_')[0];
 
             Logger.LogInformation("GetChannelStream: channel id: {0}. stream id: {1} profile: {2}", channelInfo.Id, streamId, profile);

From 9cdef5b57ce7afc1491c4a3cad64490e0d3652fe Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 22:27:17 +0200
Subject: [PATCH 105/247] Add series image aspect ratio when ep/season is
 missing an image

---
 Emby.Server.Implementations/Dto/DtoService.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 57c1398e90..677eec3158 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1139,6 +1139,7 @@ namespace Emby.Server.Implementations.Dto
                     if (episodeSeries != null)
                     {
                         dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, episodeSeries, ImageType.Primary);
+                        AttachPrimaryImageAspectRatio(dto, episodeSeries);
                     }
                 }
 
@@ -1185,6 +1186,7 @@ namespace Emby.Server.Implementations.Dto
                     if (series != null)
                     {
                         dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, series, ImageType.Primary);
+                        AttachPrimaryImageAspectRatio(dto, series);
                     }
                 }
             }

From ec5b7380792b6274ae2ce9e0281a3eac7beccdbd Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 23:09:26 +0200
Subject: [PATCH 106/247] Fix aspect ratio calculation returning 0 or 1 when
 item has no default AR

---
 Emby.Server.Implementations/Dto/DtoService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 57c1398e90..94cfed767b 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1431,7 +1431,7 @@ namespace Emby.Server.Implementations.Dto
                 return null;
             }
 
-            return width / height;
+            return (double)width / height;
         }
     }
 }

From 7b60872f2bea21f7834a16961da49c4d501a6323 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 24 Sep 2020 21:21:58 -0400
Subject: [PATCH 107/247] Revamp the main README

1. Make the descriptions more consistent.
2. Link to the webpage first, then docs.
3. Make the Weblate reference similar to the others.
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5e731d2100..9d6046ea1b 100644
--- a/README.md
+++ b/README.md
@@ -53,18 +53,19 @@ Jellyfin is a Free Software Media System that puts you in control of managing an
 For further details, please see [our documentation page](https://docs.jellyfin.org/). To receive the latest updates, get help with Jellyfin, and join the community, please visit [one of our communication channels](https://docs.jellyfin.org/general/getting-help.html). For more information about the project, please see our [about page](https://docs.jellyfin.org/general/about.html).
 
 <strong>Want to get started?</strong><br/>
-Choose from <a href="https://docs.jellyfin.org/general/administration/installing.html">Prebuilt Packages</a> or <a href="https://docs.jellyfin.org/general/administration/building.html">Build from Source</a>, then see our <a href="https://docs.jellyfin.org/general/quick-start.html">quick start guide</a>.<br/>
+Check out our <a href="https://jellyfin.org/downloads">downloads page</a> or our <a href="https://docs.jellyfin.org/general/administration/installing.html">installation guide</a>, then see our <a href="https://docs.jellyfin.org/general/quick-start.html">quick start guide</a>.<br/> You can also <a href="https://docs.jellyfin.org/general/administration/building.html">build from source</a>,
 
 <strong>Something not working right?</strong><br/>
 Open an <a href="https://docs.jellyfin.org/general/contributing/issues.html">Issue</a> on GitHub.<br/>
 
 <strong>Want to contribute?</strong><br/>
-Check out <a href="https://docs.jellyfin.org/general/contributing/index.html">our documentation for guidelines</a>.<br/>
+Check out our <a href="https://jellyfin.org/contribute">contributing choose-your-own-adventure</a> to see where you can help, then see our <a href="https://docs.jellyfin.org/general/contributing/index.html">contributing guide</a> and our <a href="https://jellyfin.org/docs/general/community-standards">community standards</a>.<br/>
 
 <strong>New idea or improvement?</strong><br/>
 Check out our <a href="https://features.jellyfin.org/?view=most-wanted">feature request hub</a>.<br/>
 
-Most of the translations can be found in the web client but we have several other clients that have missing strings. Translations can be improved very easily from our <a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-core">Weblate</a> instance. Look through the following graphic to see if your native language could use some work!
+<strong>Don't hae Jellyfin in your language?</strong><br/>
+Check out our <a href="https://translate.jellyfin.org">Weblate instance</a> to help translate Jellyfin and its subprojects.
 
 <a href="https://translate.jellyfin.org/engage/jellyfin/?utm_source=widget">
 <img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-web/multi-auto.svg" alt="Detailed Translation Status"/>

From 23a56a4a261f7bfd675126a566bb6ce904543fb3 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 24 Sep 2020 21:25:11 -0400
Subject: [PATCH 108/247] Fix bad line endings

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9d6046ea1b..b761d53e25 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Jellyfin is a Free Software Media System that puts you in control of managing an
 For further details, please see [our documentation page](https://docs.jellyfin.org/). To receive the latest updates, get help with Jellyfin, and join the community, please visit [one of our communication channels](https://docs.jellyfin.org/general/getting-help.html). For more information about the project, please see our [about page](https://docs.jellyfin.org/general/about.html).
 
 <strong>Want to get started?</strong><br/>
-Check out our <a href="https://jellyfin.org/downloads">downloads page</a> or our <a href="https://docs.jellyfin.org/general/administration/installing.html">installation guide</a>, then see our <a href="https://docs.jellyfin.org/general/quick-start.html">quick start guide</a>.<br/> You can also <a href="https://docs.jellyfin.org/general/administration/building.html">build from source</a>,
+Check out our <a href="https://jellyfin.org/downloads">downloads page</a> or our <a href="https://docs.jellyfin.org/general/administration/installing.html">installation guide</a>, then see our <a href="https://docs.jellyfin.org/general/quick-start.html">quick start guide</a>. You can also <a href="https://docs.jellyfin.org/general/administration/building.html">build from source</a>.<br/>
 
 <strong>Something not working right?</strong><br/>
 Open an <a href="https://docs.jellyfin.org/general/contributing/issues.html">Issue</a> on GitHub.<br/>
@@ -65,7 +65,7 @@ Check out our <a href="https://jellyfin.org/contribute">contributing choose-your
 Check out our <a href="https://features.jellyfin.org/?view=most-wanted">feature request hub</a>.<br/>
 
 <strong>Don't hae Jellyfin in your language?</strong><br/>
-Check out our <a href="https://translate.jellyfin.org">Weblate instance</a> to help translate Jellyfin and its subprojects.
+Check out our <a href="https://translate.jellyfin.org">Weblate instance</a> to help translate Jellyfin and its subprojects.<br/>
 
 <a href="https://translate.jellyfin.org/engage/jellyfin/?utm_source=widget">
 <img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-web/multi-auto.svg" alt="Detailed Translation Status"/>

From 2274aa30ce00786153bf555bc8070e9fd6028ace Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 24 Sep 2020 21:26:03 -0400
Subject: [PATCH 109/247] Correct typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b761d53e25..435e709b33 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Check out our <a href="https://jellyfin.org/contribute">contributing choose-your
 <strong>New idea or improvement?</strong><br/>
 Check out our <a href="https://features.jellyfin.org/?view=most-wanted">feature request hub</a>.<br/>
 
-<strong>Don't hae Jellyfin in your language?</strong><br/>
+<strong>Don't see Jellyfin in your language?</strong><br/>
 Check out our <a href="https://translate.jellyfin.org">Weblate instance</a> to help translate Jellyfin and its subprojects.<br/>
 
 <a href="https://translate.jellyfin.org/engage/jellyfin/?utm_source=widget">

From 4c0ec387e56e8f382361b421226e86e28a794070 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Fri, 25 Sep 2020 03:01:44 +0000
Subject: [PATCH 110/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index f190f8298d..2392c83479 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -15,7 +15,7 @@
     "ValueSpecialEpisodeName": "Đặc Biệt - {0}",
     "Albums": "Albums",
     "Artists": "Các Nghệ Sĩ",
-    "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình thông tin chi tiết.",
+    "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình dữ liệu mô tả.",
     "TaskDownloadMissingSubtitles": "Tải xuống phụ đề bị thiếu",
     "TaskRefreshChannelsDescription": "Làm mới thông tin kênh internet.",
     "TaskRefreshChannels": "Làm Mới Kênh",

From 18ab0c21b2d2f4ff763d8628a79d4d25b5b87609 Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Fri, 25 Sep 2020 03:32:09 +0000
Subject: [PATCH 111/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index 2392c83479..b07055717d 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -13,7 +13,7 @@
     "Songs": "Các Bài Hát",
     "Sync": "Đồng Bộ",
     "ValueSpecialEpisodeName": "Đặc Biệt - {0}",
-    "Albums": "Albums",
+    "Albums": "",
     "Artists": "Các Nghệ Sĩ",
     "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình dữ liệu mô tả.",
     "TaskDownloadMissingSubtitles": "Tải xuống phụ đề bị thiếu",

From c92eda53c5ffa00de34491d79360740cdb6d545b Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 10 Sep 2020 11:05:46 +0200
Subject: [PATCH 112/247] Fix Identify by renaming route parameter to match
 function argument

---
 Jellyfin.Api/Controllers/ItemLookupController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/ItemLookupController.cs b/Jellyfin.Api/Controllers/ItemLookupController.cs
index cf70386500..ab73aa4286 100644
--- a/Jellyfin.Api/Controllers/ItemLookupController.cs
+++ b/Jellyfin.Api/Controllers/ItemLookupController.cs
@@ -292,7 +292,7 @@ namespace Jellyfin.Api.Controllers
         /// A <see cref="Task" /> that represents the asynchronous operation to get the remote search results.
         /// The task result contains an <see cref="NoContentResult"/>.
         /// </returns>
-        [HttpPost("Items/RemoteSearch/Apply/{id}")]
+        [HttpPost("Items/RemoteSearch/Apply/{itemId}")]
         [Authorize(Policy = Policies.RequiresElevation)]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         public async Task<ActionResult> ApplySearchCriteria(

From fed58a0327efe29905376cdbdd3e51b0a9598bfe Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 10 Sep 2020 11:05:46 +0200
Subject: [PATCH 113/247] Add Dto to ForgotPassword

---
 Jellyfin.Api/Controllers/UserController.cs       |  6 +++---
 .../Models/UserDtos/ForgotPasswordDto.cs         | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 Jellyfin.Api/Models/UserDtos/ForgotPasswordDto.cs

diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs
index 630e9df6ac..50bb8bb2aa 100644
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -505,17 +505,17 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Initiates the forgot password process for a local user.
         /// </summary>
-        /// <param name="enteredUsername">The entered username.</param>
+        /// <param name="forgotPasswordRequest">The forgot password request containing the entered username.</param>
         /// <response code="200">Password reset process started.</response>
         /// <returns>A <see cref="Task"/> containing a <see cref="ForgotPasswordResult"/>.</returns>
         [HttpPost("ForgotPassword")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<ActionResult<ForgotPasswordResult>> ForgotPassword([FromBody] string? enteredUsername)
+        public async Task<ActionResult<ForgotPasswordResult>> ForgotPassword([FromBody, Required] ForgotPasswordDto forgotPasswordRequest)
         {
             var isLocal = HttpContext.IsLocal()
                           || _networkManager.IsInLocalNetwork(HttpContext.GetNormalizedRemoteIp());
 
-            var result = await _userManager.StartForgotPasswordProcess(enteredUsername, isLocal).ConfigureAwait(false);
+            var result = await _userManager.StartForgotPasswordProcess(forgotPasswordRequest.EnteredUsername, isLocal).ConfigureAwait(false);
 
             return result;
         }
diff --git a/Jellyfin.Api/Models/UserDtos/ForgotPasswordDto.cs b/Jellyfin.Api/Models/UserDtos/ForgotPasswordDto.cs
new file mode 100644
index 0000000000..b31c6539c6
--- /dev/null
+++ b/Jellyfin.Api/Models/UserDtos/ForgotPasswordDto.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Jellyfin.Api.Models.UserDtos
+{
+    /// <summary>
+    /// Forgot Password request body DTO.
+    /// </summary>
+    public class ForgotPasswordDto
+    {
+        /// <summary>
+        /// Gets or sets the entered username to have its password reset.
+        /// </summary>
+        [Required]
+        public string? EnteredUsername { get; set; }
+    }
+}

From a9864368c46c3a8c934216052c10c18cbb7d4bdc Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 17:25:50 +0100
Subject: [PATCH 114/247] Update PlayToController.cs

---
 Emby.Dlna/PlayTo/PlayToController.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 328759c5bc..f1eb5b30ea 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -886,7 +886,10 @@ namespace Emby.Dlna.PlayTo
                     return null;
                 }
 
-                mediaSource = await _mediaSourceManager.GetMediaSource(Item, MediaSourceId, LiveStreamId, false, cancellationToken).ConfigureAwait(false);
+                if (_mediaSourceManager != null)
+                {
+                    mediaSource = await _mediaSourceManager.GetMediaSource(Item, MediaSourceId, LiveStreamId, false, cancellationToken).ConfigureAwait(false);
+                }
 
                 return mediaSource;
             }

From 293237b714835fadd0a7c387815d146a2e4b810b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 18:40:10 +0100
Subject: [PATCH 115/247] Update BaseControlHandler.cs

---
 Emby.Dlna/Service/BaseControlHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index d160e33393..ea17773b1a 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -150,7 +150,7 @@ namespace Emby.Dlna.Service
                 }
             }
 
-            return new ControlRequestInfo();
+            throw new EndOfStreamException("Stream ended but no body tag found.");
         }
 
         private async Task<ControlRequestInfo> ParseBodyTagAsync(XmlReader reader)

From 12b5f1127e0bef04173a9ad0f80b13e2ec86552f Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 18:46:20 +0100
Subject: [PATCH 116/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index 1f429d0de3..98945c2443 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -235,13 +235,13 @@ namespace Emby.Dlna.Server
                     .Append(SecurityElement.Escape(service.ServiceId ?? string.Empty))
                     .Append("</serviceId>");
                 builder.Append("<SCPDURL>")
-                    .Append(BuildUrl(service.ScpdUrl, true))
+                    .Append(BuildUrl(service.ScpdUrl))
                     .Append("</SCPDURL>");
                 builder.Append("<controlURL>")
-                    .Append(BuildUrl(service.ControlUrl, true))
+                    .Append(BuildUrl(service.ControlUrl))
                     .Append("</controlURL>");
                 builder.Append("<eventSubURL>")
-                    .Append(BuildUrl(service.EventSubUrl, true))
+                    .Append(BuildUrl(service.EventSubUrl))
                     .Append("</eventSubURL>");
 
                 builder.Append("</service>");

From f3a90bab477ed7008c2569dcd3d89f21a92558fb Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 18:46:52 +0100
Subject: [PATCH 117/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index 98945c2443..573f7adc0c 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -249,14 +249,8 @@ namespace Emby.Dlna.Server
 
             builder.Append("</serviceList>");
         }
-
-        /// <summary>
-        /// Builds a valid url for inclusion in the xml.
-        /// </summary>
-        /// <param name="url">Url to include.</param>
-        /// <param name="absoluteUrl">Optional. When set to true, the absolute url is always used.</param>
-        /// <returns>The url to use for the element.</returns>
-        private string BuildUrl(string url, bool absoluteUrl = false)
+        
+        private string BuildUrl(string ure)
         {
             if (string.IsNullOrEmpty(url))
             {
@@ -267,7 +261,7 @@ namespace Emby.Dlna.Server
 
             url = "/dlna/" + _serverUdn + "/" + url;
 
-            if (EnableAbsoluteUrls || absoluteUrl)
+            if (EnableAbsoluteUrls)
             {
                 url = _serverAddress.TrimEnd('/') + url;
             }

From a52ab69e13d2b924522a21fa4da98f38ec298bd1 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 18:47:24 +0100
Subject: [PATCH 118/247] Update DescriptionXmlBuilder.cs

---
 Emby.Dlna/Server/DescriptionXmlBuilder.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
index 573f7adc0c..bca9e81cd0 100644
--- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -249,8 +249,8 @@ namespace Emby.Dlna.Server
 
             builder.Append("</serviceList>");
         }
-        
-        private string BuildUrl(string ure)
+
+        private string BuildUrl(string url)
         {
             if (string.IsNullOrEmpty(url))
             {

From 7ee57a07a7a28ff36213cac36636f367470b1af7 Mon Sep 17 00:00:00 2001
From: radiusgreenhill <radiusgreenhill@gmail.com>
Date: Fri, 25 Sep 2020 10:36:45 +0000
Subject: [PATCH 119/247] Translated using Weblate (Thai) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/th/

---
 Emby.Server.Implementations/Localization/Core/th.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/th.json b/Emby.Server.Implementations/Localization/Core/th.json
index 3f6f3b23c7..3b77215a30 100644
--- a/Emby.Server.Implementations/Localization/Core/th.json
+++ b/Emby.Server.Implementations/Localization/Core/th.json
@@ -20,8 +20,8 @@
     "NotificationOptionCameraImageUploaded": "อัปโหลดภาพถ่ายแล้ว",
     "NotificationOptionAudioPlaybackStopped": "หยุดเล่นเสียง",
     "NotificationOptionAudioPlayback": "เริ่มเล่นเสียง",
-    "NotificationOptionApplicationUpdateInstalled": "ติดตั้งการอัปเดตแอพพลิเคชันแล้ว",
-    "NotificationOptionApplicationUpdateAvailable": "มีการอัปเดตแอพพลิเคชัน",
+    "NotificationOptionApplicationUpdateInstalled": "ติดตั้งการอัปเดตแอปพลิเคชันแล้ว",
+    "NotificationOptionApplicationUpdateAvailable": "มีการอัปเดตแอปพลิเคชัน",
     "NewVersionIsAvailable": "เวอร์ชันใหม่ของเซิร์ฟเวอร์ Jellyfin พร้อมให้ดาวน์โหลดแล้ว",
     "NameSeasonUnknown": "ไม่ทราบซีซัน",
     "NameSeasonNumber": "ซีซัน {0}",
@@ -65,8 +65,8 @@
     "Books": "หนังสือ",
     "AuthenticationSucceededWithUserName": "{0} ยืนยันตัวสำเร็จแล้ว",
     "Artists": "ศิลปิน",
-    "Application": "แอพพลิเคชัน",
-    "AppDeviceValues": "แอพ: {0}, อุปกรณ์: {1}",
+    "Application": "แอปพลิเคชัน",
+    "AppDeviceValues": "แอป: {0}, อุปกรณ์: {1}",
     "Albums": "อัลบั้ม",
     "ScheduledTaskStartedWithName": "{0} เริ่มต้น",
     "ScheduledTaskFailedWithName": "{0} ล้มเหลว",
@@ -92,7 +92,7 @@
     "TaskCleanCacheDescription": "ลบไฟล์แคชที่ระบบไม่ต้องการ",
     "TaskCleanCache": "ล้างไดเรกทอรีแคช",
     "TasksChannelsCategory": "ช่องอินเทอร์เน็ต",
-    "TasksApplicationCategory": "แอพพลิเคชัน",
+    "TasksApplicationCategory": "แอปพลิเคชัน",
     "TasksLibraryCategory": "ไลบรารี",
     "TasksMaintenanceCategory": "ปิดซ่อมบำรุง",
     "VersionNumber": "เวอร์ชัน {0}",

From 63571578ae04ec3b16f8cc5c5b2f9252de78aeda Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 19:44:16 +0100
Subject: [PATCH 120/247] Update BaseControlHandler.cs

---
 Emby.Dlna/Service/BaseControlHandler.cs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index ea17773b1a..39004d3944 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -155,7 +155,7 @@ namespace Emby.Dlna.Service
 
         private async Task<ControlRequestInfo> ParseBodyTagAsync(XmlReader reader)
         {
-            var result = new ControlRequestInfo();
+            string namespaceURI = null, localName = null;
 
             await reader.MoveToContentAsync().ConfigureAwait(false);
             await reader.ReadAsync().ConfigureAwait(false);
@@ -165,11 +165,12 @@ namespace Emby.Dlna.Service
             {
                 if (reader.NodeType == XmlNodeType.Element)
                 {
-                    result.LocalName = reader.LocalName;
-                    result.NamespaceURI = reader.NamespaceURI;
+                    localName = reader.LocalName;
+                    namespaceURI = reader.NamespaceURI;
 
                     if (!reader.IsEmptyElement)
                     {
+                        var result = new ControlRequestInfo(localName, namespaceURI);
                         using (var subReader = reader.ReadSubtree())
                         {
                             await ParseFirstBodyChildAsync(subReader, result.Headers).ConfigureAwait(false);
@@ -187,7 +188,12 @@ namespace Emby.Dlna.Service
                 }
             }
 
-            return result;
+           if (localName != null && namespaceURI != null)
+            {
+                return new ControlRequestInfo(localName, namespaceURI);
+            }
+
+            throw new EndOfStreamException("Stream ended but no control found.");
         }
 
         private async Task ParseFirstBodyChildAsync(XmlReader reader, IDictionary<string, string> headers)
@@ -234,11 +240,18 @@ namespace Emby.Dlna.Service
 
         private class ControlRequestInfo
         {
+            public ControlRequestInfo(string localName, string namespaceUri)
+            {
+                LocalName = localName;
+                NamespaceURI = namespaceUri;
+                Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            }
+
             public string LocalName { get; set; }
 
             public string NamespaceURI { get; set; }
 
-            public Dictionary<string, string> Headers { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            public Dictionary<string, string> Headers { get; }
         }
     }
 }

From 75677791275792e8dcfae1e9361b93af75443a75 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Fri, 25 Sep 2020 19:51:37 +0100
Subject: [PATCH 121/247] Update BaseControlHandler.cs

---
 Emby.Dlna/Service/BaseControlHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index 39004d3944..776882aa55 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -188,7 +188,7 @@ namespace Emby.Dlna.Service
                 }
             }
 
-           if (localName != null && namespaceURI != null)
+            if (localName != null && namespaceURI != null)
             {
                 return new ControlRequestInfo(localName, namespaceURI);
             }

From b66ff9a08c6ba55a75da65a5cfdae8441baec6fe Mon Sep 17 00:00:00 2001
From: Eben van Deventer <buff0k@gmail.com>
Date: Fri, 25 Sep 2020 19:09:33 +0000
Subject: [PATCH 122/247] Translated using Weblate (Afrikaans) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/af/

---
 .../Localization/Core/af.json                 | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/af.json b/Emby.Server.Implementations/Localization/Core/af.json
index e587c37d53..ab60b29a72 100644
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -95,5 +95,23 @@
     "TasksChannelsCategory": "Internet kanale",
     "TasksApplicationCategory": "aansoek",
     "TasksLibraryCategory": "biblioteek",
-    "TasksMaintenanceCategory": "onderhoud"
+    "TasksMaintenanceCategory": "onderhoud",
+    "TaskCleanCacheDescription": "Vee kasregister lêers uit wat nie meer deur die stelsel benodig word nie.",
+    "TaskCleanCache": "Reinig Kasgeheue Lêergids",
+    "TaskDownloadMissingSubtitlesDescription": "Soek aanlyn vir vermiste onderskrifte gebasseer op metadata verstellings.",
+    "TaskDownloadMissingSubtitles": "Laai vermiste onderskrifte af",
+    "TaskRefreshChannelsDescription": "Vervris internet kanaal inligting.",
+    "TaskRefreshChannels": "Vervris Kanale",
+    "TaskCleanTranscodeDescription": "Vee transkodering lêers uit wat ouer is as een dag.",
+    "TaskCleanTranscode": "Reinig Transkoderings Leêrbinder",
+    "TaskUpdatePluginsDescription": "Laai opgedateerde inprop-sagteware af en installeer inprop-sagteware wat verstel is om outomaties op te dateer.",
+    "TaskUpdatePlugins": "Dateer Inprop-Sagteware Op",
+    "TaskRefreshPeopleDescription": "Vervris metadata oor akteurs en regisseurs in u media versameling.",
+    "TaskRefreshPeople": "Vervris Mense",
+    "TaskCleanLogsDescription": "Vee loglêers wat ouer as {0} dae is uit.",
+    "TaskCleanLogs": "Reinig Loglêer Lêervouer",
+    "TaskRefreshLibraryDescription": "Skandeer u media versameling vir nuwe lêers en verfris metadata.",
+    "TaskRefreshLibrary": "Skandeer Media Versameling",
+    "TaskRefreshChapterImagesDescription": "Maak kleinkiekeis (fotos) vir films wat hoofstukke het.",
+    "TaskRefreshChapterImages": "Verkry Hoofstuk Beelde"
 }

From 0c8692e3370cb35fba7907c5b30887f7a42e5bbb Mon Sep 17 00:00:00 2001
From: Eben van Deventer <buff0k@gmail.com>
Date: Fri, 25 Sep 2020 19:56:03 +0000
Subject: [PATCH 123/247] Translated using Weblate (Afrikaans) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/af/

---
 Emby.Server.Implementations/Localization/Core/af.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/af.json b/Emby.Server.Implementations/Localization/Core/af.json
index ab60b29a72..52bd8b3db5 100644
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -2,7 +2,7 @@
     "Artists": "Kunstenare",
     "Channels": "Kanale",
     "Folders": "Fouers",
-    "Favorites": "Gunstelinge",
+    "Favorites": "Gunstellinge",
     "HeaderFavoriteShows": "Gunsteling Vertonings",
     "ValueSpecialEpisodeName": "Spesiale - {0}",
     "HeaderAlbumArtists": "Album Kunstenaars",

From 3a79b9fc326ffd0ba9264178981edb00e185c2cd Mon Sep 17 00:00:00 2001
From: Eben van Deventer <buff0k@gmail.com>
Date: Fri, 25 Sep 2020 19:57:20 +0000
Subject: [PATCH 124/247] Translated using Weblate (Afrikaans) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/af/

---
 Emby.Server.Implementations/Localization/Core/af.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/af.json b/Emby.Server.Implementations/Localization/Core/af.json
index 52bd8b3db5..5908496039 100644
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -8,12 +8,12 @@
     "HeaderAlbumArtists": "Album Kunstenaars",
     "Books": "Boeke",
     "HeaderNextUp": "Volgende",
-    "Movies": "Rolprente",
-    "Shows": "Program",
-    "HeaderContinueWatching": "Hou Aan Kyk",
+    "Movies": "Flieks",
+    "Shows": "Televisie Reekse",
+    "HeaderContinueWatching": "Kyk Verder",
     "HeaderFavoriteEpisodes": "Gunsteling Episodes",
     "Photos": "Fotos",
-    "Playlists": "Speellysse",
+    "Playlists": "Snitlyste",
     "HeaderFavoriteArtists": "Gunsteling Kunstenaars",
     "HeaderFavoriteAlbums": "Gunsteling Albums",
     "Sync": "Sinkroniseer",

From 10556b16f83a7157b04eadebc53ce37a1b247552 Mon Sep 17 00:00:00 2001
From: Eben van Deventer <buff0k@gmail.com>
Date: Fri, 25 Sep 2020 20:48:12 +0000
Subject: [PATCH 125/247] Translated using Weblate (Afrikaans) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/af/

---
 Emby.Server.Implementations/Localization/Core/af.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/af.json b/Emby.Server.Implementations/Localization/Core/af.json
index 5908496039..d33e118931 100644
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -1,7 +1,7 @@
 {
     "Artists": "Kunstenare",
     "Channels": "Kanale",
-    "Folders": "Fouers",
+    "Folders": "Lêergidse",
     "Favorites": "Gunstellinge",
     "HeaderFavoriteShows": "Gunsteling Vertonings",
     "ValueSpecialEpisodeName": "Spesiale - {0}",
@@ -23,7 +23,7 @@
     "DeviceOfflineWithName": "{0} is ontkoppel",
     "Collections": "Versamelings",
     "Inherit": "Ontvang",
-    "HeaderLiveTV": "Live TV",
+    "HeaderLiveTV": "Lewendige TV",
     "Application": "Program",
     "AppDeviceValues": "App: {0}, Toestel: {1}",
     "VersionNumber": "Weergawe {0}",

From 800c03961281d4f2ee6d3d7c9d9c0db6f45f506a Mon Sep 17 00:00:00 2001
From: hoanghuy309 <hoanghuy309@gmail.com>
Date: Sat, 26 Sep 2020 03:53:31 +0000
Subject: [PATCH 126/247] Translated using Weblate (Vietnamese) Translation:
 Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/vi/

---
 Emby.Server.Implementations/Localization/Core/vi.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index b07055717d..2392c83479 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -13,7 +13,7 @@
     "Songs": "Các Bài Hát",
     "Sync": "Đồng Bộ",
     "ValueSpecialEpisodeName": "Đặc Biệt - {0}",
-    "Albums": "",
+    "Albums": "Albums",
     "Artists": "Các Nghệ Sĩ",
     "TaskDownloadMissingSubtitlesDescription": "Tìm kiếm phụ đề bị thiếu trên Internet dựa trên cấu hình dữ liệu mô tả.",
     "TaskDownloadMissingSubtitles": "Tải xuống phụ đề bị thiếu",

From 05fa95f149582b3de1881c42aaa0ac00408a9947 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sat, 26 Sep 2020 19:33:59 -0700
Subject: [PATCH 127/247] Increase scan speed for music libraries

---
 .../Resolvers/Audio/MusicAlbumResolver.cs     | 70 ++++++++++---------
 .../Resolvers/Audio/MusicArtistResolver.cs    | 14 +++-
 2 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 79b6dded3b..ff485a18e7 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Emby.Naming.Audio;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
@@ -113,50 +115,50 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             IFileSystem fileSystem,
             ILibraryManager libraryManager)
         {
+            // check for audio files before digging down into directories
+            var firstAudioFile = list
+                .Where(fileSystemInfo => !fileSystemInfo.IsDirectory)
+                .FirstOrDefault(fileSystemInfo => libraryManager.IsAudioFile(fileSystemInfo.FullName));
+            if (firstAudioFile != null)
+            {
+                // at least one audio file exists
+                return true;
+            }
+
+            if (!allowSubfolders)
+            {
+                // not music since no audio file exists and we're not looking into subfolders
+                return false;
+            }
+
             var discSubfolderCount = 0;
             var notMultiDisc = false;
 
             var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
             var parser = new AlbumParser(namingOptions);
-            foreach (var fileSystemInfo in list)
+
+            var directories = list.Where(fileSystemInfo => fileSystemInfo.IsDirectory);
+
+            var result = Parallel.ForEach(directories, (fileSystemInfo, state) =>
             {
-                if (fileSystemInfo.IsDirectory)
+                var path = fileSystemInfo.FullName;
+                var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
+
+                if (hasMusic)
                 {
-                    if (allowSubfolders)
+                    if (parser.IsMultiPart(path))
                     {
-                        if (notMultiDisc)
-                        {
-                            continue;
-                        }
-
-                        var path = fileSystemInfo.FullName;
-                        var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
-
-                        if (hasMusic)
-                        {
-                            if (parser.IsMultiPart(path))
-                            {
-                                logger.LogDebug("Found multi-disc folder: " + path);
-                                discSubfolderCount++;
-                            }
-                            else
-                            {
-                                // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
-                                notMultiDisc = true;
-                            }
-                        }
+                        logger.LogDebug("Found multi-disc folder: " + path);
+                        discSubfolderCount++;
+                    }
+                    else
+                    {
+                        // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
+                        notMultiDisc = true;
+                        state.Stop();
                     }
                 }
-                else
-                {
-                    var fullName = fileSystemInfo.FullName;
-
-                    if (libraryManager.IsAudioFile(fullName))
-                    {
-                        return true;
-                    }
-                }
-            }
+            });
 
             if (notMultiDisc)
             {
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 5f5cd0e928..e9e688fa67 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
@@ -94,7 +95,18 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             var albumResolver = new MusicAlbumResolver(_logger, _fileSystem, _libraryManager);
 
             // If we contain an album assume we are an artist folder
-            return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService)) ? new MusicArtist() : null;
+            var directories = args.FileSystemChildren.Where(i => i.IsDirectory);
+
+            var result = Parallel.ForEach(directories, (fileSystemInfo, state) =>
+            {
+                if (albumResolver.IsMusicAlbum(fileSystemInfo.FullName, directoryService))
+                {
+                    // stop once we see a music album
+                    state.Stop();
+                }
+            });
+
+            return !result.IsCompleted ? new MusicArtist() : null;
         }
     }
 }

From 72534f9d667f2457cbe96ea870d140528e366ba2 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Fri, 25 Sep 2020 09:25:59 +0200
Subject: [PATCH 128/247] Use SessionMessageType for WebSocket messages

---
 Emby.Dlna/PlayTo/PlayToController.cs          |  8 +--
 .../EntryPoints/LibraryChangedNotifier.cs     |  7 +--
 .../EntryPoints/RecordingNotifier.cs          | 11 ++--
 .../EntryPoints/UserDataChangeNotifier.cs     |  2 +-
 .../HttpServer/WebSocketConnection.cs         |  5 +-
 .../Session/SessionManager.cs                 | 28 +++++------
 .../Session/SessionWebSocketListener.cs       |  3 +-
 .../Session/WebSocketController.cs            |  3 +-
 .../ActivityLogWebSocketListener.cs           | 14 ++++--
 .../ScheduledTasksWebSocketListener.cs        | 14 ++++--
 .../SessionInfoWebSocketListener.cs           |  9 +++-
 .../Consumers/System/TaskCompletedNotifier.cs |  3 +-
 .../PluginInstallationCancelledNotifier.cs    |  3 +-
 .../PluginInstallationFailedNotifier.cs       |  3 +-
 .../Updates/PluginInstalledNotifier.cs        |  3 +-
 .../Updates/PluginInstallingNotifier.cs       |  3 +-
 .../Updates/PluginUninstalledNotifier.cs      |  3 +-
 .../Consumers/Users/UserDeletedNotifier.cs    |  3 +-
 .../Consumers/Users/UserUpdatedNotifier.cs    |  3 +-
 .../Net/BasePeriodicWebSocketListener.cs      | 27 +++++++---
 .../Session/ISessionController.cs             |  3 +-
 .../Session/ISessionManager.cs                |  8 +--
 MediaBrowser.Model/Net/WebSocketMessage.cs    |  3 +-
 .../Session/SessionMessageType.cs             | 50 +++++++++++++++++++
 24 files changed, 156 insertions(+), 63 deletions(-)
 create mode 100644 MediaBrowser.Model/Session/SessionMessageType.cs

diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 460ac2d8d1..d09a11930d 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -811,7 +811,7 @@ namespace Emby.Dlna.PlayTo
         }
 
         /// <inheritdoc />
-        public Task SendMessage<T>(string name, Guid messageId, T data, CancellationToken cancellationToken)
+        public Task SendMessage<T>(SessionMessageType name, Guid messageId, T data, CancellationToken cancellationToken)
         {
             if (_disposed)
             {
@@ -823,17 +823,17 @@ namespace Emby.Dlna.PlayTo
                 return Task.CompletedTask;
             }
 
-            if (string.Equals(name, "Play", StringComparison.OrdinalIgnoreCase))
+            if (name == SessionMessageType.Play)
             {
                 return SendPlayCommand(data as PlayRequest, cancellationToken);
             }
 
-            if (string.Equals(name, "PlayState", StringComparison.OrdinalIgnoreCase))
+            if (name == SessionMessageType.PlayState)
             {
                 return SendPlaystateCommand(data as PlaystateRequest, cancellationToken);
             }
 
-            if (string.Equals(name, "GeneralCommand", StringComparison.OrdinalIgnoreCase))
+            if (name == SessionMessageType.GeneralCommand)
             {
                 return SendGeneralCommand(data as GeneralCommand, cancellationToken);
             }
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index c9d21d9638..ff64e217a0 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -16,6 +16,7 @@ using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
@@ -105,7 +106,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
             try
             {
-                _sessionManager.SendMessageToAdminSessions("RefreshProgress", dict, CancellationToken.None);
+                _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, dict, CancellationToken.None);
             }
             catch
             {
@@ -123,7 +124,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
                 try
                 {
-                    _sessionManager.SendMessageToAdminSessions("RefreshProgress", collectionFolderDict, CancellationToken.None);
+                    _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, collectionFolderDict, CancellationToken.None);
                 }
                 catch
                 {
@@ -345,7 +346,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
                 try
                 {
-                    await _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, "LibraryChanged", info, cancellationToken).ConfigureAwait(false);
+                    await _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, SessionMessageType.LibraryChanged, info, cancellationToken).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index 44d2580d68..824bb85f44 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.EntryPoints
@@ -46,25 +47,25 @@ namespace Emby.Server.Implementations.EntryPoints
 
         private async void OnLiveTvManagerSeriesTimerCreated(object sender, GenericEventArgs<TimerEventInfo> e)
         {
-            await SendMessage("SeriesTimerCreated", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.SeriesTimerCreated, e.Argument).ConfigureAwait(false);
         }
 
         private async void OnLiveTvManagerTimerCreated(object sender, GenericEventArgs<TimerEventInfo> e)
         {
-            await SendMessage("TimerCreated", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.TimerCreated, e.Argument).ConfigureAwait(false);
         }
 
         private async void OnLiveTvManagerSeriesTimerCancelled(object sender, GenericEventArgs<TimerEventInfo> e)
         {
-            await SendMessage("SeriesTimerCancelled", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.SeriesTimerCancelled, e.Argument).ConfigureAwait(false);
         }
 
         private async void OnLiveTvManagerTimerCancelled(object sender, GenericEventArgs<TimerEventInfo> e)
         {
-            await SendMessage("TimerCancelled", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.TimerCancelled, e.Argument).ConfigureAwait(false);
         }
 
-        private async Task SendMessage(string name, TimerEventInfo info)
+        private async Task SendMessage(SessionMessageType name, TimerEventInfo info)
         {
             var users = _userManager.Users.Where(i => i.HasPermission(PermissionKind.EnableLiveTvAccess)).Select(i => i.Id).ToList();
 
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index 3618b88c5d..ff09cc81ed 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -116,7 +116,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
         private Task SendNotifications(Guid userId, List<BaseItem> changedItems, CancellationToken cancellationToken)
         {
-            return _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, "UserDataChanged", () => GetUserDataChangeInfo(userId, changedItems), cancellationToken);
+            return _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, SessionMessageType.UserDataChanged, () => GetUserDataChangeInfo(userId, changedItems), cancellationToken);
         }
 
         private UserDataChangeInfo GetUserDataChangeInfo(Guid userId, List<BaseItem> changedItems)
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
index 7eae4e7646..fed2addf80 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Json;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
@@ -227,7 +228,7 @@ namespace Emby.Server.Implementations.HttpServer
                 Connection = this
             };
 
-            if (info.MessageType.Equals("KeepAlive", StringComparison.Ordinal))
+            if (info.MessageType == SessionMessageType.KeepAlive)
             {
                 await SendKeepAliveResponse().ConfigureAwait(false);
             }
@@ -244,7 +245,7 @@ namespace Emby.Server.Implementations.HttpServer
                 new WebSocketMessage<string>
                 {
                     MessageId = Guid.NewGuid(),
-                    MessageType = "KeepAlive"
+                    MessageType = SessionMessageType.KeepAlive
                 }, CancellationToken.None);
         }
 
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index e42d478533..df1b1e4525 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1064,10 +1064,10 @@ namespace Emby.Server.Implementations.Session
                 AssertCanControl(session, controllingSession);
             }
 
-            return SendMessageToSession(session, "GeneralCommand", command, cancellationToken);
+            return SendMessageToSession(session, SessionMessageType.GeneralCommand, command, cancellationToken);
         }
 
-        private static async Task SendMessageToSession<T>(SessionInfo session, string name, T data, CancellationToken cancellationToken)
+        private static async Task SendMessageToSession<T>(SessionInfo session, SessionMessageType name, T data, CancellationToken cancellationToken)
         {
             var controllers = session.SessionControllers;
             var messageId = Guid.NewGuid();
@@ -1078,7 +1078,7 @@ namespace Emby.Server.Implementations.Session
             }
         }
 
-        private static Task SendMessageToSessions<T>(IEnumerable<SessionInfo> sessions, string name, T data, CancellationToken cancellationToken)
+        private static Task SendMessageToSessions<T>(IEnumerable<SessionInfo> sessions, SessionMessageType name, T data, CancellationToken cancellationToken)
         {
             IEnumerable<Task> GetTasks()
             {
@@ -1178,7 +1178,7 @@ namespace Emby.Server.Implementations.Session
                 }
             }
 
-            await SendMessageToSession(session, "Play", command, cancellationToken).ConfigureAwait(false);
+            await SendMessageToSession(session, SessionMessageType.Play, command, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
@@ -1186,7 +1186,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
             var session = GetSessionToRemoteControl(sessionId);
-            await SendMessageToSession(session, "SyncPlayCommand", command, cancellationToken).ConfigureAwait(false);
+            await SendMessageToSession(session, SessionMessageType.SyncPlayCommand, command, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
@@ -1194,7 +1194,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
             var session = GetSessionToRemoteControl(sessionId);
-            await SendMessageToSession(session, "SyncPlayGroupUpdate", command, cancellationToken).ConfigureAwait(false);
+            await SendMessageToSession(session, SessionMessageType.SyncPlayGroupUpdate, command, cancellationToken).ConfigureAwait(false);
         }
 
         private IEnumerable<BaseItem> TranslateItemForPlayback(Guid id, User user)
@@ -1297,7 +1297,7 @@ namespace Emby.Server.Implementations.Session
                 }
             }
 
-            return SendMessageToSession(session, "Playstate", command, cancellationToken);
+            return SendMessageToSession(session, SessionMessageType.PlayState, command, cancellationToken);
         }
 
         private static void AssertCanControl(SessionInfo session, SessionInfo controllingSession)
@@ -1322,7 +1322,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
 
-            return SendMessageToSessions(Sessions, "RestartRequired", string.Empty, cancellationToken);
+            return SendMessageToSessions(Sessions, SessionMessageType.RestartRequired, string.Empty, cancellationToken);
         }
 
         /// <summary>
@@ -1334,7 +1334,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
 
-            return SendMessageToSessions(Sessions, "ServerShuttingDown", string.Empty, cancellationToken);
+            return SendMessageToSessions(Sessions, SessionMessageType.ServerShuttingDown, string.Empty, cancellationToken);
         }
 
         /// <summary>
@@ -1348,7 +1348,7 @@ namespace Emby.Server.Implementations.Session
 
             _logger.LogDebug("Beginning SendServerRestartNotification");
 
-            return SendMessageToSessions(Sessions, "ServerRestarting", string.Empty, cancellationToken);
+            return SendMessageToSessions(Sessions, SessionMessageType.ServerRestarting, string.Empty, cancellationToken);
         }
 
         /// <summary>
@@ -1866,7 +1866,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public Task SendMessageToAdminSessions<T>(string name, T data, CancellationToken cancellationToken)
+        public Task SendMessageToAdminSessions<T>(SessionMessageType name, T data, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
@@ -1879,7 +1879,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public Task SendMessageToUserSessions<T>(List<Guid> userIds, string name, Func<T> dataFn, CancellationToken cancellationToken)
+        public Task SendMessageToUserSessions<T>(List<Guid> userIds, SessionMessageType name, Func<T> dataFn, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
@@ -1894,7 +1894,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public Task SendMessageToUserSessions<T>(List<Guid> userIds, string name, T data, CancellationToken cancellationToken)
+        public Task SendMessageToUserSessions<T>(List<Guid> userIds, SessionMessageType name, T data, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
@@ -1903,7 +1903,7 @@ namespace Emby.Server.Implementations.Session
         }
 
         /// <inheritdoc />
-        public Task SendMessageToUserDeviceSessions<T>(string deviceId, string name, T data, CancellationToken cancellationToken)
+        public Task SendMessageToUserDeviceSessions<T>(string deviceId, SessionMessageType name, T data, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
diff --git a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
index 15c2af220d..a5f8479537 100644
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -8,6 +8,7 @@ using Jellyfin.Data.Events;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
@@ -316,7 +317,7 @@ namespace Emby.Server.Implementations.Session
             return webSocket.SendAsync(
                 new WebSocketMessage<int>
                 {
-                    MessageType = "ForceKeepAlive",
+                    MessageType = SessionMessageType.ForceKeepAlive,
                     Data = WebSocketLostTimeout
                 },
                 CancellationToken.None);
diff --git a/Emby.Server.Implementations/Session/WebSocketController.cs b/Emby.Server.Implementations/Session/WebSocketController.cs
index 94604ca1e0..b986ffa1cd 100644
--- a/Emby.Server.Implementations/Session/WebSocketController.cs
+++ b/Emby.Server.Implementations/Session/WebSocketController.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Session
@@ -65,7 +66,7 @@ namespace Emby.Server.Implementations.Session
 
         /// <inheritdoc />
         public Task SendMessage<T>(
-            string name,
+            SessionMessageType name,
             Guid messageId,
             T data,
             CancellationToken cancellationToken)
diff --git a/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs b/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
index 849b3b7095..77d55828d1 100644
--- a/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
+++ b/Jellyfin.Api/WebSocketListeners/ActivityLogWebSocketListener.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Jellyfin.Data.Events;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Api.WebSocketListeners
@@ -29,11 +30,14 @@ namespace Jellyfin.Api.WebSocketListeners
             _activityManager.EntryCreated += OnEntryCreated;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected override string Name => "ActivityLogEntry";
+        /// <inheritdoc />
+        protected override SessionMessageType Type => SessionMessageType.ActivityLogEntry;
+
+        /// <inheritdoc />
+        protected override SessionMessageType StartType => SessionMessageType.ActivityLogEntryStart;
+
+        /// <inheritdoc />
+        protected override SessionMessageType StopType => SessionMessageType.ActivityLogEntryStop;
 
         /// <summary>
         /// Gets the data to send.
diff --git a/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs b/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs
index 8a966c1376..80314b9236 100644
--- a/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs
+++ b/Jellyfin.Api/WebSocketListeners/ScheduledTasksWebSocketListener.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Data.Events;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
@@ -33,11 +34,14 @@ namespace Jellyfin.Api.WebSocketListeners
             _taskManager.TaskCompleted += OnTaskCompleted;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected override string Name => "ScheduledTasksInfo";
+        /// <inheritdoc />
+        protected override SessionMessageType Type => SessionMessageType.ScheduledTasksInfo;
+
+        /// <inheritdoc />
+        protected override SessionMessageType StartType => SessionMessageType.ScheduledTasksInfoStart;
+
+        /// <inheritdoc />
+        protected override SessionMessageType StopType => SessionMessageType.ScheduledTasksInfoStop;
 
         /// <summary>
         /// Gets the data to send.
diff --git a/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs b/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
index 1fb5dc412c..1cf43a0053 100644
--- a/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
+++ b/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Api.WebSocketListeners
@@ -34,7 +35,13 @@ namespace Jellyfin.Api.WebSocketListeners
         }
 
         /// <inheritdoc />
-        protected override string Name => "Sessions";
+        protected override SessionMessageType Type => SessionMessageType.Sessions;
+
+        /// <inheritdoc />
+        protected override SessionMessageType StartType => SessionMessageType.SessionsStart;
+
+        /// <inheritdoc />
+        protected override SessionMessageType StopType => SessionMessageType.SessionsStop;
 
         /// <summary>
         /// Gets the data to send.
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/System/TaskCompletedNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/System/TaskCompletedNotifier.cs
index 80ed56cd8f..0993c6df7b 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/System/TaskCompletedNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/System/TaskCompletedNotifier.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Tasks;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.System
@@ -25,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.System
         /// <inheritdoc />
         public async Task OnEvent(TaskCompletionEventArgs eventArgs)
         {
-            await _sessionManager.SendMessageToAdminSessions("ScheduledTaskEnded", eventArgs.Result, CancellationToken.None).ConfigureAwait(false);
+            await _sessionManager.SendMessageToAdminSessions(SessionMessageType.ScheduledTaskEnded, eventArgs.Result, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationCancelledNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationCancelledNotifier.cs
index 1c600683a9..1d790da6b2 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationCancelledNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationCancelledNotifier.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Events.Updates;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
 {
@@ -25,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
         /// <inheritdoc />
         public async Task OnEvent(PluginInstallationCancelledEventArgs eventArgs)
         {
-            await _sessionManager.SendMessageToAdminSessions("PackageInstallationCancelled", eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
+            await _sessionManager.SendMessageToAdminSessions(SessionMessageType.PackageInstallationCancelled, eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationFailedNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationFailedNotifier.cs
index ea0c878d42..a1faf18fc4 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationFailedNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallationFailedNotifier.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
 {
@@ -25,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
         /// <inheritdoc />
         public async Task OnEvent(InstallationFailedEventArgs eventArgs)
         {
-            await _sessionManager.SendMessageToAdminSessions("PackageInstallationFailed", eventArgs.InstallationInfo, CancellationToken.None).ConfigureAwait(false);
+            await _sessionManager.SendMessageToAdminSessions(SessionMessageType.PackageInstallationFailed, eventArgs.InstallationInfo, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstalledNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstalledNotifier.cs
index 3dda5a04c4..bd1a714045 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstalledNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstalledNotifier.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Events.Updates;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
 {
@@ -25,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
         /// <inheritdoc />
         public async Task OnEvent(PluginInstalledEventArgs eventArgs)
         {
-            await _sessionManager.SendMessageToAdminSessions("PackageInstallationCompleted", eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
+            await _sessionManager.SendMessageToAdminSessions(SessionMessageType.PackageInstallationCompleted, eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallingNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallingNotifier.cs
index f691d11a7d..b513ac64ae 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallingNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginInstallingNotifier.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Events.Updates;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
 {
@@ -25,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
         /// <inheritdoc />
         public async Task OnEvent(PluginInstallingEventArgs eventArgs)
         {
-            await _sessionManager.SendMessageToAdminSessions("PackageInstalling", eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
+            await _sessionManager.SendMessageToAdminSessions(SessionMessageType.PackageInstalling, eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginUninstalledNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginUninstalledNotifier.cs
index 709692f6bb..1fd7b9adfc 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginUninstalledNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginUninstalledNotifier.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Events.Updates;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
 {
@@ -25,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
         /// <inheritdoc />
         public async Task OnEvent(PluginUninstalledEventArgs eventArgs)
         {
-            await _sessionManager.SendMessageToAdminSessions("PluginUninstalled", eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
+            await _sessionManager.SendMessageToAdminSessions(SessionMessageType.PackageUninstalled, eventArgs.Argument, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Users/UserDeletedNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Users/UserDeletedNotifier.cs
index 10367a939b..303e886210 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Users/UserDeletedNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Users/UserDeletedNotifier.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Jellyfin.Data.Events.Users;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Users
 {
@@ -30,7 +31,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Users
         {
             await _sessionManager.SendMessageToUserSessions(
                 new List<Guid> { eventArgs.Argument.Id },
-                "UserDeleted",
+                SessionMessageType.UserDeleted,
                 eventArgs.Argument.Id.ToString("N", CultureInfo.InvariantCulture),
                 CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Users/UserUpdatedNotifier.cs b/Jellyfin.Server.Implementations/Events/Consumers/Users/UserUpdatedNotifier.cs
index 6081dd044f..a14911b94a 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Users/UserUpdatedNotifier.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Users/UserUpdatedNotifier.cs
@@ -6,6 +6,7 @@ using Jellyfin.Data.Events.Users;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 
 namespace Jellyfin.Server.Implementations.Events.Consumers.Users
 {
@@ -33,7 +34,7 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Users
         {
             await _sessionManager.SendMessageToUserSessions(
                 new List<Guid> { e.Argument.Id },
-                "UserUpdated",
+                SessionMessageType.UserUpdated,
                 _userManager.GetUserDto(e.Argument),
                 CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 916dea58be..28227603b2 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -8,6 +8,7 @@ using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.Net
@@ -28,10 +29,22 @@ namespace MediaBrowser.Controller.Net
             new List<Tuple<IWebSocketConnection, CancellationTokenSource, TStateType>>();
 
         /// <summary>
-        /// Gets the name.
+        /// Gets the type used for the messages sent to the client.
         /// </summary>
-        /// <value>The name.</value>
-        protected abstract string Name { get; }
+        /// <value>The type.</value>
+        protected abstract SessionMessageType Type { get; }
+
+        /// <summary>
+        /// Gets the message type received from the client to start sending messages.
+        /// </summary>
+        /// <value>The type.</value>
+        protected abstract SessionMessageType StartType { get; }
+
+        /// <summary>
+        /// Gets the message type received from the client to stop sending messages.
+        /// </summary>
+        /// <value>The type.</value>
+        protected abstract SessionMessageType StopType { get; }
 
         /// <summary>
         /// Gets the data to send.
@@ -66,12 +79,12 @@ namespace MediaBrowser.Controller.Net
                 throw new ArgumentNullException(nameof(message));
             }
 
-            if (string.Equals(message.MessageType, Name + "Start", StringComparison.OrdinalIgnoreCase))
+            if (message.MessageType == StartType)
             {
                 Start(message);
             }
 
-            if (string.Equals(message.MessageType, Name + "Stop", StringComparison.OrdinalIgnoreCase))
+            if (message.MessageType == StopType)
             {
                 Stop(message);
             }
@@ -159,7 +172,7 @@ namespace MediaBrowser.Controller.Net
                         new WebSocketMessage<TReturnDataType>
                         {
                             MessageId = Guid.NewGuid(),
-                            MessageType = Name,
+                            MessageType = Type,
                             Data = data
                         },
                         cancellationToken).ConfigureAwait(false);
@@ -176,7 +189,7 @@ namespace MediaBrowser.Controller.Net
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex, "Error sending web socket message {Name}", Name);
+                Logger.LogError(ex, "Error sending web socket message {Name}", Type);
                 DisposeConnection(tuple);
             }
         }
diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs
index 22d6e2a04e..bc4ccd44ca 100644
--- a/MediaBrowser.Controller/Session/ISessionController.cs
+++ b/MediaBrowser.Controller/Session/ISessionController.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Controller.Session
 {
@@ -23,6 +24,6 @@ namespace MediaBrowser.Controller.Session
         /// <summary>
         /// Sends the message.
         /// </summary>
-        Task SendMessage<T>(string name, Guid messageId, T data, CancellationToken cancellationToken);
+        Task SendMessage<T>(SessionMessageType name, Guid messageId, T data, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 228b2331dc..04c3004ee6 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -188,16 +188,16 @@ namespace MediaBrowser.Controller.Session
         /// <param name="data">The data.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendMessageToAdminSessions<T>(string name, T data, CancellationToken cancellationToken);
+        Task SendMessageToAdminSessions<T>(SessionMessageType name, T data, CancellationToken cancellationToken);
 
         /// <summary>
         /// Sends the message to user sessions.
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns>Task.</returns>
-        Task SendMessageToUserSessions<T>(List<Guid> userIds, string name, T data, CancellationToken cancellationToken);
+        Task SendMessageToUserSessions<T>(List<Guid> userIds, SessionMessageType name, T data, CancellationToken cancellationToken);
 
-        Task SendMessageToUserSessions<T>(List<Guid> userIds, string name, Func<T> dataFn, CancellationToken cancellationToken);
+        Task SendMessageToUserSessions<T>(List<Guid> userIds, SessionMessageType name, Func<T> dataFn, CancellationToken cancellationToken);
 
         /// <summary>
         /// Sends the message to user device sessions.
@@ -208,7 +208,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="data">The data.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendMessageToUserDeviceSessions<T>(string deviceId, string name, T data, CancellationToken cancellationToken);
+        Task SendMessageToUserDeviceSessions<T>(string deviceId, SessionMessageType name, T data, CancellationToken cancellationToken);
 
         /// <summary>
         /// Sends the restart required message.
diff --git a/MediaBrowser.Model/Net/WebSocketMessage.cs b/MediaBrowser.Model/Net/WebSocketMessage.cs
index 660eebeda6..bffbbe612d 100644
--- a/MediaBrowser.Model/Net/WebSocketMessage.cs
+++ b/MediaBrowser.Model/Net/WebSocketMessage.cs
@@ -2,6 +2,7 @@
 #pragma warning disable CS1591
 
 using System;
+using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Model.Net
 {
@@ -15,7 +16,7 @@ namespace MediaBrowser.Model.Net
         /// Gets or sets the type of the message.
         /// </summary>
         /// <value>The type of the message.</value>
-        public string MessageType { get; set; }
+        public SessionMessageType MessageType { get; set; }
 
         public Guid MessageId { get; set; }
 
diff --git a/MediaBrowser.Model/Session/SessionMessageType.cs b/MediaBrowser.Model/Session/SessionMessageType.cs
new file mode 100644
index 0000000000..23c41026dc
--- /dev/null
+++ b/MediaBrowser.Model/Session/SessionMessageType.cs
@@ -0,0 +1,50 @@
+#pragma warning disable CS1591
+
+namespace MediaBrowser.Model.Session
+{
+    /// <summary>
+    /// The different kinds of messages that are used in the WebSocket api.
+    /// </summary>
+    public enum SessionMessageType
+    {
+        // Server -> Client
+        ForceKeepAlive,
+        GeneralCommand,
+        UserDataChanged,
+        Sessions,
+        Play,
+        SyncPlayCommand,
+        SyncPlayGroupUpdate,
+        PlayState,
+        RestartRequired,
+        ServerShuttingDown,
+        ServerRestarting,
+        LibraryChanged,
+        UserDeleted,
+        UserUpdated,
+        SeriesTimerCreated,
+        TimerCreated,
+        SeriesTimerCancelled,
+        TimerCancelled,
+        RefreshProgress,
+        ScheduledTaskEnded,
+        PackageInstallationCancelled,
+        PackageInstallationFailed,
+        PackageInstallationCompleted,
+        PackageInstalling,
+        PackageUninstalled,
+        ActivityLogEntry,
+        ScheduledTasksInfo,
+
+        // Client -> Server
+        ActivityLogEntryStart,
+        ActivityLogEntryStop,
+        SessionsStart,
+        SessionsStop,
+        ScheduledTasksInfoStart,
+        ScheduledTasksInfoStop,
+
+        // Shared
+        KeepAlive,
+    }
+}

From ac790cd77b81a8235f6d1faf9512c85c96fcd088 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sun, 27 Sep 2020 09:45:11 -0600
Subject: [PATCH 129/247] Properly handle null structs in json

---
 .../Converters/JsonNullableStructConverter.cs | 39 ++++++++++---------
 .../JsonNullableStructConverterFactory.cs     | 27 +++++++++++++
 MediaBrowser.Common/Json/JsonDefaults.cs      |  7 +---
 3 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 MediaBrowser.Common/Json/Converters/JsonNullableStructConverterFactory.cs

diff --git a/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs b/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs
index cffc41ba34..0501f7b2a1 100644
--- a/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs
+++ b/MediaBrowser.Common/Json/Converters/JsonNullableStructConverter.cs
@@ -8,37 +8,38 @@ namespace MediaBrowser.Common.Json.Converters
     /// Converts a nullable struct or value to/from JSON.
     /// Required - some clients send an empty string.
     /// </summary>
-    /// <typeparam name="T">The struct type.</typeparam>
-    public class JsonNullableStructConverter<T> : JsonConverter<T?>
-        where T : struct
+    /// <typeparam name="TStruct">The struct type.</typeparam>
+    public class JsonNullableStructConverter<TStruct> : JsonConverter<TStruct?>
+        where TStruct : struct
     {
-        private readonly JsonConverter<T?> _baseJsonConverter;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonNullableStructConverter{T}"/> class.
-        /// </summary>
-        /// <param name="baseJsonConverter">The base json converter.</param>
-        public JsonNullableStructConverter(JsonConverter<T?> baseJsonConverter)
-        {
-            _baseJsonConverter = baseJsonConverter;
-        }
-
         /// <inheritdoc />
-        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override TStruct? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            // Handle empty string.
+            if (reader.TokenType == JsonTokenType.Null)
+            {
+                return null;
+            }
+
+            // Token is empty string.
             if (reader.TokenType == JsonTokenType.String && ((reader.HasValueSequence && reader.ValueSequence.IsEmpty) || reader.ValueSpan.IsEmpty))
             {
                 return null;
             }
 
-            return _baseJsonConverter.Read(ref reader, typeToConvert, options);
+            return JsonSerializer.Deserialize<TStruct>(ref reader, options);
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, TStruct? value, JsonSerializerOptions options)
         {
-            _baseJsonConverter.Write(writer, value, options);
+            if (value.HasValue)
+            {
+                JsonSerializer.Serialize(writer, value.Value, options);
+            }
+            else
+            {
+                writer.WriteNullValue();
+            }
         }
     }
 }
diff --git a/MediaBrowser.Common/Json/Converters/JsonNullableStructConverterFactory.cs b/MediaBrowser.Common/Json/Converters/JsonNullableStructConverterFactory.cs
new file mode 100644
index 0000000000..d5b54e3ca8
--- /dev/null
+++ b/MediaBrowser.Common/Json/Converters/JsonNullableStructConverterFactory.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MediaBrowser.Common.Json.Converters
+{
+    /// <summary>
+    /// Json nullable struct converter factory.
+    /// </summary>
+    public class JsonNullableStructConverterFactory : JsonConverterFactory
+    {
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeToConvert.IsGenericType
+                   && typeToConvert.GetGenericTypeDefinition() == typeof(Nullable<>)
+                   && typeToConvert.GenericTypeArguments[0].IsValueType;
+        }
+
+        /// <inheritdoc />
+        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            var structType = typeToConvert.GenericTypeArguments[0];
+            return (JsonConverter)Activator.CreateInstance(typeof(JsonNullableStructConverter<>).MakeGenericType(structType));
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index 67f7e8f14a..6605ae9624 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -39,14 +39,9 @@ namespace MediaBrowser.Common.Json
                 NumberHandling = JsonNumberHandling.AllowReadingFromString
             };
 
-            // Get built-in converters for fallback converting.
-            var baseNullableInt32Converter = (JsonConverter<int?>)options.GetConverter(typeof(int?));
-            var baseNullableInt64Converter = (JsonConverter<long?>)options.GetConverter(typeof(long?));
-
             options.Converters.Add(new JsonGuidConverter());
             options.Converters.Add(new JsonStringEnumConverter());
-            options.Converters.Add(new JsonNullableStructConverter<int>(baseNullableInt32Converter));
-            options.Converters.Add(new JsonNullableStructConverter<long>(baseNullableInt64Converter));
+            options.Converters.Add(new JsonNullableStructConverterFactory());
 
             return options;
         }

From 75041e7f39f76a39fcfae15d6cd2aee510b4d599 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 12:56:12 -0700
Subject: [PATCH 130/247] interlocked increment

---
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index ff485a18e7..d690a383d3 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Emby.Naming.Audio;
 using MediaBrowser.Controller.Entities.Audio;
@@ -132,7 +133,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             }
 
             var discSubfolderCount = 0;
-            var notMultiDisc = false;
 
             var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
             var parser = new AlbumParser(namingOptions);
@@ -149,18 +149,17 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                     if (parser.IsMultiPart(path))
                     {
                         logger.LogDebug("Found multi-disc folder: " + path);
-                        discSubfolderCount++;
+                        Interlocked.Increment(ref discSubfolderCount);
                     }
                     else
                     {
                         // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
-                        notMultiDisc = true;
                         state.Stop();
                     }
                 }
             });
 
-            if (notMultiDisc)
+            if (!result.IsCompleted)
             {
                 return false;
             }

From 3cfbe6e3401546a56abc826736578d9bfa054d99 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 13:28:19 -0700
Subject: [PATCH 131/247] better audio file check

---
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index d690a383d3..18ceb5e761 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -117,10 +117,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             ILibraryManager libraryManager)
         {
             // check for audio files before digging down into directories
-            var firstAudioFile = list
-                .Where(fileSystemInfo => !fileSystemInfo.IsDirectory)
-                .FirstOrDefault(fileSystemInfo => libraryManager.IsAudioFile(fileSystemInfo.FullName));
-            if (firstAudioFile != null)
+            var foundAudioFile = list.Any(fileSystemInfo => !fileSystemInfo.IsDirectory && libraryManager.IsAudioFile(fileSystemInfo.FullName));
+            if (foundAudioFile)
             {
                 // at least one audio file exists
                 return true;

From 12275e5e7bfe46e407606a977f1ca3a54fb9e62c Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 16:16:19 -0700
Subject: [PATCH 132/247] Fix invalid operation exception in
 TvdbEpisodeImageProvider.GetImages

---
 .../TheTvdb/TvdbEpisodeImageProvider.cs       | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeImageProvider.cs
index de2f6875f8..50a876d6c5 100644
--- a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeImageProvider.cs
@@ -57,21 +57,28 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
                 // Process images
                 try
                 {
-                    var episodeInfo = new EpisodeInfo
+                    string episodeTvdbId = null;
+
+                    if (episode.IndexNumber.HasValue && episode.ParentIndexNumber.HasValue)
                     {
-                        IndexNumber = episode.IndexNumber.Value,
-                        ParentIndexNumber = episode.ParentIndexNumber.Value,
-                        SeriesProviderIds = series.ProviderIds,
-                        SeriesDisplayOrder = series.DisplayOrder
-                    };
-                    string episodeTvdbId = await _tvdbClientManager
-                        .GetEpisodeTvdbId(episodeInfo, language, cancellationToken).ConfigureAwait(false);
+                        var episodeInfo = new EpisodeInfo
+                        {
+                            IndexNumber = episode.IndexNumber.Value,
+                            ParentIndexNumber = episode.ParentIndexNumber.Value,
+                            SeriesProviderIds = series.ProviderIds,
+                            SeriesDisplayOrder = series.DisplayOrder
+                        };
+
+                        episodeTvdbId = await _tvdbClientManager
+                            .GetEpisodeTvdbId(episodeInfo, language, cancellationToken).ConfigureAwait(false);
+                    }
+
                     if (string.IsNullOrEmpty(episodeTvdbId))
                     {
                         _logger.LogError(
                             "Episode {SeasonNumber}x{EpisodeNumber} not found for series {SeriesTvdbId}",
-                            episodeInfo.ParentIndexNumber,
-                            episodeInfo.IndexNumber,
+                            episode.ParentIndexNumber,
+                            episode.IndexNumber,
                             series.GetProviderId(MetadataProvider.Tvdb));
                         return imageResult;
                     }

From 303eccaffeb42eb39b04f3ed372dc9fe84de5455 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 16:22:52 -0700
Subject: [PATCH 133/247] Fix InvalidOperationException in TvdbSeriesProvider

---
 .../Plugins/TheTvdb/TvdbSeriesProvider.cs     | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
index ca9b1d738f..b637fc8b29 100644
--- a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
@@ -123,7 +123,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
                     await _tvdbClientManager
                         .GetSeriesByIdAsync(Convert.ToInt32(tvdbId), metadataLanguage, cancellationToken)
                         .ConfigureAwait(false);
-                MapSeriesToResult(result, seriesResult.Data, metadataLanguage);
+                await MapSeriesToResult(result, seriesResult.Data, metadataLanguage).ConfigureAwait(false);
             }
             catch (TvDbServerException e)
             {
@@ -297,7 +297,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
             return name.Trim();
         }
 
-        private void MapSeriesToResult(MetadataResult<Series> result, TvDbSharper.Dto.Series tvdbSeries, string metadataLanguage)
+        private async Task MapSeriesToResult(MetadataResult<Series> result, TvDbSharper.Dto.Series tvdbSeries, string metadataLanguage)
         {
             Series series = result.Item;
             series.SetProviderId(MetadataProvider.Tvdb, tvdbSeries.Id.ToString());
@@ -340,20 +340,25 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
             {
                 try
                 {
-                    var episodeSummary = _tvdbClientManager
-                        .GetSeriesEpisodeSummaryAsync(tvdbSeries.Id, metadataLanguage, CancellationToken.None).Result.Data;
-                    var maxSeasonNumber = episodeSummary.AiredSeasons.Select(s => Convert.ToInt32(s)).Max();
-                    var episodeQuery = new EpisodeQuery
+                    var episodeSummary = await _tvdbClientManager.GetSeriesEpisodeSummaryAsync(tvdbSeries.Id, metadataLanguage, CancellationToken.None).ConfigureAwait(false);
+
+                    if (episodeSummary.Data.AiredSeasons.Length > 0)
                     {
-                        AiredSeason = maxSeasonNumber
-                    };
-                    var episodesPage =
-                        _tvdbClientManager.GetEpisodesPageAsync(tvdbSeries.Id, episodeQuery, metadataLanguage, CancellationToken.None).Result.Data;
-                    result.Item.EndDate = episodesPage.Select(e =>
+                        var maxSeasonNumber = episodeSummary.Data.AiredSeasons.Select(s => Convert.ToInt32(s)).Max();
+                        var episodeQuery = new EpisodeQuery
                         {
-                            DateTime.TryParse(e.FirstAired, out var firstAired);
-                            return firstAired;
-                        }).Max();
+                            AiredSeason = maxSeasonNumber
+                        };
+                        var episodesPage = await _tvdbClientManager.GetEpisodesPageAsync(tvdbSeries.Id, episodeQuery, metadataLanguage, CancellationToken.None).ConfigureAwait(false);
+
+                        var episodeDates = episodesPage.Data
+                            .Select(e => DateTime.TryParse(e.FirstAired, out var firstAired) ? firstAired : (DateTime?)null)
+                            .Where(dt => dt.HasValue);
+                        if (episodeDates.Any())
+                        {
+                            result.Item.EndDate = episodeDates.Max().Value;
+                        }
+                    }
                 }
                 catch (TvDbServerException e)
                 {

From 881a7fa90805ac96d1e43c426c50dbe575297a9b Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 16:57:43 -0700
Subject: [PATCH 134/247] update based on suggestions

---
 .../Plugins/TheTvdb/TvdbSeriesProvider.cs            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
index b637fc8b29..cdb159c0f0 100644
--- a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -342,9 +343,9 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
                 {
                     var episodeSummary = await _tvdbClientManager.GetSeriesEpisodeSummaryAsync(tvdbSeries.Id, metadataLanguage, CancellationToken.None).ConfigureAwait(false);
 
-                    if (episodeSummary.Data.AiredSeasons.Length > 0)
+                    if (episodeSummary.Data.AiredSeasons.Length != 0)
                     {
-                        var maxSeasonNumber = episodeSummary.Data.AiredSeasons.Select(s => Convert.ToInt32(s)).Max();
+                        var maxSeasonNumber = episodeSummary.Data.AiredSeasons.Max(s => Convert.ToInt32(s, CultureInfo.InvariantCulture));
                         var episodeQuery = new EpisodeQuery
                         {
                             AiredSeason = maxSeasonNumber
@@ -353,10 +354,11 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
 
                         var episodeDates = episodesPage.Data
                             .Select(e => DateTime.TryParse(e.FirstAired, out var firstAired) ? firstAired : (DateTime?)null)
-                            .Where(dt => dt.HasValue);
-                        if (episodeDates.Any())
+                            .Where(dt => dt.HasValue)
+                            .ToList();
+                        if (episodeDates.Count != 0)
                         {
-                            result.Item.EndDate = episodeDates.Max().Value;
+                            result.Item.EndDate = episodeDates.Max();
                         }
                     }
                 }

From 89041982c212049469c2e292c6562a15daa7b9b5 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 17:02:10 -0700
Subject: [PATCH 135/247] Use ConcurrentDictionary's in DirectoryService

---
 .../Providers/DirectoryService.cs             | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index f77455485a..c4b58918c8 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -1,6 +1,7 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.IO;
@@ -11,11 +12,11 @@ namespace MediaBrowser.Controller.Providers
     {
         private readonly IFileSystem _fileSystem;
 
-        private readonly Dictionary<string, FileSystemMetadata[]> _cache = new Dictionary<string, FileSystemMetadata[]>(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, FileSystemMetadata[]> _cache = new ConcurrentDictionary<string, FileSystemMetadata[]>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly Dictionary<string, FileSystemMetadata> _fileCache = new Dictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, FileSystemMetadata> _fileCache = new ConcurrentDictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly Dictionary<string, List<string>> _filePathCache = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, List<string>> _filePathCache = new ConcurrentDictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
 
         public DirectoryService(IFileSystem fileSystem)
         {
@@ -24,14 +25,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata[] GetFileSystemEntries(string path)
         {
-            if (!_cache.TryGetValue(path, out FileSystemMetadata[] entries))
-            {
-                entries = _fileSystem.GetFileSystemEntries(path).ToArray();
-
-                _cache[path] = entries;
-            }
-
-            return entries;
+            return _cache.GetOrAdd(path, (p) => _fileSystem.GetFileSystemEntries(p).ToArray());
         }
 
         public List<FileSystemMetadata> GetFiles(string path)
@@ -51,21 +45,19 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata GetFile(string path)
         {
-            if (!_fileCache.TryGetValue(path, out FileSystemMetadata file))
+            var result = _fileCache.GetOrAdd(path, (p) =>
             {
-                file = _fileSystem.GetFileInfo(path);
+                var file = _fileSystem.GetFileInfo(path);
+                return (file != null && file.Exists) ? file : null;
+            });
 
-                if (file != null && file.Exists)
-                {
-                    _fileCache[path] = file;
-                }
-                else
-                {
-                    return null;
-                }
+            if (result == null)
+            {
+                // lets not store null results in the cache
+                _fileCache.TryRemove(path, out FileSystemMetadata removed);
             }
 
-            return file;
+            return result;
         }
 
         public IReadOnlyList<string> GetFilePaths(string path)
@@ -73,14 +65,12 @@ namespace MediaBrowser.Controller.Providers
 
         public IReadOnlyList<string> GetFilePaths(string path, bool clearCache)
         {
-            if (clearCache || !_filePathCache.TryGetValue(path, out List<string> result))
+            if (clearCache)
             {
-                result = _fileSystem.GetFilePaths(path).ToList();
-
-                _filePathCache[path] = result;
+                _filePathCache.TryRemove(path, out List<string> removed);
             }
 
-            return result;
+            return _filePathCache.GetOrAdd(path, (p) => _fileSystem.GetFilePaths(path).ToList());
         }
     }
 }

From 449f7e1b1e425e646ee1bcef2b1464df8b01d90e Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 17:24:12 -0700
Subject: [PATCH 136/247] update based on suggestions

---
 MediaBrowser.Controller/Providers/DirectoryService.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index c4b58918c8..53c6f9eb0b 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata[] GetFileSystemEntries(string path)
         {
-            return _cache.GetOrAdd(path, (p) => _fileSystem.GetFileSystemEntries(p).ToArray());
+            return _cache.GetOrAdd(path, p => _fileSystem.GetFileSystemEntries(p).ToArray());
         }
 
         public List<FileSystemMetadata> GetFiles(string path)
@@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata GetFile(string path)
         {
-            var result = _fileCache.GetOrAdd(path, (p) =>
+            var result = _fileCache.GetOrAdd(path, p =>
             {
                 var file = _fileSystem.GetFileInfo(path);
                 return (file != null && file.Exists) ? file : null;
@@ -54,7 +54,7 @@ namespace MediaBrowser.Controller.Providers
             if (result == null)
             {
                 // lets not store null results in the cache
-                _fileCache.TryRemove(path, out FileSystemMetadata removed);
+                _fileCache.TryRemove(path, out _);
             }
 
             return result;
@@ -67,10 +67,10 @@ namespace MediaBrowser.Controller.Providers
         {
             if (clearCache)
             {
-                _filePathCache.TryRemove(path, out List<string> removed);
+                _filePathCache.TryRemove(path, out _);
             }
 
-            return _filePathCache.GetOrAdd(path, (p) => _fileSystem.GetFilePaths(path).ToList());
+            return _filePathCache.GetOrAdd(path, p => _fileSystem.GetFilePaths(path).ToList());
         }
     }
 }

From 50c9083bc03c78ae2f87ca7bd960b5c44834c944 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 17:25:08 -0700
Subject: [PATCH 137/247] remove unnecessary parentheses

---
 MediaBrowser.Controller/Providers/DirectoryService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index 53c6f9eb0b..73731783d0 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Controller.Providers
             var result = _fileCache.GetOrAdd(path, p =>
             {
                 var file = _fileSystem.GetFileInfo(path);
-                return (file != null && file.Exists) ? file : null;
+                return file != null && file.Exists ? file : null;
             });
 
             if (result == null)

From eb04773c796bb5858ff37be6552f2ce088ee8f9a Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 17:34:36 -0700
Subject: [PATCH 138/247] Use the get or add argument

---
 MediaBrowser.Controller/Providers/DirectoryService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index 73731783d0..16fd1d42b0 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Controller.Providers
         {
             var result = _fileCache.GetOrAdd(path, p =>
             {
-                var file = _fileSystem.GetFileInfo(path);
+                var file = _fileSystem.GetFileInfo(p);
                 return file != null && file.Exists ? file : null;
             });
 
@@ -70,7 +70,7 @@ namespace MediaBrowser.Controller.Providers
                 _filePathCache.TryRemove(path, out _);
             }
 
-            return _filePathCache.GetOrAdd(path, p => _fileSystem.GetFilePaths(path).ToList());
+            return _filePathCache.GetOrAdd(path, p => _fileSystem.GetFilePaths(p).ToList());
         }
     }
 }

From 3ca9b13f99a863fee2a2b335555311cc1e9665aa Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 21:47:30 -0700
Subject: [PATCH 139/247] Check response status code before saving images

---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index b6fb4267f4..6674ca6761 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -158,6 +158,14 @@ namespace MediaBrowser.Providers.Manager
             var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);
             using var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false);
 
+            if (response.StatusCode != HttpStatusCode.OK)
+            {
+                throw new HttpException($"Invalid image received ({response.StatusCode}).")
+                {
+                    StatusCode = response.StatusCode
+                };
+            }
+
             var contentType = response.Content.Headers.ContentType.MediaType;
 
             // Workaround for tvheadend channel icons

From 722ec43e258eb9e6af4c0cd09f68a4a969e50cc8 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Sun, 27 Sep 2020 23:05:43 -0700
Subject: [PATCH 140/247] remove status code from exception message

---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 6674ca6761..a0c7d4ad09 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -160,7 +160,7 @@ namespace MediaBrowser.Providers.Manager
 
             if (response.StatusCode != HttpStatusCode.OK)
             {
-                throw new HttpException($"Invalid image received ({response.StatusCode}).")
+                throw new HttpException("Invalid image received.")
                 {
                     StatusCode = response.StatusCode
                 };

From 61c1bdb6dfaef5e6c34748b495f2537c710d411b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:00:38 +0000
Subject: [PATCH 141/247] Bump Swashbuckle.AspNetCore.ReDoc from 5.5.1 to 5.6.3

Bumps [Swashbuckle.AspNetCore.ReDoc](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.5.1 to 5.6.3.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.5.1...v5.6.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Jellyfin.Api/Jellyfin.Api.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Jellyfin.Api.csproj b/Jellyfin.Api/Jellyfin.Api.csproj
index c27dce8ddf..c3f43b872d 100644
--- a/Jellyfin.Api/Jellyfin.Api.csproj
+++ b/Jellyfin.Api/Jellyfin.Api.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="5.5.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="5.6.3" />
   </ItemGroup>
 
   <ItemGroup>

From c0afaef9856c2f55e4ab6da55f93268f61281cfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:00:42 +0000
Subject: [PATCH 142/247] Bump IPNetwork2 from 2.5.224 to 2.5.226

Bumps [IPNetwork2](https://github.com/lduchosal/ipnetwork) from 2.5.224 to 2.5.226.
- [Release notes](https://github.com/lduchosal/ipnetwork/releases)
- [Commits](https://github.com/lduchosal/ipnetwork/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Emby.Server.Implementations/Emby.Server.Implementations.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index c84c7b53df..20510922ce 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IPNetwork2" Version="2.5.224" />
+    <PackageReference Include="IPNetwork2" Version="2.5.226" />
     <PackageReference Include="Jellyfin.XmlTv" Version="10.6.2" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />

From 5b6b66f7b3cdbba8258d5b408d394eee3b6e2fa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:00:43 +0000
Subject: [PATCH 143/247] Bump BlurHashSharp from 1.1.0 to 1.1.1

Bumps [BlurHashSharp](https://github.com/Bond-009/BlurHashSharp) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/Bond-009/BlurHashSharp/releases)
- [Commits](https://github.com/Bond-009/BlurHashSharp/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index f86b142449..08bb840f00 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlurHashSharp" Version="1.1.0" />
+    <PackageReference Include="BlurHashSharp" Version="1.1.1" />
     <PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.1.0" />
     <PackageReference Include="SkiaSharp" Version="2.80.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" />

From 45faf5608528e3d7f805df10dbe974a46aa680ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:00:45 +0000
Subject: [PATCH 144/247] Bump Serilog.Sinks.Graylog from 2.1.3 to 2.2.1

Bumps [Serilog.Sinks.Graylog](https://github.com/whir1/serilog-sinks-graylog) from 2.1.3 to 2.2.1.
- [Release notes](https://github.com/whir1/serilog-sinks-graylog/releases)
- [Commits](https://github.com/whir1/serilog-sinks-graylog/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Jellyfin.Server/Jellyfin.Server.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 648172fbf7..fa5d29a437 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="Serilog.Sinks.Graylog" Version="2.1.3" />
+    <PackageReference Include="Serilog.Sinks.Graylog" Version="2.2.1" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
     <PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.14" />
   </ItemGroup>

From 5eb54be1e3045b69e2ef6748867397b7406963ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:00:45 +0000
Subject: [PATCH 145/247] Bump TvDbSharper from 3.2.1 to 3.2.2

Bumps [TvDbSharper](https://github.com/HristoKolev/TvDbSharper) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/HristoKolev/TvDbSharper/releases)
- [Changelog](https://github.com/HristoKolev/TvDbSharper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/HristoKolev/TvDbSharper/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 MediaBrowser.Providers/MediaBrowser.Providers.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 51ca26361d..813dd441f5 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="OptimizedPriorityQueue" Version="4.2.0" />
     <PackageReference Include="PlaylistsNET" Version="1.1.2" />
-    <PackageReference Include="TvDbSharper" Version="3.2.1" />
+    <PackageReference Include="TvDbSharper" Version="3.2.2" />
   </ItemGroup>
 
   <PropertyGroup>

From baa35cfc990ba99bf8223f2bbddf20b8f3131fcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:00:47 +0000
Subject: [PATCH 146/247] Bump Mono.Nat from 2.0.2 to 3.0.0

Bumps [Mono.Nat](https://github.com/mono/Mono.Nat) from 2.0.2 to 3.0.0.
- [Release notes](https://github.com/mono/Mono.Nat/releases)
- [Commits](https://github.com/mono/Mono.Nat/compare/release-v2.0.2...release-v3.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Emby.Server.Implementations/Emby.Server.Implementations.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index c84c7b53df..0793526271 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -36,7 +36,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" />
-    <PackageReference Include="Mono.Nat" Version="2.0.2" />
+    <PackageReference Include="Mono.Nat" Version="3.0.0" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="3.4.0" />
     <PackageReference Include="ServiceStack.Text.Core" Version="5.9.2" />
     <PackageReference Include="sharpcompress" Version="0.26.0" />

From e84cfc688b214d1f3eaeb63ce6f50276e6ffcc06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 14:48:34 +0000
Subject: [PATCH 147/247] Bump BlurHashSharp.SkiaSharp from 1.1.0 to 1.1.1

Bumps [BlurHashSharp.SkiaSharp](https://github.com/Bond-009/BlurHashSharp) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/Bond-009/BlurHashSharp/releases)
- [Commits](https://github.com/Bond-009/BlurHashSharp/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index 08bb840f00..c11ac5fb37 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="BlurHashSharp" Version="1.1.1" />
-    <PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.1.0" />
+    <PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.1.1" />
     <PackageReference Include="SkiaSharp" Version="2.80.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" />
   </ItemGroup>

From a26ff8655311dad11f80d2daccc7e2cd632d1a43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2020 14:50:39 +0000
Subject: [PATCH 148/247] Bump Swashbuckle.AspNetCore from 5.5.1 to 5.6.3

Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.5.1 to 5.6.3.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.5.1...v5.6.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Jellyfin.Api/Jellyfin.Api.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Jellyfin.Api.csproj b/Jellyfin.Api/Jellyfin.Api.csproj
index c3f43b872d..6a00db4b1a 100644
--- a/Jellyfin.Api/Jellyfin.Api.csproj
+++ b/Jellyfin.Api/Jellyfin.Api.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.8" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="5.6.3" />
   </ItemGroup>
 

From 53d5f64e037c13c295d82fcb98b91ef2de8fc842 Mon Sep 17 00:00:00 2001
From: Matt Montgomery <33811686+ConfusedPolarBear@users.noreply.github.com>
Date: Mon, 28 Sep 2020 15:04:31 -0500
Subject: [PATCH 149/247] Fix SA1513, SA1514, SA1507, and SA1508

---
 .../Data/SqliteItemRepository.cs                   |  3 ---
 Emby.Server.Implementations/Dto/DtoService.cs      |  1 -
 .../EntryPoints/UserDataChangeNotifier.cs          |  1 -
 .../LiveTv/Listings/SchedulesDirect.cs             |  8 --------
 .../LiveTv/LiveTvManager.cs                        |  1 +
 .../Updates/InstallationManager.cs                 |  1 +
 .../Channels/InternalChannelFeatures.cs            |  2 ++
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |  1 -
 MediaBrowser.Controller/Entities/BaseItem.cs       |  2 ++
 MediaBrowser.Controller/Entities/Folder.cs         |  1 -
 .../Entities/IHasMediaSources.cs                   |  2 --
 MediaBrowser.Controller/Entities/Photo.cs          |  1 -
 MediaBrowser.Controller/Entities/TV/Series.cs      |  1 -
 .../Entities/UserViewBuilder.cs                    |  1 -
 MediaBrowser.Controller/IO/FileData.cs             |  1 -
 MediaBrowser.Controller/Library/ILibraryManager.cs |  2 ++
 .../Library/IMediaSourceManager.cs                 |  2 ++
 MediaBrowser.Controller/Library/ItemResolveArgs.cs |  1 +
 MediaBrowser.Controller/LiveTv/ILiveTvManager.cs   |  1 +
 MediaBrowser.Controller/LiveTv/ITunerHost.cs       |  1 -
 .../LiveTv/LiveTvServiceStatusInfo.cs              |  1 +
 MediaBrowser.Controller/LiveTv/ProgramInfo.cs      |  7 +++++++
 MediaBrowser.Controller/LiveTv/RecordingInfo.cs    |  1 +
 MediaBrowser.Controller/LiveTv/TimerInfo.cs        |  1 +
 .../MediaEncoding/EncodingHelper.cs                |  4 +---
 .../MediaEncoding/EncodingJobInfo.cs               |  2 ++
 .../Persistence/IItemRepository.cs                 |  1 +
 MediaBrowser.Controller/Resolvers/IItemResolver.cs |  1 +
 MediaBrowser.Controller/Session/SessionInfo.cs     |  1 -
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 14 +++++++++++++-
 MediaBrowser.Model/Dlna/StreamInfo.cs              |  1 -
 MediaBrowser.Model/Dto/BaseItemDto.cs              |  8 ++++++++
 MediaBrowser.Model/Entities/MediaStream.cs         |  2 ++
 MediaBrowser.Model/Entities/MetadataProvider.cs    |  4 ++++
 MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs    |  1 +
 MediaBrowser.Model/Providers/RemoteImageInfo.cs    |  1 -
 MediaBrowser.Model/Providers/RemoteSearchResult.cs |  1 -
 MediaBrowser.Model/Querying/ItemFields.cs          |  1 +
 .../Querying/UpcomingEpisodesQuery.cs              |  3 +++
 MediaBrowser.Model/Session/PlaybackProgressInfo.cs |  3 +++
 MediaBrowser.Model/Sync/SyncCategory.cs            |  2 ++
 MediaBrowser.Model/System/SystemInfo.cs            |  5 ++++-
 .../Tasks/IConfigurableScheduledTask.cs            |  1 +
 .../Plugins/MusicBrainz/ArtistProvider.cs          |  1 +
 .../MusicBrainz/MusicBrainzAlbumProvider.cs        |  4 ++++
 .../Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs    |  1 -
 MediaBrowser.Providers/TV/DummySeasonProvider.cs   |  1 -
 47 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index ab60cee618..d09f84e174 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -2263,7 +2263,6 @@ namespace Emby.Server.Implementations.Data
             return query.IncludeItemTypes.Contains("Trailer", StringComparer.OrdinalIgnoreCase);
         }
 
-
         private static readonly HashSet<string> _artistExcludeParentTypes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "Series",
@@ -3291,7 +3290,6 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
             var statementTexts = new List<string>();
@@ -6006,7 +6004,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             }
         }
 
-
         /// <summary>
         /// Gets the chapter.
         /// </summary>
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 94cfed767b..677ad522ac 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -468,7 +468,6 @@ namespace Emby.Server.Implementations.Dto
                     IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
                     Name = item.Album,
                     Limit = 1
-
                 });
 
                 if (parentAlbumIds.Count > 0)
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index 3618b88c5d..1da717e752 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -28,7 +28,6 @@ namespace Emby.Server.Implementations.EntryPoints
         private readonly object _syncLock = new object();
         private Timer _updateTimer;
 
-
         public UserDataChangeNotifier(IUserDataManager userDataManager, ISessionManager sessionManager, IUserManager userManager)
         {
             _userDataManager = userDataManager;
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 655ff58537..28aabc1599 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -874,7 +874,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public List<Lineup> lineups { get; set; }
             }
 
-
             public class Headends
             {
                 public string headend { get; set; }
@@ -886,8 +885,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public List<Lineup> lineups { get; set; }
             }
 
-
-
             public class Map
             {
                 public string stationID { get; set; }
@@ -971,9 +968,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public List<string> date { get; set; }
             }
 
-
-
-
             public class Rating
             {
                 public string body { get; set; }
@@ -1017,8 +1011,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 public string isPremiereOrFinale { get; set; }
             }
 
-
-
             public class MetadataSchedule
             {
                 public string modified { get; set; }
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index a898a564fa..5bdd1c23c4 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -2135,6 +2135,7 @@ namespace Emby.Server.Implementations.LiveTv
         }
 
         private bool _disposed = false;
+
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 8e24bf55ce..8a6181be6b 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -393,6 +393,7 @@ namespace Emby.Server.Implementations.Updates
                     // Ignore any exceptions.
                 }
             }
+
             stream.Position = 0;
             _zipClient.ExtractAllFromZip(stream, targetDir, true);
 
diff --git a/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs b/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
index 1074ce435e..137f5d095b 100644
--- a/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
+++ b/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
@@ -42,6 +42,7 @@ namespace MediaBrowser.Controller.Channels
         /// Indicates if a sort ascending/descending toggle is supported or not.
         /// </summary>
         public bool SupportsSortOrderToggle { get; set; }
+
         /// <summary>
         /// Gets or sets the automatic refresh levels.
         /// </summary>
@@ -53,6 +54,7 @@ namespace MediaBrowser.Controller.Channels
         /// </summary>
         /// <value>The daily download limit.</value>
         public int? DailyDownloadLimit { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [supports downloading].
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 2c6dea02cd..8220464b39 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -90,7 +90,6 @@ namespace MediaBrowser.Controller.Entities.Audio
 
             var songKey = IndexNumber.HasValue ? IndexNumber.Value.ToString("0000") : string.Empty;
 
-
             if (ParentIndexNumber.HasValue)
             {
                 songKey = ParentIndexNumber.Value.ToString("0000") + "-" + songKey;
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 68126bd8a8..2fc7d45c90 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -197,6 +197,7 @@ namespace MediaBrowser.Controller.Entities
         public virtual bool SupportsRemoteImageDownloading => true;
 
         private string _name;
+
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
@@ -661,6 +662,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         private string _forcedSortName;
+
         /// <summary>
         /// Gets or sets the name of the forced sort.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 11542c1cad..901ea875bc 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1386,7 +1386,6 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-
         /// <summary>
         /// Gets the linked children.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/IHasMediaSources.cs b/MediaBrowser.Controller/Entities/IHasMediaSources.cs
index a7b60d1688..0f612262a8 100644
--- a/MediaBrowser.Controller/Entities/IHasMediaSources.cs
+++ b/MediaBrowser.Controller/Entities/IHasMediaSources.cs
@@ -21,7 +21,5 @@ namespace MediaBrowser.Controller.Entities
         List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution);
 
         List<MediaStream> GetMediaStreams();
-
-
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs
index 1485d4c792..2fc66176f6 100644
--- a/MediaBrowser.Controller/Entities/Photo.cs
+++ b/MediaBrowser.Controller/Entities/Photo.cs
@@ -16,7 +16,6 @@ namespace MediaBrowser.Controller.Entities
         [JsonIgnore]
         public override Folder LatestItemsIndexContainer => AlbumEntity;
 
-
         [JsonIgnore]
         public PhotoAlbum AlbumEntity
         {
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 72c696c1ae..75a746bfb3 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -450,7 +450,6 @@ namespace MediaBrowser.Controller.Entities.TV
             });
         }
 
-
         protected override bool GetBlockUnratedValue(User user)
         {
             return user.GetPreference(PreferenceKind.BlockUnratedItems).Contains(UnratedItem.Series.ToString());
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index b384b27d1a..068a767698 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -258,7 +258,6 @@ namespace MediaBrowser.Controller.Entities
                 IncludeItemTypes = new[] { typeof(Movie).Name },
                 Recursive = true,
                 EnableTotalRecordCount = false
-
             }).Items
                 .SelectMany(i => i.Genres)
                 .DistinctNames()
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 9bc4cac39d..3db60ae0bb 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -111,5 +111,4 @@ namespace MediaBrowser.Controller.IO
             return returnResult;
         }
     }
-
 }
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 804170d5c9..332730bcca 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -77,6 +77,7 @@ namespace MediaBrowser.Controller.Library
         MusicArtist GetArtist(string name);
 
         MusicArtist GetArtist(string name, DtoOptions options);
+
         /// <summary>
         /// Gets a Studio.
         /// </summary>
@@ -234,6 +235,7 @@ namespace MediaBrowser.Controller.Library
         /// Occurs when [item updated].
         /// </summary>
         event EventHandler<ItemChangeEventArgs> ItemUpdated;
+
         /// <summary>
         /// Occurs when [item removed].
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index 9e7b1e6085..22bf9488f7 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -28,12 +28,14 @@ namespace MediaBrowser.Controller.Library
         /// <param name="itemId">The item identifier.</param>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
         List<MediaStream> GetMediaStreams(Guid itemId);
+
         /// <summary>
         /// Gets the media streams.
         /// </summary>
         /// <param name="mediaSourceId">The media source identifier.</param>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
         List<MediaStream> GetMediaStreams(string mediaSourceId);
+
         /// <summary>
         /// Gets the media streams.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 6a0dbeba2f..12a311dc33 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -156,6 +156,7 @@ namespace MediaBrowser.Controller.Library
         }
 
         // REVIEW: @bond
+
         /// <summary>
         /// Gets the physical locations.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 55c3309317..6c365caa46 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -231,6 +231,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// Saves the tuner host.
         /// </summary>
         Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info, bool dataSourceChanged = true);
+
         /// <summary>
         /// Saves the listing provider.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/ITunerHost.cs b/MediaBrowser.Controller/LiveTv/ITunerHost.cs
index ff92bf856c..abca8f2390 100644
--- a/MediaBrowser.Controller/LiveTv/ITunerHost.cs
+++ b/MediaBrowser.Controller/LiveTv/ITunerHost.cs
@@ -56,7 +56,6 @@ namespace MediaBrowser.Controller.LiveTv
         Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(string channelId, CancellationToken cancellationToken);
 
         Task<List<TunerHostInfo>> DiscoverDevices(int discoveryDurationMs, CancellationToken cancellationToken);
-
     }
 
     public interface IConfigurableTunerHost
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs b/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
index 02178297b1..b629749049 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
@@ -42,6 +42,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The tuners.</value>
         public List<LiveTvTunerInfo> Tuners { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance is visible.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/ProgramInfo.cs b/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
index bdcffd5cae..f9f559ee96 100644
--- a/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
@@ -35,6 +35,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The overview.</value>
         public string Overview { get; set; }
+
         /// <summary>
         /// Gets or sets the short overview.
         /// </summary>
@@ -169,31 +170,37 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The production year.</value>
         public int? ProductionYear { get; set; }
+
         /// <summary>
         /// Gets or sets the home page URL.
         /// </summary>
         /// <value>The home page URL.</value>
         public string HomePageUrl { get; set; }
+
         /// <summary>
         /// Gets or sets the series identifier.
         /// </summary>
         /// <value>The series identifier.</value>
         public string SeriesId { get; set; }
+
         /// <summary>
         /// Gets or sets the show identifier.
         /// </summary>
         /// <value>The show identifier.</value>
         public string ShowId { get; set; }
+
         /// <summary>
         /// Gets or sets the season number.
         /// </summary>
         /// <value>The season number.</value>
         public int? SeasonNumber { get; set; }
+
         /// <summary>
         /// Gets or sets the episode number.
         /// </summary>
         /// <value>The episode number.</value>
         public int? EpisodeNumber { get; set; }
+
         /// <summary>
         /// Gets or sets the etag.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
index 303882b7ef..69190694ff 100644
--- a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
@@ -187,6 +187,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>null</c> if [has image] contains no value, <c>true</c> if [has image]; otherwise, <c>false</c>.</value>
         public bool? HasImage { get; set; }
+
         /// <summary>
         /// Gets or sets the show identifier.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/TimerInfo.cs b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
index bcef4666d2..aa5170617d 100644
--- a/MediaBrowser.Controller/LiveTv/TimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
@@ -113,6 +113,7 @@ namespace MediaBrowser.Controller.LiveTv
 
         // Program properties
         public int? SeasonNumber { get; set; }
+
         /// <summary>
         /// Gets or sets the episode number.
         /// </summary>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 2c30ca4588..c5529ad5bd 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -109,7 +109,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
 
             return _mediaEncoder.SupportsHwaccel("vaapi");
-
         }
 
         /// <summary>
@@ -508,6 +507,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                                 arg.Append("-hwaccel qsv ");
                             }
                         }
+
                         // While using SW decoder
                         else
                         {
@@ -1441,7 +1441,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             var codec = outputAudioCodec ?? string.Empty;
 
-
             int? transcoderChannelLimit;
             if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
             {
@@ -2511,7 +2510,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             return inputModifier;
         }
 
-
         public void AttachMediaSourceInfo(
             EncodingJobInfo state,
             MediaSourceInfo mediaSource,
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 68bc502a0f..c7ec878d2d 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -697,10 +697,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// The progressive.
         /// </summary>
         Progressive,
+
         /// <summary>
         /// The HLS.
         /// </summary>
         Hls,
+
         /// <summary>
         /// The dash.
         /// </summary>
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index ebc37bd1f3..45c6805f0e 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -100,6 +100,7 @@ namespace MediaBrowser.Controller.Persistence
         /// <param name="query">The query.</param>
         /// <returns>IEnumerable&lt;Guid&gt;.</returns>
         QueryResult<Guid> GetItemIds(InternalItemsQuery query);
+
         /// <summary>
         /// Gets the items.
         /// </summary>
diff --git a/MediaBrowser.Controller/Resolvers/IItemResolver.cs b/MediaBrowser.Controller/Resolvers/IItemResolver.cs
index b99c468435..eb7fb793a4 100644
--- a/MediaBrowser.Controller/Resolvers/IItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/IItemResolver.cs
@@ -19,6 +19,7 @@ namespace MediaBrowser.Controller.Resolvers
         /// <param name="args">The args.</param>
         /// <returns>BaseItem.</returns>
         BaseItem ResolvePath(ItemResolveArgs args);
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index 054fd33d9d..55e44c19db 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -22,7 +22,6 @@ namespace MediaBrowser.Controller.Session
         private readonly ISessionManager _sessionManager;
         private readonly ILogger _logger;
 
-
         private readonly object _progressLock = new object();
         private Timer _progressTimer;
         private PlaybackProgressInfo _lastProgressInfo;
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index cfe862f5a9..d9e7e4fbb4 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -498,7 +498,6 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-
             if (playMethods.Count > 0)
             {
                 transcodeReasons.Clear();
@@ -1431,6 +1430,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.AudioChannels:
                         {
                             if (string.IsNullOrEmpty(qualifier))
@@ -1466,6 +1466,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.IsAvc:
                         {
                             if (!enableNonQualifiedConditions)
@@ -1487,6 +1488,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.IsAnamorphic:
                         {
                             if (!enableNonQualifiedConditions)
@@ -1508,6 +1510,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.IsInterlaced:
                         {
                             if (string.IsNullOrEmpty(qualifier))
@@ -1539,6 +1542,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.AudioProfile:
                     case ProfileConditionValue.Has64BitOffsets:
                     case ProfileConditionValue.PacketLength:
@@ -1550,6 +1554,7 @@ namespace MediaBrowser.Model.Dlna
                             // Not supported yet
                             break;
                         }
+
                     case ProfileConditionValue.RefFrames:
                         {
                             if (string.IsNullOrEmpty(qualifier))
@@ -1585,6 +1590,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.VideoBitDepth:
                         {
                             if (string.IsNullOrEmpty(qualifier))
@@ -1620,6 +1626,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.VideoProfile:
                         {
                             if (string.IsNullOrEmpty(qualifier))
@@ -1643,6 +1650,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.Height:
                         {
                             if (!enableNonQualifiedConditions)
@@ -1668,6 +1676,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.VideoBitrate:
                         {
                             if (!enableNonQualifiedConditions)
@@ -1693,6 +1702,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.VideoFramerate:
                         {
                             if (!enableNonQualifiedConditions)
@@ -1718,6 +1728,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.VideoLevel:
                         {
                             if (string.IsNullOrEmpty(qualifier))
@@ -1743,6 +1754,7 @@ namespace MediaBrowser.Model.Dlna
 
                             break;
                         }
+
                     case ProfileConditionValue.Width:
                         {
                             if (!enableNonQualifiedConditions)
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 94d53ab70e..9399d21f16 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -276,7 +276,6 @@ namespace MediaBrowser.Model.Dlna
 
             list.Add(new NameValuePair("SubtitleMethod", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleDeliveryMethod.ToString() : string.Empty));
 
-
             if (!item.IsDirectStream)
             {
                 if (item.RequireNonAnamorphic)
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index af3d83adec..fac7541773 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -429,6 +429,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The album id.</value>
         public Guid AlbumId { get; set; }
+
         /// <summary>
         /// Gets or sets the album image tag.
         /// </summary>
@@ -599,11 +600,13 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The trailer count.</value>
         public int? TrailerCount { get; set; }
+
         /// <summary>
         /// Gets or sets the movie count.
         /// </summary>
         /// <value>The movie count.</value>
         public int? MovieCount { get; set; }
+
         /// <summary>
         /// Gets or sets the series count.
         /// </summary>
@@ -611,16 +614,19 @@ namespace MediaBrowser.Model.Dto
         public int? SeriesCount { get; set; }
 
         public int? ProgramCount { get; set; }
+
         /// <summary>
         /// Gets or sets the episode count.
         /// </summary>
         /// <value>The episode count.</value>
         public int? EpisodeCount { get; set; }
+
         /// <summary>
         /// Gets or sets the song count.
         /// </summary>
         /// <value>The song count.</value>
         public int? SongCount { get; set; }
+
         /// <summary>
         /// Gets or sets the album count.
         /// </summary>
@@ -628,6 +634,7 @@ namespace MediaBrowser.Model.Dto
         public int? AlbumCount { get; set; }
 
         public int? ArtistCount { get; set; }
+
         /// <summary>
         /// Gets or sets the music video count.
         /// </summary>
@@ -768,6 +775,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The timer identifier.</value>
         public string TimerId { get; set; }
+
         /// <summary>
         /// Gets or sets the current program.
         /// </summary>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 2d37618c27..fa3c9aaa2f 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -451,11 +451,13 @@ namespace MediaBrowser.Model.Entities
         /// </summary>
         /// <value>The method.</value>
         public SubtitleDeliveryMethod? DeliveryMethod { get; set; }
+
         /// <summary>
         /// Gets or sets the delivery URL.
         /// </summary>
         /// <value>The delivery URL.</value>
         public string DeliveryUrl { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance is external URL.
         /// </summary>
diff --git a/MediaBrowser.Model/Entities/MetadataProvider.cs b/MediaBrowser.Model/Entities/MetadataProvider.cs
index 7fecf67b8e..e9c098021d 100644
--- a/MediaBrowser.Model/Entities/MetadataProvider.cs
+++ b/MediaBrowser.Model/Entities/MetadataProvider.cs
@@ -11,18 +11,22 @@ namespace MediaBrowser.Model.Entities
         /// The imdb.
         /// </summary>
         Imdb = 2,
+
         /// <summary>
         /// The TMDB.
         /// </summary>
         Tmdb = 3,
+
         /// <summary>
         /// The TVDB.
         /// </summary>
         Tvdb = 4,
+
         /// <summary>
         /// The tvcom.
         /// </summary>
         Tvcom = 5,
+
         /// <summary>
         /// Tmdb Collection Id.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index ab74aff28b..bcba344cc5 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -84,6 +84,7 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
         public bool? IsKids { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance is sports.
         /// </summary>
diff --git a/MediaBrowser.Model/Providers/RemoteImageInfo.cs b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
index 78ab6c706c..fb25999e0a 100644
--- a/MediaBrowser.Model/Providers/RemoteImageInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
@@ -68,5 +68,4 @@ namespace MediaBrowser.Model.Providers
         /// <value>The type of the rating.</value>
         public RatingType RatingType { get; set; }
     }
-
 }
diff --git a/MediaBrowser.Model/Providers/RemoteSearchResult.cs b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
index 989741c01a..a29e7ad1c5 100644
--- a/MediaBrowser.Model/Providers/RemoteSearchResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
@@ -50,6 +50,5 @@ namespace MediaBrowser.Model.Providers
         public RemoteSearchResult AlbumArtist { get; set; }
 
         public RemoteSearchResult[] Artists { get; set; }
-
     }
 }
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 731d22aaf8..ef4698f3f9 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -168,6 +168,7 @@ namespace MediaBrowser.Model.Querying
         Studios,
 
         BasicSyncInfo,
+
         /// <summary>
         /// The synchronize information.
         /// </summary>
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
index 2ef6f7c60b..eb62394605 100644
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -37,16 +37,19 @@ namespace MediaBrowser.Model.Querying
         /// </summary>
         /// <value>The fields.</value>
         public ItemFields[] Fields { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [enable images].
         /// </summary>
         /// <value><c>null</c> if [enable images] contains no value, <c>true</c> if [enable images]; otherwise, <c>false</c>.</value>
         public bool? EnableImages { get; set; }
+
         /// <summary>
         /// Gets or sets the image type limit.
         /// </summary>
         /// <value>The image type limit.</value>
         public int? ImageTypeLimit { get; set; }
+
         /// <summary>
         /// Gets or sets the enable image types.
         /// </summary>
diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index 21bcabf1d9..73dbe6a2da 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -88,16 +88,19 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The play method.</value>
         public PlayMethod PlayMethod { get; set; }
+
         /// <summary>
         /// Gets or sets the live stream identifier.
         /// </summary>
         /// <value>The live stream identifier.</value>
         public string LiveStreamId { get; set; }
+
         /// <summary>
         /// Gets or sets the play session identifier.
         /// </summary>
         /// <value>The play session identifier.</value>
         public string PlaySessionId { get; set; }
+
         /// <summary>
         /// Gets or sets the repeat mode.
         /// </summary>
diff --git a/MediaBrowser.Model/Sync/SyncCategory.cs b/MediaBrowser.Model/Sync/SyncCategory.cs
index 80ad5f56ec..1248c2f739 100644
--- a/MediaBrowser.Model/Sync/SyncCategory.cs
+++ b/MediaBrowser.Model/Sync/SyncCategory.cs
@@ -8,10 +8,12 @@ namespace MediaBrowser.Model.Sync
         /// The latest.
         /// </summary>
         Latest = 0,
+
         /// <summary>
         /// The next up.
         /// </summary>
         NextUp = 1,
+
         /// <summary>
         /// The resume.
         /// </summary>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 18ca74ee30..4b83fb7e61 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -14,13 +14,16 @@ namespace MediaBrowser.Model.System
     {
         /// <summary>No path to FFmpeg found.</summary>
         NotFound,
+
         /// <summary>Path supplied via command line using switch --ffmpeg.</summary>
         SetByArgument,
+
         /// <summary>User has supplied path via Transcoding UI page.</summary>
         Custom,
+
         /// <summary>FFmpeg tool found on system $PATH.</summary>
         System
-    };
+    }
 
     /// <summary>
     /// Class SystemInfo.
diff --git a/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs b/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
index fbfaed22ef..6212d76f78 100644
--- a/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
+++ b/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
@@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Tasks
         /// </summary>
         /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
         bool IsHidden { get; }
+
         /// <summary>
         /// Gets a value indicating whether this instance is enabled.
         /// </summary>
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
index 781b716406..f27da7ce61 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/ArtistProvider.cs
@@ -198,6 +198,7 @@ namespace MediaBrowser.Providers.Music
                                 result.Name = reader.ReadElementContentAsString();
                                 break;
                             }
+
                         case "annotation":
                             {
                                 result.Overview = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs
index 46f8988f27..abfa1c6e71 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs
@@ -444,6 +444,7 @@ namespace MediaBrowser.Providers.Music
                                     result.Title = reader.ReadElementContentAsString();
                                     break;
                                 }
+
                             case "date":
                                 {
                                     var val = reader.ReadElementContentAsString();
@@ -454,17 +455,20 @@ namespace MediaBrowser.Providers.Music
 
                                     break;
                                 }
+
                             case "annotation":
                                 {
                                     result.Overview = reader.ReadElementContentAsString();
                                     break;
                                 }
+
                             case "release-group":
                                 {
                                     result.ReleaseGroupId = reader.GetAttribute("id");
                                     reader.Skip();
                                     break;
                                 }
+
                             case "artist-credit":
                                 {
                                     using (var subReader = reader.ReadSubtree())
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
index 01a887eed5..3c626f9ebf 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
@@ -302,7 +302,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 {
                     Url = string.Format(CultureInfo.InvariantCulture, "https://www.youtube.com/watch?v={0}", i.Source),
                     Name = i.Name
-
                 }).ToArray();
             }
         }
diff --git a/MediaBrowser.Providers/TV/DummySeasonProvider.cs b/MediaBrowser.Providers/TV/DummySeasonProvider.cs
index a0f7f6cfd7..905cbefd32 100644
--- a/MediaBrowser.Providers/TV/DummySeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/DummySeasonProvider.cs
@@ -217,7 +217,6 @@ namespace MediaBrowser.Providers.TV
                     new DeleteOptions
                     {
                         DeleteFileLocation = true
-
                     },
                     false);
 

From c912093579952e3cb7f4b4563975024c9e27a097 Mon Sep 17 00:00:00 2001
From: spookbits <71300703+spooksbit@users.noreply.github.com>
Date: Fri, 25 Sep 2020 21:52:37 -0400
Subject: [PATCH 150/247] Created a separate API Docs profile to launch the
 browser at the API docs, and the nowebclient profile no longer launches the
 browser at all.

Don't point to web in the client because it won't redirect properly.

Modified the vscode launch.json to automatically launch the browser when debugging the first configuration. The
---
 .vscode/launch.json                            | 6 +++++-
 Jellyfin.Server/Properties/launchSettings.json | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index bf1bd65cbe..05f60cfa69 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,11 @@
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",
             "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart"
+            "internalConsoleOptions": "openOnSessionStart",
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "Overriding address\\(es\\) \\'(https?:\\S+)\\'",
+            }
         },
         {
             "name": ".NET Core Launch (nowebclient)",
diff --git a/Jellyfin.Server/Properties/launchSettings.json b/Jellyfin.Server/Properties/launchSettings.json
index d8be520b7b..20d432afc4 100644
--- a/Jellyfin.Server/Properties/launchSettings.json
+++ b/Jellyfin.Server/Properties/launchSettings.json
@@ -3,13 +3,19 @@
     "Jellyfin.Server": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "web",
       "applicationUrl": "http://localhost:8096",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Jellyfin.Server (nowebclient)": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "commandLineArgs": "--nowebclient"
+    },
+    "Jellyfin.Server (API Docs)": {
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "api-docs/swagger",

From e9911b70ddfd9a9ee1f9b89579f5dbec154129a4 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Mon, 28 Sep 2020 15:37:10 -0700
Subject: [PATCH 151/247] Use EnsureSuccessStatusCode

---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index a0c7d4ad09..40fcf7d6f4 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -157,14 +157,7 @@ namespace MediaBrowser.Providers.Manager
         {
             var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);
             using var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false);
-
-            if (response.StatusCode != HttpStatusCode.OK)
-            {
-                throw new HttpException("Invalid image received.")
-                {
-                    StatusCode = response.StatusCode
-                };
-            }
+            response.EnsureSuccessStatusCode();
 
             var contentType = response.Content.Headers.ContentType.MediaType;
 

From fd7a36932da16fb1e85160aaa0da792303a4e72f Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Mon, 28 Sep 2020 15:31:28 -0700
Subject: [PATCH 152/247] simplify EndDate query

---
 .../Plugins/TheTvdb/TvdbSeriesProvider.cs                | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
index cdb159c0f0..b34e52235a 100644
--- a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbSeriesProvider.cs
@@ -352,14 +352,9 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
                         };
                         var episodesPage = await _tvdbClientManager.GetEpisodesPageAsync(tvdbSeries.Id, episodeQuery, metadataLanguage, CancellationToken.None).ConfigureAwait(false);
 
-                        var episodeDates = episodesPage.Data
+                        result.Item.EndDate = episodesPage.Data
                             .Select(e => DateTime.TryParse(e.FirstAired, out var firstAired) ? firstAired : (DateTime?)null)
-                            .Where(dt => dt.HasValue)
-                            .ToList();
-                        if (episodeDates.Count != 0)
-                        {
-                            result.Item.EndDate = episodeDates.Max();
-                        }
+                            .Max();
                     }
                 }
                 catch (TvDbServerException e)

From 25d8d85740f984f051cebc5db53466c17688c370 Mon Sep 17 00:00:00 2001
From: Gary Wilber <Spacetech326@gmail.com>
Date: Tue, 29 Sep 2020 01:19:12 -0700
Subject: [PATCH 153/247] Back to HttpException

---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 40fcf7d6f4..a0c7d4ad09 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -157,7 +157,14 @@ namespace MediaBrowser.Providers.Manager
         {
             var httpClient = _httpClientFactory.CreateClient(NamedClient.Default);
             using var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
+
+            if (response.StatusCode != HttpStatusCode.OK)
+            {
+                throw new HttpException("Invalid image received.")
+                {
+                    StatusCode = response.StatusCode
+                };
+            }
 
             var contentType = response.Content.Headers.ContentType.MediaType;
 

From 3b0c6c660d057336e26aa67cb36abaaccb00771d Mon Sep 17 00:00:00 2001
From: Justin LeCheminant <jlechem@gmail.com>
Date: Wed, 30 Sep 2020 20:26:59 -0600
Subject: [PATCH 154/247] Removing string we don't use anymore.

---
 Emby.Server.Implementations/Localization/Core/af.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ar.json     | 1 -
 Emby.Server.Implementations/Localization/Core/bg-BG.json  | 1 -
 Emby.Server.Implementations/Localization/Core/bn.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ca.json     | 1 -
 Emby.Server.Implementations/Localization/Core/cs.json     | 1 -
 Emby.Server.Implementations/Localization/Core/da.json     | 1 -
 Emby.Server.Implementations/Localization/Core/de.json     | 1 -
 Emby.Server.Implementations/Localization/Core/el.json     | 1 -
 Emby.Server.Implementations/Localization/Core/en-GB.json  | 1 -
 Emby.Server.Implementations/Localization/Core/en-US.json  | 1 -
 Emby.Server.Implementations/Localization/Core/es-AR.json  | 1 -
 Emby.Server.Implementations/Localization/Core/es-MX.json  | 1 -
 Emby.Server.Implementations/Localization/Core/es.json     | 1 -
 Emby.Server.Implementations/Localization/Core/es_419.json | 1 -
 Emby.Server.Implementations/Localization/Core/es_DO.json  | 1 -
 Emby.Server.Implementations/Localization/Core/fa.json     | 1 -
 Emby.Server.Implementations/Localization/Core/fi.json     | 1 -
 Emby.Server.Implementations/Localization/Core/fil.json    | 1 -
 Emby.Server.Implementations/Localization/Core/fr-CA.json  | 1 -
 Emby.Server.Implementations/Localization/Core/fr.json     | 1 -
 Emby.Server.Implementations/Localization/Core/gsw.json    | 1 -
 Emby.Server.Implementations/Localization/Core/he.json     | 1 -
 Emby.Server.Implementations/Localization/Core/hr.json     | 1 -
 Emby.Server.Implementations/Localization/Core/hu.json     | 1 -
 Emby.Server.Implementations/Localization/Core/id.json     | 1 -
 Emby.Server.Implementations/Localization/Core/is.json     | 1 -
 Emby.Server.Implementations/Localization/Core/it.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ja.json     | 1 -
 Emby.Server.Implementations/Localization/Core/kk.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ko.json     | 1 -
 Emby.Server.Implementations/Localization/Core/lt-LT.json  | 1 -
 Emby.Server.Implementations/Localization/Core/lv.json     | 1 -
 Emby.Server.Implementations/Localization/Core/mk.json     | 1 -
 Emby.Server.Implementations/Localization/Core/mr.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ms.json     | 1 -
 Emby.Server.Implementations/Localization/Core/nb.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ne.json     | 1 -
 Emby.Server.Implementations/Localization/Core/nl.json     | 1 -
 Emby.Server.Implementations/Localization/Core/nn.json     | 1 -
 Emby.Server.Implementations/Localization/Core/pl.json     | 1 -
 Emby.Server.Implementations/Localization/Core/pt-BR.json  | 1 -
 Emby.Server.Implementations/Localization/Core/pt-PT.json  | 1 -
 Emby.Server.Implementations/Localization/Core/pt.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ro.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ru.json     | 1 -
 Emby.Server.Implementations/Localization/Core/sk.json     | 1 -
 Emby.Server.Implementations/Localization/Core/sl-SI.json  | 1 -
 Emby.Server.Implementations/Localization/Core/sq.json     | 1 -
 Emby.Server.Implementations/Localization/Core/sr.json     | 1 -
 Emby.Server.Implementations/Localization/Core/sv.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ta.json     | 1 -
 Emby.Server.Implementations/Localization/Core/th.json     | 1 -
 Emby.Server.Implementations/Localization/Core/tr.json     | 1 -
 Emby.Server.Implementations/Localization/Core/uk.json     | 1 -
 Emby.Server.Implementations/Localization/Core/ur_PK.json  | 1 -
 Emby.Server.Implementations/Localization/Core/vi.json     | 1 -
 Emby.Server.Implementations/Localization/Core/zh-CN.json  | 1 -
 Emby.Server.Implementations/Localization/Core/zh-HK.json  | 1 -
 Emby.Server.Implementations/Localization/Core/zh-TW.json  | 1 -
 60 files changed, 60 deletions(-)

diff --git a/Emby.Server.Implementations/Localization/Core/af.json b/Emby.Server.Implementations/Localization/Core/af.json
index d33e118931..977a1c2d70 100644
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -85,7 +85,6 @@
     "ItemAddedWithName": "{0} is in die versameling",
     "HomeVideos": "Tuis opnames",
     "HeaderRecordingGroups": "Groep Opnames",
-    "HeaderCameraUploads": "Kamera Oplaai",
     "Genres": "Genres",
     "FailedLoginAttemptWithUserName": "Mislukte aansluiting van {0}",
     "ChapterNameValue": "Hoofstuk",
diff --git a/Emby.Server.Implementations/Localization/Core/ar.json b/Emby.Server.Implementations/Localization/Core/ar.json
index 4eac8e75de..4b898e6fe0 100644
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -16,7 +16,6 @@
     "Folders": "المجلدات",
     "Genres": "التضنيفات",
     "HeaderAlbumArtists": "فناني الألبومات",
-    "HeaderCameraUploads": "تحميلات الكاميرا",
     "HeaderContinueWatching": "استئناف",
     "HeaderFavoriteAlbums": "الألبومات المفضلة",
     "HeaderFavoriteArtists": "الفنانون المفضلون",
diff --git a/Emby.Server.Implementations/Localization/Core/bg-BG.json b/Emby.Server.Implementations/Localization/Core/bg-BG.json
index 3fc7c7dc0f..1fed832768 100644
--- a/Emby.Server.Implementations/Localization/Core/bg-BG.json
+++ b/Emby.Server.Implementations/Localization/Core/bg-BG.json
@@ -16,7 +16,6 @@
     "Folders": "Папки",
     "Genres": "Жанрове",
     "HeaderAlbumArtists": "Изпълнители на албуми",
-    "HeaderCameraUploads": "Качени от камера",
     "HeaderContinueWatching": "Продължаване на гледането",
     "HeaderFavoriteAlbums": "Любими албуми",
     "HeaderFavoriteArtists": "Любими изпълнители",
diff --git a/Emby.Server.Implementations/Localization/Core/bn.json b/Emby.Server.Implementations/Localization/Core/bn.json
index 1bd1909827..5667bf337e 100644
--- a/Emby.Server.Implementations/Localization/Core/bn.json
+++ b/Emby.Server.Implementations/Localization/Core/bn.json
@@ -14,7 +14,6 @@
     "HeaderFavoriteArtists": "প্রিয় শিল্পীরা",
     "HeaderFavoriteAlbums": "প্রিয় এলবামগুলো",
     "HeaderContinueWatching": "দেখতে থাকুন",
-    "HeaderCameraUploads": "ক্যামেরার আপলোড সমূহ",
     "HeaderAlbumArtists": "এলবাম শিল্পী",
     "Genres": "জেনার",
     "Folders": "ফোল্ডারগুলো",
diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json
index 2c802a39ef..b7852eccb3 100644
--- a/Emby.Server.Implementations/Localization/Core/ca.json
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -16,7 +16,6 @@
     "Folders": "Carpetes",
     "Genres": "Gèneres",
     "HeaderAlbumArtists": "Artistes del Àlbum",
-    "HeaderCameraUploads": "Pujades de Càmera",
     "HeaderContinueWatching": "Continua Veient",
     "HeaderFavoriteAlbums": "Àlbums Preferits",
     "HeaderFavoriteArtists": "Artistes Preferits",
diff --git a/Emby.Server.Implementations/Localization/Core/cs.json b/Emby.Server.Implementations/Localization/Core/cs.json
index 464ca28ca0..b34fad066a 100644
--- a/Emby.Server.Implementations/Localization/Core/cs.json
+++ b/Emby.Server.Implementations/Localization/Core/cs.json
@@ -16,7 +16,6 @@
     "Folders": "Složky",
     "Genres": "Žánry",
     "HeaderAlbumArtists": "Umělci alba",
-    "HeaderCameraUploads": "Nahrané fotografie",
     "HeaderContinueWatching": "Pokračovat ve sledování",
     "HeaderFavoriteAlbums": "Oblíbená alba",
     "HeaderFavoriteArtists": "Oblíbení interpreti",
diff --git a/Emby.Server.Implementations/Localization/Core/da.json b/Emby.Server.Implementations/Localization/Core/da.json
index f5397b62cd..b29ad94eff 100644
--- a/Emby.Server.Implementations/Localization/Core/da.json
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -16,7 +16,6 @@
     "Folders": "Mapper",
     "Genres": "Genrer",
     "HeaderAlbumArtists": "Albumkunstnere",
-    "HeaderCameraUploads": "Kamera Uploads",
     "HeaderContinueWatching": "Fortsæt Afspilning",
     "HeaderFavoriteAlbums": "Favoritalbummer",
     "HeaderFavoriteArtists": "Favoritkunstnere",
diff --git a/Emby.Server.Implementations/Localization/Core/de.json b/Emby.Server.Implementations/Localization/Core/de.json
index fcbe9566e2..97ad1694a6 100644
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -16,7 +16,6 @@
     "Folders": "Verzeichnisse",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Album-Interpreten",
-    "HeaderCameraUploads": "Kamera-Uploads",
     "HeaderContinueWatching": "Fortsetzen",
     "HeaderFavoriteAlbums": "Lieblingsalben",
     "HeaderFavoriteArtists": "Lieblings-Interpreten",
diff --git a/Emby.Server.Implementations/Localization/Core/el.json b/Emby.Server.Implementations/Localization/Core/el.json
index 0753ea39d4..c45cc11cb8 100644
--- a/Emby.Server.Implementations/Localization/Core/el.json
+++ b/Emby.Server.Implementations/Localization/Core/el.json
@@ -16,7 +16,6 @@
     "Folders": "Φάκελοι",
     "Genres": "Είδη",
     "HeaderAlbumArtists": "Καλλιτέχνες του Άλμπουμ",
-    "HeaderCameraUploads": "Μεταφορτώσεις Κάμερας",
     "HeaderContinueWatching": "Συνεχίστε την παρακολούθηση",
     "HeaderFavoriteAlbums": "Αγαπημένα Άλμπουμ",
     "HeaderFavoriteArtists": "Αγαπημένοι Καλλιτέχνες",
diff --git a/Emby.Server.Implementations/Localization/Core/en-GB.json b/Emby.Server.Implementations/Localization/Core/en-GB.json
index 544c38cfa9..57ff13219f 100644
--- a/Emby.Server.Implementations/Localization/Core/en-GB.json
+++ b/Emby.Server.Implementations/Localization/Core/en-GB.json
@@ -16,7 +16,6 @@
     "Folders": "Folders",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
     "HeaderContinueWatching": "Continue Watching",
     "HeaderFavoriteAlbums": "Favourite Albums",
     "HeaderFavoriteArtists": "Favourite Artists",
diff --git a/Emby.Server.Implementations/Localization/Core/en-US.json b/Emby.Server.Implementations/Localization/Core/en-US.json
index 97a843160e..92c54fb0e6 100644
--- a/Emby.Server.Implementations/Localization/Core/en-US.json
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -16,7 +16,6 @@
     "Folders": "Folders",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
     "HeaderContinueWatching": "Continue Watching",
     "HeaderFavoriteAlbums": "Favorite Albums",
     "HeaderFavoriteArtists": "Favorite Artists",
diff --git a/Emby.Server.Implementations/Localization/Core/es-AR.json b/Emby.Server.Implementations/Localization/Core/es-AR.json
index ac96c788c1..390074cdd7 100644
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -16,7 +16,6 @@
     "Folders": "Carpetas",
     "Genres": "Géneros",
     "HeaderAlbumArtists": "Artistas de álbum",
-    "HeaderCameraUploads": "Subidas de cámara",
     "HeaderContinueWatching": "Seguir viendo",
     "HeaderFavoriteAlbums": "Álbumes favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
diff --git a/Emby.Server.Implementations/Localization/Core/es-MX.json b/Emby.Server.Implementations/Localization/Core/es-MX.json
index 4ba324aa1b..ab54c0ea6a 100644
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -16,7 +16,6 @@
     "Folders": "Carpetas",
     "Genres": "Géneros",
     "HeaderAlbumArtists": "Artistas del álbum",
-    "HeaderCameraUploads": "Subidas desde la cámara",
     "HeaderContinueWatching": "Continuar viendo",
     "HeaderFavoriteAlbums": "Álbumes favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json
index e7bd3959bf..d4e0b299dd 100644
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -16,7 +16,6 @@
     "Folders": "Carpetas",
     "Genres": "Géneros",
     "HeaderAlbumArtists": "Artistas del álbum",
-    "HeaderCameraUploads": "Subidas desde la cámara",
     "HeaderContinueWatching": "Continuar viendo",
     "HeaderFavoriteAlbums": "Álbumes favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
diff --git a/Emby.Server.Implementations/Localization/Core/es_419.json b/Emby.Server.Implementations/Localization/Core/es_419.json
index 0959ef2ca0..dcd30694f0 100644
--- a/Emby.Server.Implementations/Localization/Core/es_419.json
+++ b/Emby.Server.Implementations/Localization/Core/es_419.json
@@ -105,7 +105,6 @@
     "Inherit": "Heredar",
     "HomeVideos": "Videos caseros",
     "HeaderRecordingGroups": "Grupos de grabación",
-    "HeaderCameraUploads": "Subidas desde la cámara",
     "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión desde {0}",
     "DeviceOnlineWithName": "{0} está conectado",
     "DeviceOfflineWithName": "{0} se ha desconectado",
diff --git a/Emby.Server.Implementations/Localization/Core/es_DO.json b/Emby.Server.Implementations/Localization/Core/es_DO.json
index 26732eb3f1..b64ffbfbba 100644
--- a/Emby.Server.Implementations/Localization/Core/es_DO.json
+++ b/Emby.Server.Implementations/Localization/Core/es_DO.json
@@ -12,7 +12,6 @@
     "Application": "Aplicación",
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "HeaderContinueWatching": "Continuar Viendo",
-    "HeaderCameraUploads": "Subidas de Cámara",
     "HeaderAlbumArtists": "Artistas del Álbum",
     "Genres": "Géneros",
     "Folders": "Carpetas",
diff --git a/Emby.Server.Implementations/Localization/Core/fa.json b/Emby.Server.Implementations/Localization/Core/fa.json
index 500c292170..1986decf03 100644
--- a/Emby.Server.Implementations/Localization/Core/fa.json
+++ b/Emby.Server.Implementations/Localization/Core/fa.json
@@ -16,7 +16,6 @@
     "Folders": "پوشه‌ها",
     "Genres": "ژانرها",
     "HeaderAlbumArtists": "هنرمندان آلبوم",
-    "HeaderCameraUploads": "آپلودهای دوربین",
     "HeaderContinueWatching": "ادامه تماشا",
     "HeaderFavoriteAlbums": "آلبوم‌های مورد علاقه",
     "HeaderFavoriteArtists": "هنرمندان مورد علاقه",
diff --git a/Emby.Server.Implementations/Localization/Core/fi.json b/Emby.Server.Implementations/Localization/Core/fi.json
index f8d6e0e09b..aae22583ab 100644
--- a/Emby.Server.Implementations/Localization/Core/fi.json
+++ b/Emby.Server.Implementations/Localization/Core/fi.json
@@ -24,7 +24,6 @@
     "HeaderFavoriteSongs": "Lempikappaleet",
     "HeaderFavoriteShows": "Lempisarjat",
     "HeaderFavoriteEpisodes": "Lempijaksot",
-    "HeaderCameraUploads": "Kamerasta Lähetetyt",
     "HeaderFavoriteArtists": "Lempiartistit",
     "HeaderFavoriteAlbums": "Lempialbumit",
     "HeaderContinueWatching": "Jatka katsomista",
diff --git a/Emby.Server.Implementations/Localization/Core/fil.json b/Emby.Server.Implementations/Localization/Core/fil.json
index 47daf20442..1a3e188327 100644
--- a/Emby.Server.Implementations/Localization/Core/fil.json
+++ b/Emby.Server.Implementations/Localization/Core/fil.json
@@ -73,7 +73,6 @@
     "HeaderFavoriteArtists": "Paboritong Artista",
     "HeaderFavoriteAlbums": "Paboritong Albums",
     "HeaderContinueWatching": "Ituloy Manood",
-    "HeaderCameraUploads": "Camera Uploads",
     "HeaderAlbumArtists": "Artista ng Album",
     "Genres": "Kategorya",
     "Folders": "Folders",
diff --git a/Emby.Server.Implementations/Localization/Core/fr-CA.json b/Emby.Server.Implementations/Localization/Core/fr-CA.json
index cd1c8144fd..3d7592e3c8 100644
--- a/Emby.Server.Implementations/Localization/Core/fr-CA.json
+++ b/Emby.Server.Implementations/Localization/Core/fr-CA.json
@@ -16,7 +16,6 @@
     "Folders": "Dossiers",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Artistes de l'album",
-    "HeaderCameraUploads": "Photos transférées",
     "HeaderContinueWatching": "Continuer à regarder",
     "HeaderFavoriteAlbums": "Albums favoris",
     "HeaderFavoriteArtists": "Artistes favoris",
diff --git a/Emby.Server.Implementations/Localization/Core/fr.json b/Emby.Server.Implementations/Localization/Core/fr.json
index 7fc9968219..f4ca8575a1 100644
--- a/Emby.Server.Implementations/Localization/Core/fr.json
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -16,7 +16,6 @@
     "Folders": "Dossiers",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Artistes",
-    "HeaderCameraUploads": "Photos transférées",
     "HeaderContinueWatching": "Continuer à regarder",
     "HeaderFavoriteAlbums": "Albums favoris",
     "HeaderFavoriteArtists": "Artistes préférés",
diff --git a/Emby.Server.Implementations/Localization/Core/gsw.json b/Emby.Server.Implementations/Localization/Core/gsw.json
index 8780a884ba..ee1f8775e5 100644
--- a/Emby.Server.Implementations/Localization/Core/gsw.json
+++ b/Emby.Server.Implementations/Localization/Core/gsw.json
@@ -16,7 +16,6 @@
     "Folders": "Ordner",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Album-Künstler",
-    "HeaderCameraUploads": "Kamera-Uploads",
     "HeaderContinueWatching": "weiter schauen",
     "HeaderFavoriteAlbums": "Lieblingsalben",
     "HeaderFavoriteArtists": "Lieblings-Künstler",
diff --git a/Emby.Server.Implementations/Localization/Core/he.json b/Emby.Server.Implementations/Localization/Core/he.json
index dc3a981540..f906d6e117 100644
--- a/Emby.Server.Implementations/Localization/Core/he.json
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -16,7 +16,6 @@
     "Folders": "תיקיות",
     "Genres": "ז'אנרים",
     "HeaderAlbumArtists": "אמני האלבום",
-    "HeaderCameraUploads": "העלאות ממצלמה",
     "HeaderContinueWatching": "המשך לצפות",
     "HeaderFavoriteAlbums": "אלבומים מועדפים",
     "HeaderFavoriteArtists": "אמנים מועדפים",
diff --git a/Emby.Server.Implementations/Localization/Core/hr.json b/Emby.Server.Implementations/Localization/Core/hr.json
index 97c77017b5..a3c936240d 100644
--- a/Emby.Server.Implementations/Localization/Core/hr.json
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -16,7 +16,6 @@
     "Folders": "Mape",
     "Genres": "Žanrovi",
     "HeaderAlbumArtists": "Izvođači na albumu",
-    "HeaderCameraUploads": "Uvoz sa kamere",
     "HeaderContinueWatching": "Nastavi gledati",
     "HeaderFavoriteAlbums": "Omiljeni albumi",
     "HeaderFavoriteArtists": "Omiljeni izvođači",
diff --git a/Emby.Server.Implementations/Localization/Core/hu.json b/Emby.Server.Implementations/Localization/Core/hu.json
index c5c3844e3f..343d213d41 100644
--- a/Emby.Server.Implementations/Localization/Core/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -16,7 +16,6 @@
     "Folders": "Könyvtárak",
     "Genres": "Műfajok",
     "HeaderAlbumArtists": "Album előadók",
-    "HeaderCameraUploads": "Kamera feltöltések",
     "HeaderContinueWatching": "Megtekintés folytatása",
     "HeaderFavoriteAlbums": "Kedvenc albumok",
     "HeaderFavoriteArtists": "Kedvenc előadók",
diff --git a/Emby.Server.Implementations/Localization/Core/id.json b/Emby.Server.Implementations/Localization/Core/id.json
index 585fc6f027..ef3ed2580a 100644
--- a/Emby.Server.Implementations/Localization/Core/id.json
+++ b/Emby.Server.Implementations/Localization/Core/id.json
@@ -20,7 +20,6 @@
     "HeaderFavoriteArtists": "Artis Favorit",
     "HeaderFavoriteAlbums": "Album Favorit",
     "HeaderContinueWatching": "Lanjut Menonton",
-    "HeaderCameraUploads": "Unggahan Kamera",
     "HeaderAlbumArtists": "Album Artis",
     "Genres": "Aliran",
     "Folders": "Folder",
diff --git a/Emby.Server.Implementations/Localization/Core/is.json b/Emby.Server.Implementations/Localization/Core/is.json
index 0f0f9130b0..0f769eaada 100644
--- a/Emby.Server.Implementations/Localization/Core/is.json
+++ b/Emby.Server.Implementations/Localization/Core/is.json
@@ -13,7 +13,6 @@
     "HeaderFavoriteArtists": "Uppáhalds Listamenn",
     "HeaderFavoriteAlbums": "Uppáhalds Plötur",
     "HeaderContinueWatching": "Halda áfram að horfa",
-    "HeaderCameraUploads": "Myndavéla upphal",
     "HeaderAlbumArtists": "Höfundur plötu",
     "Genres": "Tegundir",
     "Folders": "Möppur",
diff --git a/Emby.Server.Implementations/Localization/Core/it.json b/Emby.Server.Implementations/Localization/Core/it.json
index bf1a0ef136..0a6238578d 100644
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -16,7 +16,6 @@
     "Folders": "Cartelle",
     "Genres": "Generi",
     "HeaderAlbumArtists": "Artisti degli Album",
-    "HeaderCameraUploads": "Caricamenti Fotocamera",
     "HeaderContinueWatching": "Continua a guardare",
     "HeaderFavoriteAlbums": "Album Preferiti",
     "HeaderFavoriteArtists": "Artisti Preferiti",
diff --git a/Emby.Server.Implementations/Localization/Core/ja.json b/Emby.Server.Implementations/Localization/Core/ja.json
index a4d9f9ef6b..35004f0eb4 100644
--- a/Emby.Server.Implementations/Localization/Core/ja.json
+++ b/Emby.Server.Implementations/Localization/Core/ja.json
@@ -16,7 +16,6 @@
     "Folders": "フォルダー",
     "Genres": "ジャンル",
     "HeaderAlbumArtists": "アルバムアーティスト",
-    "HeaderCameraUploads": "カメラアップロード",
     "HeaderContinueWatching": "視聴を続ける",
     "HeaderFavoriteAlbums": "お気に入りのアルバム",
     "HeaderFavoriteArtists": "お気に入りのアーティスト",
diff --git a/Emby.Server.Implementations/Localization/Core/kk.json b/Emby.Server.Implementations/Localization/Core/kk.json
index 5618ff4a8f..91c1fb15bc 100644
--- a/Emby.Server.Implementations/Localization/Core/kk.json
+++ b/Emby.Server.Implementations/Localization/Core/kk.json
@@ -16,7 +16,6 @@
     "Folders": "Qaltalar",
     "Genres": "Janrlar",
     "HeaderAlbumArtists": "Álbom oryndaýshylary",
-    "HeaderCameraUploads": "Kameradan júktelgender",
     "HeaderContinueWatching": "Qaraýdy jalǵastyrý",
     "HeaderFavoriteAlbums": "Tańdaýly álbomdar",
     "HeaderFavoriteArtists": "Tańdaýly oryndaýshylar",
diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json
index a33953c273..fb01e46451 100644
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -16,7 +16,6 @@
     "Folders": "폴더",
     "Genres": "장르",
     "HeaderAlbumArtists": "앨범 아티스트",
-    "HeaderCameraUploads": "카메라 업로드",
     "HeaderContinueWatching": "계속 시청하기",
     "HeaderFavoriteAlbums": "즐겨찾는 앨범",
     "HeaderFavoriteArtists": "즐겨찾는 아티스트",
diff --git a/Emby.Server.Implementations/Localization/Core/lt-LT.json b/Emby.Server.Implementations/Localization/Core/lt-LT.json
index 35053766b4..d4cb592efc 100644
--- a/Emby.Server.Implementations/Localization/Core/lt-LT.json
+++ b/Emby.Server.Implementations/Localization/Core/lt-LT.json
@@ -16,7 +16,6 @@
     "Folders": "Katalogai",
     "Genres": "Žanrai",
     "HeaderAlbumArtists": "Albumo atlikėjai",
-    "HeaderCameraUploads": "Kameros",
     "HeaderContinueWatching": "Žiūrėti toliau",
     "HeaderFavoriteAlbums": "Mėgstami Albumai",
     "HeaderFavoriteArtists": "Mėgstami Atlikėjai",
diff --git a/Emby.Server.Implementations/Localization/Core/lv.json b/Emby.Server.Implementations/Localization/Core/lv.json
index dbcf172871..5e3acfbe96 100644
--- a/Emby.Server.Implementations/Localization/Core/lv.json
+++ b/Emby.Server.Implementations/Localization/Core/lv.json
@@ -72,7 +72,6 @@
     "ItemAddedWithName": "{0} tika pievienots bibliotēkai",
     "HeaderLiveTV": "Tiešraides TV",
     "HeaderContinueWatching": "Turpināt Skatīšanos",
-    "HeaderCameraUploads": "Kameras augšupielādes",
     "HeaderAlbumArtists": "Albumu Izpildītāji",
     "Genres": "Žanri",
     "Folders": "Mapes",
diff --git a/Emby.Server.Implementations/Localization/Core/mk.json b/Emby.Server.Implementations/Localization/Core/mk.json
index bbdf99abab..b780ef498a 100644
--- a/Emby.Server.Implementations/Localization/Core/mk.json
+++ b/Emby.Server.Implementations/Localization/Core/mk.json
@@ -51,7 +51,6 @@
     "HeaderFavoriteArtists": "Омилени Изведувачи",
     "HeaderFavoriteAlbums": "Омилени Албуми",
     "HeaderContinueWatching": "Продолжи со гледање",
-    "HeaderCameraUploads": "Поставувања од камера",
     "HeaderAlbumArtists": "Изведувачи од Албуми",
     "Genres": "Жанрови",
     "Folders": "Папки",
diff --git a/Emby.Server.Implementations/Localization/Core/mr.json b/Emby.Server.Implementations/Localization/Core/mr.json
index b6db2b0f29..fdb4171b53 100644
--- a/Emby.Server.Implementations/Localization/Core/mr.json
+++ b/Emby.Server.Implementations/Localization/Core/mr.json
@@ -54,7 +54,6 @@
     "ItemAddedWithName": "{0} हे संग्रहालयात जोडले गेले",
     "HomeVideos": "घरचे व्हिडीयो",
     "HeaderRecordingGroups": "रेकॉर्डिंग गट",
-    "HeaderCameraUploads": "कॅमेरा अपलोड",
     "CameraImageUploadedFrom": "एक नवीन कॅमेरा चित्र {0} येथून अपलोड केले आहे",
     "Application": "अ‍ॅप्लिकेशन",
     "AppDeviceValues": "अ‍ॅप: {0}, यंत्र: {1}",
diff --git a/Emby.Server.Implementations/Localization/Core/ms.json b/Emby.Server.Implementations/Localization/Core/ms.json
index 7f8df12895..5e3d095ff1 100644
--- a/Emby.Server.Implementations/Localization/Core/ms.json
+++ b/Emby.Server.Implementations/Localization/Core/ms.json
@@ -16,7 +16,6 @@
     "Folders": "Fail-fail",
     "Genres": "Genre-genre",
     "HeaderAlbumArtists": "Album Artis-artis",
-    "HeaderCameraUploads": "Muatnaik Kamera",
     "HeaderContinueWatching": "Terus Menonton",
     "HeaderFavoriteAlbums": "Album-album Kegemaran",
     "HeaderFavoriteArtists": "Artis-artis Kegemaran",
diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json
index 07a5991211..245c3cd636 100644
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -16,7 +16,6 @@
     "Folders": "Mapper",
     "Genres": "Sjangre",
     "HeaderAlbumArtists": "Albumartister",
-    "HeaderCameraUploads": "Kameraopplastinger",
     "HeaderContinueWatching": "Fortsett å se",
     "HeaderFavoriteAlbums": "Favorittalbum",
     "HeaderFavoriteArtists": "Favorittartister",
diff --git a/Emby.Server.Implementations/Localization/Core/ne.json b/Emby.Server.Implementations/Localization/Core/ne.json
index 38c0737098..8e820d40c7 100644
--- a/Emby.Server.Implementations/Localization/Core/ne.json
+++ b/Emby.Server.Implementations/Localization/Core/ne.json
@@ -41,7 +41,6 @@
     "HeaderFavoriteArtists": "मनपर्ने कलाकारहरू",
     "HeaderFavoriteAlbums": "मनपर्ने एल्बमहरू",
     "HeaderContinueWatching": "हेर्न जारी राख्नुहोस्",
-    "HeaderCameraUploads": "क्यामेरा अपलोडहरू",
     "HeaderAlbumArtists": "एल्बमका कलाकारहरू",
     "Genres": "विधाहरू",
     "Folders": "फोल्डरहरू",
diff --git a/Emby.Server.Implementations/Localization/Core/nl.json b/Emby.Server.Implementations/Localization/Core/nl.json
index 41c74d54de..e102b92b90 100644
--- a/Emby.Server.Implementations/Localization/Core/nl.json
+++ b/Emby.Server.Implementations/Localization/Core/nl.json
@@ -16,7 +16,6 @@
     "Folders": "Mappen",
     "Genres": "Genres",
     "HeaderAlbumArtists": "Albumartiesten",
-    "HeaderCameraUploads": "Camera-uploads",
     "HeaderContinueWatching": "Kijken hervatten",
     "HeaderFavoriteAlbums": "Favoriete albums",
     "HeaderFavoriteArtists": "Favoriete artiesten",
diff --git a/Emby.Server.Implementations/Localization/Core/nn.json b/Emby.Server.Implementations/Localization/Core/nn.json
index fb6e81beb3..6236515b2c 100644
--- a/Emby.Server.Implementations/Localization/Core/nn.json
+++ b/Emby.Server.Implementations/Localization/Core/nn.json
@@ -19,7 +19,6 @@
     "HeaderFavoriteArtists": "Favoritt Artistar",
     "HeaderFavoriteAlbums": "Favoritt Album",
     "HeaderContinueWatching": "Fortsett å sjå",
-    "HeaderCameraUploads": "Kamera Opplastingar",
     "HeaderAlbumArtists": "Album Artist",
     "Genres": "Sjangrar",
     "Folders": "Mapper",
diff --git a/Emby.Server.Implementations/Localization/Core/pl.json b/Emby.Server.Implementations/Localization/Core/pl.json
index bdc0d0169b..003e591b37 100644
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -16,7 +16,6 @@
     "Folders": "Foldery",
     "Genres": "Gatunki",
     "HeaderAlbumArtists": "Wykonawcy albumów",
-    "HeaderCameraUploads": "Przekazane obrazy",
     "HeaderContinueWatching": "Kontynuuj odtwarzanie",
     "HeaderFavoriteAlbums": "Ulubione albumy",
     "HeaderFavoriteArtists": "Ulubieni wykonawcy",
diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json
index 275195640b..5e49ca702e 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-BR.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -16,7 +16,6 @@
     "Folders": "Pastas",
     "Genres": "Gêneros",
     "HeaderAlbumArtists": "Artistas do Álbum",
-    "HeaderCameraUploads": "Envios da Câmera",
     "HeaderContinueWatching": "Continuar Assistindo",
     "HeaderFavoriteAlbums": "Álbuns Favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
diff --git a/Emby.Server.Implementations/Localization/Core/pt-PT.json b/Emby.Server.Implementations/Localization/Core/pt-PT.json
index c1fb65743d..8aa1ed5497 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -16,7 +16,6 @@
     "Folders": "Pastas",
     "Genres": "Géneros",
     "HeaderAlbumArtists": "Artistas do Álbum",
-    "HeaderCameraUploads": "Envios a partir da câmara",
     "HeaderContinueWatching": "Continuar a Ver",
     "HeaderFavoriteAlbums": "Álbuns Favoritos",
     "HeaderFavoriteArtists": "Artistas Favoritos",
diff --git a/Emby.Server.Implementations/Localization/Core/pt.json b/Emby.Server.Implementations/Localization/Core/pt.json
index b534d0bbeb..2079940cd1 100644
--- a/Emby.Server.Implementations/Localization/Core/pt.json
+++ b/Emby.Server.Implementations/Localization/Core/pt.json
@@ -83,7 +83,6 @@
     "Playlists": "Listas de Reprodução",
     "Photos": "Fotografias",
     "Movies": "Filmes",
-    "HeaderCameraUploads": "Carregamentos a partir da câmara",
     "FailedLoginAttemptWithUserName": "Tentativa de ligação falhada a partir de {0}",
     "DeviceOnlineWithName": "{0} está connectado",
     "DeviceOfflineWithName": "{0} desconectou-se",
diff --git a/Emby.Server.Implementations/Localization/Core/ro.json b/Emby.Server.Implementations/Localization/Core/ro.json
index 699dd26daa..bc008df3b4 100644
--- a/Emby.Server.Implementations/Localization/Core/ro.json
+++ b/Emby.Server.Implementations/Localization/Core/ro.json
@@ -74,7 +74,6 @@
     "HeaderFavoriteArtists": "Artiști Favoriți",
     "HeaderFavoriteAlbums": "Albume Favorite",
     "HeaderContinueWatching": "Vizionează în continuare",
-    "HeaderCameraUploads": "Incărcări Cameră Foto",
     "HeaderAlbumArtists": "Album Artiști",
     "Genres": "Genuri",
     "Folders": "Dosare",
diff --git a/Emby.Server.Implementations/Localization/Core/ru.json b/Emby.Server.Implementations/Localization/Core/ru.json
index 648aa384b0..95b93afb82 100644
--- a/Emby.Server.Implementations/Localization/Core/ru.json
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -16,7 +16,6 @@
     "Folders": "Папки",
     "Genres": "Жанры",
     "HeaderAlbumArtists": "Исполнители альбома",
-    "HeaderCameraUploads": "Камеры",
     "HeaderContinueWatching": "Продолжение просмотра",
     "HeaderFavoriteAlbums": "Избранные альбомы",
     "HeaderFavoriteArtists": "Избранные исполнители",
diff --git a/Emby.Server.Implementations/Localization/Core/sk.json b/Emby.Server.Implementations/Localization/Core/sk.json
index 0ee652637c..8e50269444 100644
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -16,7 +16,6 @@
     "Folders": "Priečinky",
     "Genres": "Žánre",
     "HeaderAlbumArtists": "Umelci albumu",
-    "HeaderCameraUploads": "Nahrané fotografie",
     "HeaderContinueWatching": "Pokračovať v pozeraní",
     "HeaderFavoriteAlbums": "Obľúbené albumy",
     "HeaderFavoriteArtists": "Obľúbení umelci",
diff --git a/Emby.Server.Implementations/Localization/Core/sl-SI.json b/Emby.Server.Implementations/Localization/Core/sl-SI.json
index 329c562e73..ff4b9e84fd 100644
--- a/Emby.Server.Implementations/Localization/Core/sl-SI.json
+++ b/Emby.Server.Implementations/Localization/Core/sl-SI.json
@@ -16,7 +16,6 @@
     "Folders": "Mape",
     "Genres": "Zvrsti",
     "HeaderAlbumArtists": "Izvajalci albuma",
-    "HeaderCameraUploads": "Posnetki kamere",
     "HeaderContinueWatching": "Nadaljuj gledanje",
     "HeaderFavoriteAlbums": "Priljubljeni albumi",
     "HeaderFavoriteArtists": "Priljubljeni izvajalci",
diff --git a/Emby.Server.Implementations/Localization/Core/sq.json b/Emby.Server.Implementations/Localization/Core/sq.json
index 347ba5f970..ecca5af4cc 100644
--- a/Emby.Server.Implementations/Localization/Core/sq.json
+++ b/Emby.Server.Implementations/Localization/Core/sq.json
@@ -96,7 +96,6 @@
     "HeaderFavoriteArtists": "Artistët e preferuar",
     "HeaderFavoriteAlbums": "Albumet e preferuar",
     "HeaderContinueWatching": "Vazhdo të shikosh",
-    "HeaderCameraUploads": "Ngarkimet nga Kamera",
     "HeaderAlbumArtists": "Artistët e albumeve",
     "Genres": "Zhanre",
     "Folders": "Dosje",
diff --git a/Emby.Server.Implementations/Localization/Core/sr.json b/Emby.Server.Implementations/Localization/Core/sr.json
index 5f3cbb1c8b..2b1eccfaf3 100644
--- a/Emby.Server.Implementations/Localization/Core/sr.json
+++ b/Emby.Server.Implementations/Localization/Core/sr.json
@@ -74,7 +74,6 @@
     "HeaderFavoriteArtists": "Омиљени извођачи",
     "HeaderFavoriteAlbums": "Омиљени албуми",
     "HeaderContinueWatching": "Настави гледање",
-    "HeaderCameraUploads": "Слања са камере",
     "HeaderAlbumArtists": "Извођачи албума",
     "Genres": "Жанрови",
     "Folders": "Фасцикле",
diff --git a/Emby.Server.Implementations/Localization/Core/sv.json b/Emby.Server.Implementations/Localization/Core/sv.json
index c8662b2cab..12fda8a986 100644
--- a/Emby.Server.Implementations/Localization/Core/sv.json
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -16,7 +16,6 @@
     "Folders": "Mappar",
     "Genres": "Genrer",
     "HeaderAlbumArtists": "Albumartister",
-    "HeaderCameraUploads": "Kamerauppladdningar",
     "HeaderContinueWatching": "Fortsätt kolla",
     "HeaderFavoriteAlbums": "Favoritalbum",
     "HeaderFavoriteArtists": "Favoritartister",
diff --git a/Emby.Server.Implementations/Localization/Core/ta.json b/Emby.Server.Implementations/Localization/Core/ta.json
index 810b1b9abe..ae38f45e1c 100644
--- a/Emby.Server.Implementations/Localization/Core/ta.json
+++ b/Emby.Server.Implementations/Localization/Core/ta.json
@@ -20,7 +20,6 @@
     "MessageApplicationUpdated": "ஜெல்லிஃபின் சேவையகம் புதுப்பிக்கப்பட்டது",
     "Inherit": "மரபுரிமையாகப் பெறு",
     "HeaderRecordingGroups": "பதிவு குழுக்கள்",
-    "HeaderCameraUploads": "புகைப்பட பதிவேற்றங்கள்",
     "Folders": "கோப்புறைகள்",
     "FailedLoginAttemptWithUserName": "{0} இலிருந்து உள்நுழைவு முயற்சி தோல்வியடைந்தது",
     "DeviceOnlineWithName": "{0} இணைக்கப்பட்டது",
diff --git a/Emby.Server.Implementations/Localization/Core/th.json b/Emby.Server.Implementations/Localization/Core/th.json
index 3b77215a30..71dd2c7a30 100644
--- a/Emby.Server.Implementations/Localization/Core/th.json
+++ b/Emby.Server.Implementations/Localization/Core/th.json
@@ -50,7 +50,6 @@
     "HeaderFavoriteArtists": "ศิลปินที่ชื่นชอบ",
     "HeaderFavoriteAlbums": "อัมบั้มที่ชื่นชอบ",
     "HeaderContinueWatching": "ดูต่อ",
-    "HeaderCameraUploads": "อัปโหลดรูปถ่าย",
     "HeaderAlbumArtists": "อัลบั้มศิลปิน",
     "Genres": "ประเภท",
     "Folders": "โฟลเดอร์",
diff --git a/Emby.Server.Implementations/Localization/Core/tr.json b/Emby.Server.Implementations/Localization/Core/tr.json
index 3cf3482eba..1e5f2cf198 100644
--- a/Emby.Server.Implementations/Localization/Core/tr.json
+++ b/Emby.Server.Implementations/Localization/Core/tr.json
@@ -16,7 +16,6 @@
     "Folders": "Klasörler",
     "Genres": "Türler",
     "HeaderAlbumArtists": "Albüm Sanatçıları",
-    "HeaderCameraUploads": "Kamera Yüklemeleri",
     "HeaderContinueWatching": "İzlemeye Devam Et",
     "HeaderFavoriteAlbums": "Favori Albümler",
     "HeaderFavoriteArtists": "Favori Sanatçılar",
diff --git a/Emby.Server.Implementations/Localization/Core/uk.json b/Emby.Server.Implementations/Localization/Core/uk.json
index e673465a42..06cc5f633e 100644
--- a/Emby.Server.Implementations/Localization/Core/uk.json
+++ b/Emby.Server.Implementations/Localization/Core/uk.json
@@ -16,7 +16,6 @@
     "HeaderFavoriteArtists": "Улюблені виконавці",
     "HeaderFavoriteAlbums": "Улюблені альбоми",
     "HeaderContinueWatching": "Продовжити перегляд",
-    "HeaderCameraUploads": "Завантажено з камери",
     "HeaderAlbumArtists": "Виконавці альбому",
     "Genres": "Жанри",
     "Folders": "Каталоги",
diff --git a/Emby.Server.Implementations/Localization/Core/ur_PK.json b/Emby.Server.Implementations/Localization/Core/ur_PK.json
index 9a5874e295..fa7b2d4d0c 100644
--- a/Emby.Server.Implementations/Localization/Core/ur_PK.json
+++ b/Emby.Server.Implementations/Localization/Core/ur_PK.json
@@ -105,7 +105,6 @@
     "Inherit": "وراثت میں",
     "HomeVideos": "ہوم ویڈیو",
     "HeaderRecordingGroups": "ریکارڈنگ گروپس",
-    "HeaderCameraUploads": "کیمرہ اپلوڈز",
     "FailedLoginAttemptWithUserName": "لاگن کئ کوشش ناکام {0}",
     "DeviceOnlineWithName": "{0} متصل ھو چکا ھے",
     "DeviceOfflineWithName": "{0} منقطع ھو چکا ھے",
diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index 2392c83479..ac74deff82 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -103,7 +103,6 @@
     "HeaderFavoriteEpisodes": "Tập Phim Yêu Thích",
     "HeaderFavoriteArtists": "Nghệ Sĩ Yêu Thích",
     "HeaderFavoriteAlbums": "Album Ưa Thích",
-    "HeaderCameraUploads": "Máy Ảnh Tải Lên",
     "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập thất bại từ {0}",
     "DeviceOnlineWithName": "{0} đã kết nối",
     "DeviceOfflineWithName": "{0} đã ngắt kết nối",
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
index 6b563a9b13..53a902de28 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -16,7 +16,6 @@
     "Folders": "文件夹",
     "Genres": "风格",
     "HeaderAlbumArtists": "专辑作家",
-    "HeaderCameraUploads": "相机上传",
     "HeaderContinueWatching": "继续观影",
     "HeaderFavoriteAlbums": "收藏的专辑",
     "HeaderFavoriteArtists": "最爱的艺术家",
diff --git a/Emby.Server.Implementations/Localization/Core/zh-HK.json b/Emby.Server.Implementations/Localization/Core/zh-HK.json
index 1ac62baca9..435e294ef2 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-HK.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -16,7 +16,6 @@
     "Folders": "檔案夾",
     "Genres": "風格",
     "HeaderAlbumArtists": "專輯藝人",
-    "HeaderCameraUploads": "相機上載",
     "HeaderContinueWatching": "繼續觀看",
     "HeaderFavoriteAlbums": "最愛專輯",
     "HeaderFavoriteArtists": "最愛的藝人",
diff --git a/Emby.Server.Implementations/Localization/Core/zh-TW.json b/Emby.Server.Implementations/Localization/Core/zh-TW.json
index 7b6540c3e3..30f7266300 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-TW.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -16,7 +16,6 @@
     "Folders": "資料夾",
     "Genres": "風格",
     "HeaderAlbumArtists": "專輯演出者",
-    "HeaderCameraUploads": "相機上傳",
     "HeaderContinueWatching": "繼續觀賞",
     "HeaderFavoriteAlbums": "最愛專輯",
     "HeaderFavoriteArtists": "最愛演出者",

From 5ee6f4920497ec9f4d6c305e9d0828d21074a773 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Thu, 1 Oct 2020 08:10:47 -0600
Subject: [PATCH 155/247] Manually register models used in websocket messages.

---
 .../ApiServiceCollectionExtensions.cs         |  1 +
 .../Filters/WebsocketModelFilter.cs           | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 Jellyfin.Server/Filters/WebsocketModelFilter.cs

diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 5bcf6d5f07..e180d0cd7a 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -260,6 +260,7 @@ namespace Jellyfin.Server.Extensions
                 c.AddSwaggerTypeMappings();
 
                 c.OperationFilter<FileResponseFilter>();
+                c.DocumentFilter<WebsocketModelFilter>();
             });
         }
 
diff --git a/Jellyfin.Server/Filters/WebsocketModelFilter.cs b/Jellyfin.Server/Filters/WebsocketModelFilter.cs
new file mode 100644
index 0000000000..90fca5583c
--- /dev/null
+++ b/Jellyfin.Server/Filters/WebsocketModelFilter.cs
@@ -0,0 +1,31 @@
+using MediaBrowser.Common.Plugins;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Session;
+using MediaBrowser.Model.SyncPlay;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+namespace Jellyfin.Server.Filters
+{
+    /// <summary>
+    /// Add models used in websocket messaging.
+    /// </summary>
+    public class WebsocketModelFilter : IDocumentFilter
+    {
+        /// <inheritdoc />
+        public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
+        {
+            context.SchemaGenerator.GenerateSchema(typeof(LibraryUpdateInfo), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(IPlugin), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(PlayRequest), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(TimerEventInfo), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(SendCommand), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(GeneralCommandType), context.SchemaRepository);
+
+            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<string>), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<PlayRequest>), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<long>), context.SchemaRepository);
+        }
+    }
+}

From 9585fea51e13c628f8d1223d03ffc7f05a570bbb Mon Sep 17 00:00:00 2001
From: Erwin de Haan <1627021+EraYaN@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:38:36 +0200
Subject: [PATCH 156/247] Update azure-pipelines.yml

---
 .ci/azure-pipelines.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index b417aae678..347918e0b0 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -34,6 +34,12 @@ jobs:
         Linux: 'ubuntu-latest'
         Windows: 'windows-latest'
         macOS: 'macos-latest'
+        
+- ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
+  - template: azure-pipelines-test.yml
+    parameters:
+      ImageNames:
+        Linux: 'ubuntu-latest'
 
 - ${{ if not(or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))) }}:
   - template: azure-pipelines-abi.yml

From 4a3e0062f9e4c353a79f5cba74a0499aa68565c8 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Thu, 1 Oct 2020 09:39:57 -0600
Subject: [PATCH 157/247] Add missing PlaystateRequest and remove additional
 GroupUpdate types

---
 Jellyfin.Server/Filters/WebsocketModelFilter.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Jellyfin.Server/Filters/WebsocketModelFilter.cs b/Jellyfin.Server/Filters/WebsocketModelFilter.cs
index 90fca5583c..81dfdfba7e 100644
--- a/Jellyfin.Server/Filters/WebsocketModelFilter.cs
+++ b/Jellyfin.Server/Filters/WebsocketModelFilter.cs
@@ -19,13 +19,12 @@ namespace Jellyfin.Server.Filters
             context.SchemaGenerator.GenerateSchema(typeof(LibraryUpdateInfo), context.SchemaRepository);
             context.SchemaGenerator.GenerateSchema(typeof(IPlugin), context.SchemaRepository);
             context.SchemaGenerator.GenerateSchema(typeof(PlayRequest), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(PlaystateRequest), context.SchemaRepository);
             context.SchemaGenerator.GenerateSchema(typeof(TimerEventInfo), context.SchemaRepository);
             context.SchemaGenerator.GenerateSchema(typeof(SendCommand), context.SchemaRepository);
             context.SchemaGenerator.GenerateSchema(typeof(GeneralCommandType), context.SchemaRepository);
 
-            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<string>), context.SchemaRepository);
-            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<PlayRequest>), context.SchemaRepository);
-            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<long>), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<>), context.SchemaRepository);
         }
     }
 }

From c0de26f69a5856b5d4c8f821fdf7e1a5aa571969 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:57:40 +0200
Subject: [PATCH 158/247] Publish OpenAPI Spec to repository server

---
 .ci/azure-pipelines-package.yml | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml
index cc845afd43..67aac45c9d 100644
--- a/.ci/azure-pipelines-package.yml
+++ b/.ci/azure-pipelines-package.yml
@@ -63,7 +63,38 @@ jobs:
       sshEndpoint: repository
       sourceFolder: '$(Build.SourcesDirectory)/deployment/dist'
       contents: '**'
-      targetFolder: '/srv/repository/incoming/azure/$(Build.BuildNumber)/$(BuildConfiguration)'
+
+- job: OpenAPISpec
+  dependsOn: Test
+  condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/master'),startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+  displayName: 'Push OpenAPI Spec to repository'
+
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download OpenAPI Spec'
+    inputs:
+      source: 'current'
+      artifact: "OpenAPI Spec"
+      path: "$(System.ArtifactsDirectory)/openapispec"
+      runVersion: "latest"
+
+  - task: SSH@0
+    displayName: 'Create target directory on repository server'
+    inputs:
+      sshEndpoint: repository
+      runOptions: 'inline'
+      inline: 'mkdir -p /srv/repository/incoming/azure/$(Build.BuildNumber)'
+
+  - task: CopyFilesOverSSH@0
+    displayName: 'Upload artifacts to repository server'
+    inputs:
+      sshEndpoint: repository
+      sourceFolder: '$(System.ArtifactsDirectory)/openapispec'
+      contents: 'openapi.json'
+      targetFolder: '/srv/repository/incoming/azure/$(Build.BuildNumber)'
 
 - job: BuildDocker
   displayName: 'Build Docker'

From 2b75af987395c242b69f57b636121302eadaee30 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Thu, 1 Oct 2020 10:40:58 -0600
Subject: [PATCH 159/247] set type of GroupUpdate

---
 Jellyfin.Server/Filters/WebsocketModelFilter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Server/Filters/WebsocketModelFilter.cs b/Jellyfin.Server/Filters/WebsocketModelFilter.cs
index 81dfdfba7e..2488028576 100644
--- a/Jellyfin.Server/Filters/WebsocketModelFilter.cs
+++ b/Jellyfin.Server/Filters/WebsocketModelFilter.cs
@@ -24,7 +24,7 @@ namespace Jellyfin.Server.Filters
             context.SchemaGenerator.GenerateSchema(typeof(SendCommand), context.SchemaRepository);
             context.SchemaGenerator.GenerateSchema(typeof(GeneralCommandType), context.SchemaRepository);
 
-            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<>), context.SchemaRepository);
+            context.SchemaGenerator.GenerateSchema(typeof(GroupUpdate<object>), context.SchemaRepository);
         }
     }
 }

From dd4f3a7c5184afbada50a038564c95fa780e04f8 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Thu, 1 Oct 2020 18:43:44 +0200
Subject: [PATCH 160/247] feat: convert supportedCommands strings to enums

---
 Emby.Dlna/PlayTo/PlayToManager.cs              | 18 +++++++++---------
 Jellyfin.Api/Controllers/SessionController.cs  |  6 +++---
 MediaBrowser.Controller/Session/SessionInfo.cs |  4 ++--
 .../Session/ClientCapabilities.cs              |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index 21877f121f..e93aef3043 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -217,15 +217,15 @@ namespace Emby.Dlna.PlayTo
 
                     SupportedCommands = new[]
                     {
-                        GeneralCommandType.VolumeDown.ToString(),
-                        GeneralCommandType.VolumeUp.ToString(),
-                        GeneralCommandType.Mute.ToString(),
-                        GeneralCommandType.Unmute.ToString(),
-                        GeneralCommandType.ToggleMute.ToString(),
-                        GeneralCommandType.SetVolume.ToString(),
-                        GeneralCommandType.SetAudioStreamIndex.ToString(),
-                        GeneralCommandType.SetSubtitleStreamIndex.ToString(),
-                        GeneralCommandType.PlayMediaSource.ToString()
+                        GeneralCommandType.VolumeDown,
+                        GeneralCommandType.VolumeUp,
+                        GeneralCommandType.Mute,
+                        GeneralCommandType.Unmute,
+                        GeneralCommandType.ToggleMute,
+                        GeneralCommandType.SetVolume,
+                        GeneralCommandType.SetAudioStreamIndex,
+                        GeneralCommandType.SetSubtitleStreamIndex,
+                        GeneralCommandType.PlayMediaSource
                     },
 
                     SupportsMediaControl = true
diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 39bf6e6dc7..2ed7019e5b 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -366,7 +366,7 @@ namespace Jellyfin.Api.Controllers
         /// </summary>
         /// <param name="id">The session id.</param>
         /// <param name="playableMediaTypes">A list of playable media types, comma delimited. Audio, Video, Book, Photo.</param>
-        /// <param name="supportedCommands">A list of supported remote control commands, comma delimited.</param>
+        /// <param name="supportedCommands">A list of supported remote control commands.</param>
         /// <param name="supportsMediaControl">Determines whether media can be played remotely..</param>
         /// <param name="supportsSync">Determines whether sync is supported.</param>
         /// <param name="supportsPersistentIdentifier">Determines whether the device supports a unique identifier.</param>
@@ -378,7 +378,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult PostCapabilities(
             [FromQuery] string? id,
             [FromQuery] string? playableMediaTypes,
-            [FromQuery] string? supportedCommands,
+            [FromQuery] GeneralCommandType[] supportedCommands,
             [FromQuery] bool supportsMediaControl = false,
             [FromQuery] bool supportsSync = false,
             [FromQuery] bool supportsPersistentIdentifier = true)
@@ -391,7 +391,7 @@ namespace Jellyfin.Api.Controllers
             _sessionManager.ReportCapabilities(id, new ClientCapabilities
             {
                 PlayableMediaTypes = RequestHelpers.Split(playableMediaTypes, ',', true),
-                SupportedCommands = RequestHelpers.Split(supportedCommands, ',', true),
+                SupportedCommands = supportedCommands == null ? Array.Empty<GeneralCommandType>() : supportedCommands,
                 SupportsMediaControl = supportsMediaControl,
                 SupportsSync = supportsSync,
                 SupportsPersistentIdentifier = supportsPersistentIdentifier
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index 55e44c19db..ce58a60b9a 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -230,8 +230,8 @@ namespace MediaBrowser.Controller.Session
         /// Gets or sets the supported commands.
         /// </summary>
         /// <value>The supported commands.</value>
-        public string[] SupportedCommands
-            => Capabilities == null ? Array.Empty<string>() : Capabilities.SupportedCommands;
+        public GeneralCommandType[] SupportedCommands
+            => Capabilities == null ? Array.Empty<GeneralCommandType>() : Capabilities.SupportedCommands;
 
         public Tuple<ISessionController, bool> EnsureController<T>(Func<SessionInfo, ISessionController> factory)
         {
diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
index d3878ca308..a85e6ff2a4 100644
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Model.Session
     {
         public string[] PlayableMediaTypes { get; set; }
 
-        public string[] SupportedCommands { get; set; }
+        public GeneralCommandType[] SupportedCommands { get; set; }
 
         public bool SupportsMediaControl { get; set; }
 
@@ -31,7 +31,7 @@ namespace MediaBrowser.Model.Session
         public ClientCapabilities()
         {
             PlayableMediaTypes = Array.Empty<string>();
-            SupportedCommands = Array.Empty<string>();
+            SupportedCommands = Array.Empty<GeneralCommandType>();
             SupportsPersistentIdentifier = true;
         }
     }

From f314be9d8513829a5de21eeb2ef19e10943b2a0e Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Thu, 1 Oct 2020 18:44:22 +0200
Subject: [PATCH 161/247] chore(CONTRIBUTORS.md): add skyfrk

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 99060d0b09..7b4772730a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -137,6 +137,7 @@
  - [KristupasSavickas](https://github.com/KristupasSavickas)
  - [Pusta](https://github.com/pusta)
  - [nielsvanvelzen](https://github.com/nielsvanvelzen)
+ - [skyfrk](https://github.com/skyfrk)
 
 # Emby Contributors
 

From 0655928ab14452dde97192ead66b33c927a75d5a Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Thu, 1 Oct 2020 19:56:59 +0200
Subject: [PATCH 162/247] feat: add CommaDelimitedArrayModelBinder

---
 .../CommaDelimitedArrayModelBinder.cs         | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs

diff --git a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
new file mode 100644
index 0000000000..1bfd741fd9
--- /dev/null
+++ b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
@@ -0,0 +1,42 @@
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Jellyfin.Api.ModelBinders
+{
+    /// <summary>
+    /// Comma delimited array model binder.
+    /// Returns an empty array of specified type if there is no query parameter.
+    /// </summary>
+    public class CommaDelimitedArrayModelBinder : IModelBinder
+    {
+        /// <inheritdoc/>
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            var input = valueProviderResult.FirstValue;
+            var elementType = bindingContext.ModelType.GetElementType();
+
+            if (input != null)
+            {
+                var converter = TypeDescriptor.GetConverter(elementType);
+                var values = Array.ConvertAll(
+                    input.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries),
+                    x => { return converter.ConvertFromString(x != null ? x.Trim() : x); });
+
+                var typedValues = Array.CreateInstance(elementType, values.Length);
+                values.CopyTo(typedValues, 0);
+
+                bindingContext.Result = ModelBindingResult.Success(typedValues);
+            }
+            else
+            {
+                var emptyResult = Array.CreateInstance(elementType, 0);
+                bindingContext.Result = ModelBindingResult.Success(emptyResult);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

From ba12ea7f4a0bb4804bafa335d374d45bac37ea84 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Thu, 1 Oct 2020 19:57:31 +0200
Subject: [PATCH 163/247] feat: use CommaDelimitedArrayModelBinder to retain
 API

---
 Jellyfin.Api/Controllers/SessionController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 2ed7019e5b..68cec14151 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Helpers;
+using Jellyfin.Api.ModelBinders;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
@@ -366,7 +367,7 @@ namespace Jellyfin.Api.Controllers
         /// </summary>
         /// <param name="id">The session id.</param>
         /// <param name="playableMediaTypes">A list of playable media types, comma delimited. Audio, Video, Book, Photo.</param>
-        /// <param name="supportedCommands">A list of supported remote control commands.</param>
+        /// <param name="supportedCommands">A list of supported remote control commands, comma delimited.</param>
         /// <param name="supportsMediaControl">Determines whether media can be played remotely..</param>
         /// <param name="supportsSync">Determines whether sync is supported.</param>
         /// <param name="supportsPersistentIdentifier">Determines whether the device supports a unique identifier.</param>
@@ -378,7 +379,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult PostCapabilities(
             [FromQuery] string? id,
             [FromQuery] string? playableMediaTypes,
-            [FromQuery] GeneralCommandType[] supportedCommands,
+            [FromQuery][ModelBinder(typeof(CommaDelimitedArrayModelBinder))] GeneralCommandType[] supportedCommands,
             [FromQuery] bool supportsMediaControl = false,
             [FromQuery] bool supportsSync = false,
             [FromQuery] bool supportsPersistentIdentifier = true)

From 4b4c74bdcd2ffd119f930226179360907c15fd74 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Thu, 1 Oct 2020 22:04:53 +0200
Subject: [PATCH 164/247] feat: extend CommaDelimitedArrayModelBinder to
 support auto generated openAPI spec

---
 .../CommaDelimitedArrayModelBinder.cs         | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
index 1bfd741fd9..92bbd96633 100644
--- a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
+++ b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
@@ -15,25 +15,42 @@ namespace Jellyfin.Api.ModelBinders
         public Task BindModelAsync(ModelBindingContext bindingContext)
         {
             var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
-            var input = valueProviderResult.FirstValue;
             var elementType = bindingContext.ModelType.GetElementType();
+            var converter = TypeDescriptor.GetConverter(elementType);
 
-            if (input != null)
+            if (valueProviderResult.Length > 1)
             {
-                var converter = TypeDescriptor.GetConverter(elementType);
-                var values = Array.ConvertAll(
-                    input.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries),
-                    x => { return converter.ConvertFromString(x != null ? x.Trim() : x); });
+                var result = Array.CreateInstance(elementType, valueProviderResult.Length);
 
-                var typedValues = Array.CreateInstance(elementType, values.Length);
-                values.CopyTo(typedValues, 0);
+                for (int i = 0; i < valueProviderResult.Length; i++)
+                {
+                    var value = converter.ConvertFromString(valueProviderResult.Values[i].Trim());
 
-                bindingContext.Result = ModelBindingResult.Success(typedValues);
+                    result.SetValue(value, i);
+                }
+
+                bindingContext.Result = ModelBindingResult.Success(result);
             }
             else
             {
-                var emptyResult = Array.CreateInstance(elementType, 0);
-                bindingContext.Result = ModelBindingResult.Success(emptyResult);
+                var value = valueProviderResult.FirstValue;
+
+                if (value != null)
+                {
+                    var values = Array.ConvertAll(
+                        value.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries),
+                        x => { return converter.ConvertFromString(x != null ? x.Trim() : x); });
+
+                    var typedValues = Array.CreateInstance(elementType, values.Length);
+                    values.CopyTo(typedValues, 0);
+
+                    bindingContext.Result = ModelBindingResult.Success(typedValues);
+                }
+                else
+                {
+                    var emptyResult = Array.CreateInstance(elementType, 0);
+                    bindingContext.Result = ModelBindingResult.Success(emptyResult);
+                }
             }
 
             return Task.CompletedTask;

From d10090b394371e6b588a08b453a1dfb177e90ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20E=C3=9Flinger?= <github@esslinger.dev>
Date: Thu, 1 Oct 2020 22:48:42 +0200
Subject: [PATCH 165/247] fix: remove unused null check

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Jellyfin.Api/Controllers/SessionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 68cec14151..0ae49ea982 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -392,7 +392,7 @@ namespace Jellyfin.Api.Controllers
             _sessionManager.ReportCapabilities(id, new ClientCapabilities
             {
                 PlayableMediaTypes = RequestHelpers.Split(playableMediaTypes, ',', true),
-                SupportedCommands = supportedCommands == null ? Array.Empty<GeneralCommandType>() : supportedCommands,
+                SupportedCommands = supportedCommands,
                 SupportsMediaControl = supportsMediaControl,
                 SupportsSync = supportsSync,
                 SupportsPersistentIdentifier = supportsPersistentIdentifier

From 21b39a207dd4a6864e9d7bfe1c1e9253cbfc0f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20E=C3=9Flinger?= <github@esslinger.dev>
Date: Fri, 2 Oct 2020 01:33:15 +0200
Subject: [PATCH 166/247] refactor: simplify null check

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
index 92bbd96633..208566dc8e 100644
--- a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
+++ b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
@@ -39,7 +39,7 @@ namespace Jellyfin.Api.ModelBinders
                 {
                     var values = Array.ConvertAll(
                         value.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries),
-                        x => { return converter.ConvertFromString(x != null ? x.Trim() : x); });
+                        x => converter.ConvertFromString(x?.Trim()));
 
                     var typedValues = Array.CreateInstance(elementType, values.Length);
                     values.CopyTo(typedValues, 0);

From 810ec0b672c06baa34782ccfb4b0b5cd51196662 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:00:57 -0600
Subject: [PATCH 167/247] Fix download api spec

---
 .ci/azure-pipelines-api-client.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index babee15b5a..0c741495f7 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -17,13 +17,11 @@ jobs:
     - task: DownloadPipelineArtifact@2
       displayName: 'Download OpenAPI Spec Artifact'
       inputs:
-        source: "specific"
+        source: 'current'
         artifact: "OpenAPI Spec"
-        path: "$(System.ArtifactsDirectory)/openapi"
-        project: "$(System.TeamProjectId)"
-        pipeline: "29" # The main server CI build
-        runVersion: "latestFromBranch"
-        runBranch: "refs/heads/$(System.PullRequest.TargetBranch)"
+        path: "$(System.ArtifactsDirectory)/openapispec"
+        runVersion: "latest"
+        dependsOn: Test
 
     - task: CmdLine@2
     displayName: 'Download OpenApi Generator'
@@ -68,5 +66,5 @@ jobs:
     inputs:
       command: publish
       publishRegistry: useExternalRegistry
-      publishEndpoint: 
+      publishEndpoint:
       workingDir: ./apiclient/generated/typescript/axios

From fcc9482ff94254dc853157f200f4a03c92f0366e Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:07:48 -0600
Subject: [PATCH 168/247] Generate document file for openapi spec in CI

---
 .ci/azure-pipelines-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/azure-pipelines-test.yml b/.ci/azure-pipelines-test.yml
index eca8aa90f9..6a36698b56 100644
--- a/.ci/azure-pipelines-test.yml
+++ b/.ci/azure-pipelines-test.yml
@@ -56,7 +56,7 @@ jobs:
         inputs:
           command: "test"
           projects: ${{ parameters.TestProjects }}
-          arguments: '--configuration Release --collect:"XPlat Code Coverage" --settings tests/coverletArgs.runsettings --verbosity minimal "-p:GenerateDocumentationFile=False"'
+          arguments: '--configuration Release --collect:"XPlat Code Coverage" --settings tests/coverletArgs.runsettings --verbosity minimal'
           publishTestResults: true
           testRunTitle: $(Agent.JobName)
           workingDirectory: "$(Build.SourcesDirectory)"

From 520acc11e6e1def24939527be8ccc186ded1c7b4 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:19:18 -0600
Subject: [PATCH 169/247] scope npm package name

---
 apiclient/templates/typescript/package.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiclient/templates/typescript/package.mustache b/apiclient/templates/typescript/package.mustache
index 5127917a14..251a403836 100644
--- a/apiclient/templates/typescript/package.mustache
+++ b/apiclient/templates/typescript/package.mustache
@@ -1,5 +1,5 @@
 {
-  "name": "jellyfin-apiclient-{{npmName}}",
+  "name": "@jellyfin/client-{{npmName}}",
   "version": "10.7.0{{snapshotVersion}}",
   "description": "Jellyfin api client using {{npmName}}",
   "author": "Jellyfin Contributors",

From 7d992798fdbd1dbba7242d83f79d7fba0499d15c Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:40:44 -0600
Subject: [PATCH 170/247] specify client specifically instead of through
 template

---
 .ci/azure-pipelines-api-client.yml                     |  4 ++--
 .../templates/typescript/{ => axios}/package.mustache  |  6 +++---
 apiclient/templates/typescript/{ => axios}/stable.sh   |  9 ++++-----
 apiclient/templates/typescript/axios/unstable.sh       |  9 +++++++++
 apiclient/templates/typescript/unstable.sh             | 10 ----------
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename apiclient/templates/typescript/{ => axios}/package.mustache (83%)
 rename apiclient/templates/typescript/{ => axios}/stable.sh (58%)
 create mode 100644 apiclient/templates/typescript/axios/unstable.sh
 delete mode 100644 apiclient/templates/typescript/unstable.sh

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index 0c741495f7..cbedcc6079 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -38,7 +38,7 @@ jobs:
     displayName: 'Build unstable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
     inputs:
-      script: 'bash ./apiclient/templates/typescript/unstable.sh axios'
+      script: 'bash ./apiclient/templates/typescript/axios/unstable.sh'
 
     - task: Npm@1
     displayName: 'Publish unstable typescript axios client'
@@ -58,7 +58,7 @@ jobs:
     displayName: 'Build stable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
     inputs:
-      script: 'bash ./apiclient/templates/typescript/stable.sh axios'
+      script: 'bash ./apiclient/templates/typescript/axios/stable.sh'
 
     - task: Npm@1
     displayName: 'Publish stable typescript axios client'
diff --git a/apiclient/templates/typescript/package.mustache b/apiclient/templates/typescript/axios/package.mustache
similarity index 83%
rename from apiclient/templates/typescript/package.mustache
rename to apiclient/templates/typescript/axios/package.mustache
index 251a403836..7bfab08cbb 100644
--- a/apiclient/templates/typescript/package.mustache
+++ b/apiclient/templates/typescript/axios/package.mustache
@@ -1,10 +1,10 @@
 {
-  "name": "@jellyfin/client-{{npmName}}",
+  "name": "@jellyfin/client-axios",
   "version": "10.7.0{{snapshotVersion}}",
-  "description": "Jellyfin api client using {{npmName}}",
+  "description": "Jellyfin api client using axios",
   "author": "Jellyfin Contributors",
   "keywords": [
-    "{{npmName}}",
+    "axios",
     "typescript",
     "jellyfin"
   ],
diff --git a/apiclient/templates/typescript/stable.sh b/apiclient/templates/typescript/axios/stable.sh
similarity index 58%
rename from apiclient/templates/typescript/stable.sh
rename to apiclient/templates/typescript/axios/stable.sh
index f23a85cc96..ecc55d2e79 100644
--- a/apiclient/templates/typescript/stable.sh
+++ b/apiclient/templates/typescript/axios/stable.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-CLIENT=$1
 java -jar openapi-generator-cli.jar generate \
     --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
-    --generator-name typescript-${CLIENT} \
-    --output ./apiclient/generated/typescript/${CLIENT}  \
-    --template-dir ./apiclient/templates/typescript \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}"
+    --additional-properties=useSingleRequestParameter="true",npmName="axios"
diff --git a/apiclient/templates/typescript/axios/unstable.sh b/apiclient/templates/typescript/axios/unstable.sh
new file mode 100644
index 0000000000..615eb5b228
--- /dev/null
+++ b/apiclient/templates/typescript/axios/unstable.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+java -jar openapi-generator-cli.jar generate \
+    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
+    --ignore-file-override ./apiclient/.openapi-generator-ignore \
+    --additional-properties=useSingleRequestParameter="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"
diff --git a/apiclient/templates/typescript/unstable.sh b/apiclient/templates/typescript/unstable.sh
deleted file mode 100644
index 3571c8ad5c..0000000000
--- a/apiclient/templates/typescript/unstable.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-CLIENT=$1
-java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
-    --generator-name typescript-${CLIENT} \
-    --output ./apiclient/generated/typescript/${CLIENT}  \
-    --template-dir ./apiclient/templates/typescript \
-    --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="${CLIENT}",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"

From 75dada6308c2be5d0c35f679cbcd49f6b7bd0cb9 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:47:14 -0600
Subject: [PATCH 171/247] add withSeparateModelsAndApi

---
 apiclient/templates/typescript/axios/stable.sh   | 2 +-
 apiclient/templates/typescript/axios/unstable.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apiclient/templates/typescript/axios/stable.sh b/apiclient/templates/typescript/axios/stable.sh
index ecc55d2e79..70c6409fb6 100644
--- a/apiclient/templates/typescript/axios/stable.sh
+++ b/apiclient/templates/typescript/axios/stable.sh
@@ -6,4 +6,4 @@ java -jar openapi-generator-cli.jar generate \
     --output ./apiclient/generated/typescript/axios  \
     --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="axios"
+    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios"
diff --git a/apiclient/templates/typescript/axios/unstable.sh b/apiclient/templates/typescript/axios/unstable.sh
index 615eb5b228..83e4ba228a 100644
--- a/apiclient/templates/typescript/axios/unstable.sh
+++ b/apiclient/templates/typescript/axios/unstable.sh
@@ -6,4 +6,4 @@ java -jar openapi-generator-cli.jar generate \
     --output ./apiclient/generated/typescript/axios  \
     --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"
+    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"

From 3d20ff69d4c711fcde794830c27f53df5d51941b Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 07:50:38 -0600
Subject: [PATCH 172/247] Fix repo connections

---
 .ci/azure-pipelines-api-client.yml               | 12 ++----------
 apiclient/templates/typescript/axios/unstable.sh |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index cbedcc6079..dbd70c7028 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -30,10 +30,6 @@ jobs:
 
 # Generate npm api client
 # Unstable
-    - task: npmAuthenticate@0
-    displayName: 'Authenticate to unstable npm feed'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
-
     - task: CmdLine@2
     displayName: 'Build unstable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
@@ -46,14 +42,10 @@ jobs:
     inputs:
       command: publish
       publishRegistry: useFeed
-      publishFeed: jellyfin/unstable
+      publishFeed: unstable
       workingDir: ./apiclient/generated/typescript/axios
 
 # Stable
-    - task: npmAuthenticate@0
-    displayName: 'Authenticate to stable npm feed'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
-
     - task: CmdLine@2
     displayName: 'Build stable typescript axios client'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
@@ -66,5 +58,5 @@ jobs:
     inputs:
       command: publish
       publishRegistry: useExternalRegistry
-      publishEndpoint:
+      publishEndpoint: 'jellyfin-bot for NPM'
       workingDir: ./apiclient/generated/typescript/axios
diff --git a/apiclient/templates/typescript/axios/unstable.sh b/apiclient/templates/typescript/axios/unstable.sh
index 83e4ba228a..5d85dc726c 100644
--- a/apiclient/templates/typescript/axios/unstable.sh
+++ b/apiclient/templates/typescript/axios/unstable.sh
@@ -6,4 +6,4 @@ java -jar openapi-generator-cli.jar generate \
     --output ./apiclient/generated/typescript/axios  \
     --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://dev.azure.com/jellyfin-project/jellyfin/_packaging"
+    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable/npm/registry/"

From 86e06369a93e6d7047646470e3755ad5df4c8974 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 08:00:57 -0600
Subject: [PATCH 173/247] fix liniting errors

---
 .ci/azure-pipelines-api-client.yml | 52 +++++++++++++++---------------
 .ci/azure-pipelines.yml            |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index dbd70c7028..f6e870674d 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -9,6 +9,7 @@
 jobs:
 - job: GenerateApiClients
   displayName: 'Generate Api Clients'
+  dependsOn: Test
 
   pool:
     vmImage: "${{ parameters.LinuxImage }}"
@@ -21,42 +22,41 @@ jobs:
         artifact: "OpenAPI Spec"
         path: "$(System.ArtifactsDirectory)/openapispec"
         runVersion: "latest"
-        dependsOn: Test
 
     - task: CmdLine@2
-    displayName: 'Download OpenApi Generator'
-    inputs:
-      scripts: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar"
+      displayName: 'Download OpenApi Generator'
+      inputs:
+        script: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar"
 
 # Generate npm api client
 # Unstable
     - task: CmdLine@2
-    displayName: 'Build unstable typescript axios client'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
-    inputs:
-      script: 'bash ./apiclient/templates/typescript/axios/unstable.sh'
+      displayName: 'Build unstable typescript axios client'
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+      inputs:
+        script: 'bash ./apiclient/templates/typescript/axios/unstable.sh'
 
     - task: Npm@1
-    displayName: 'Publish unstable typescript axios client'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
-    inputs:
-      command: publish
-      publishRegistry: useFeed
-      publishFeed: unstable
-      workingDir: ./apiclient/generated/typescript/axios
+      displayName: 'Publish unstable typescript axios client'
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+      inputs:
+        command: publish
+        publishRegistry: useFeed
+        publishFeed: unstable
+        workingDir: ./apiclient/generated/typescript/axios
 
 # Stable
     - task: CmdLine@2
-    displayName: 'Build stable typescript axios client'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
-    inputs:
-      script: 'bash ./apiclient/templates/typescript/axios/stable.sh'
+      displayName: 'Build stable typescript axios client'
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
+      inputs:
+        script: 'bash ./apiclient/templates/typescript/axios/stable.sh'
 
     - task: Npm@1
-    displayName: 'Publish stable typescript axios client'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
-    inputs:
-      command: publish
-      publishRegistry: useExternalRegistry
-      publishEndpoint: 'jellyfin-bot for NPM'
-      workingDir: ./apiclient/generated/typescript/axios
+      displayName: 'Publish stable typescript axios client'
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
+      inputs:
+        command: publish
+        publishRegistry: useExternalRegistry
+        publishEndpoint: 'jellyfin-bot for NPM'
+        workingDir: ./apiclient/generated/typescript/axios
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index f3e515447d..4c5db80c10 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -57,4 +57,4 @@ jobs:
   - template: azure-pipelines-package.yml
 
 - ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
-    - template: azure-pipelines-api-client.yml
+  - template: azure-pipelines-api-client.yml

From b95533d6a947306e92b02ff77d17fe07ca78e87c Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 08:06:06 -0600
Subject: [PATCH 174/247] there I go changing paths again

---
 apiclient/templates/typescript/axios/stable.sh   | 2 +-
 apiclient/templates/typescript/axios/unstable.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apiclient/templates/typescript/axios/stable.sh b/apiclient/templates/typescript/axios/stable.sh
index 70c6409fb6..118ef219fe 100644
--- a/apiclient/templates/typescript/axios/stable.sh
+++ b/apiclient/templates/typescript/axios/stable.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --input-spec $(System.ArtifactsDirectory)/openapispec/openapi.json \
     --generator-name typescript-axios \
     --output ./apiclient/generated/typescript/axios  \
     --template-dir ./apiclient/templates/typescript/axios \
diff --git a/apiclient/templates/typescript/axios/unstable.sh b/apiclient/templates/typescript/axios/unstable.sh
index 5d85dc726c..be9f9be438 100644
--- a/apiclient/templates/typescript/axios/unstable.sh
+++ b/apiclient/templates/typescript/axios/unstable.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapi/openapi.json \
+    --input-spec $(System.ArtifactsDirectory)/openapispec/openapi.json \
     --generator-name typescript-axios \
     --output ./apiclient/generated/typescript/axios  \
     --template-dir ./apiclient/templates/typescript/axios \

From 0ffc58e25509c375654430e64a2208baf6d65be9 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 08:21:28 -0600
Subject: [PATCH 175/247] Update .ci/azure-pipelines-api-client.yml

Co-authored-by: Cameron <Influence365@gmail.com>
---
 .ci/azure-pipelines-api-client.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index f6e870674d..7f428aec15 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -4,7 +4,7 @@
     default: "ubuntu-latest"
   - name: GeneratorVersion
     type: string
-    default: "4.3.1"
+    default: "5.0.0-beta2"
 
 jobs:
 - job: GenerateApiClients

From 9aad772288145645d51f93b26a2493782f55f2d3 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Fri, 2 Oct 2020 18:26:48 +0200
Subject: [PATCH 176/247] feat: implement
 CommaDelimitedArrayModelBinderProvider

---
 Jellyfin.Api/Controllers/SessionController.cs |  2 +-
 .../CommaDelimitedArrayModelBinderProvider.cs | 29 +++++++++++++++++++
 .../ApiServiceCollectionExtensions.cs         |  3 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinderProvider.cs

diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 68cec14151..3dbf7ba0b7 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -379,7 +379,7 @@ namespace Jellyfin.Api.Controllers
         public ActionResult PostCapabilities(
             [FromQuery] string? id,
             [FromQuery] string? playableMediaTypes,
-            [FromQuery][ModelBinder(typeof(CommaDelimitedArrayModelBinder))] GeneralCommandType[] supportedCommands,
+            [FromQuery] GeneralCommandType[] supportedCommands,
             [FromQuery] bool supportsMediaControl = false,
             [FromQuery] bool supportsSync = false,
             [FromQuery] bool supportsPersistentIdentifier = true)
diff --git a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinderProvider.cs b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinderProvider.cs
new file mode 100644
index 0000000000..b9785a73b8
--- /dev/null
+++ b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinderProvider.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Jellyfin.Api.ModelBinders
+{
+    /// <summary>
+    /// Comma delimited array model binder provider.
+    /// </summary>
+    public class CommaDelimitedArrayModelBinderProvider : IModelBinderProvider
+    {
+        private readonly IModelBinder _binder;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommaDelimitedArrayModelBinderProvider"/> class.
+        /// </summary>
+        public CommaDelimitedArrayModelBinderProvider()
+        {
+            _binder = new CommaDelimitedArrayModelBinder();
+        }
+
+        /// <inheritdoc />
+        public IModelBinder? GetBinder(ModelBinderProviderContext context)
+        {
+            return context.Metadata.ModelType.IsArray ? _binder : null;
+        }
+    }
+}
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 5bcf6d5f07..f867143df6 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -16,6 +16,7 @@ using Jellyfin.Api.Auth.LocalAccessPolicy;
 using Jellyfin.Api.Auth.RequiresElevationPolicy;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Controllers;
+using Jellyfin.Api.ModelBinders;
 using Jellyfin.Server.Configuration;
 using Jellyfin.Server.Filters;
 using Jellyfin.Server.Formatters;
@@ -166,6 +167,8 @@ namespace Jellyfin.Server.Extensions
 
                     opts.OutputFormatters.Add(new CssOutputFormatter());
                     opts.OutputFormatters.Add(new XmlOutputFormatter());
+
+                    opts.ModelBinderProviders.Insert(0, new CommaDelimitedArrayModelBinderProvider());
                 })
 
                 // Clear app parts to avoid other assemblies being picked up

From 754e859f6e13c0fad0ed91d694b7fca163f58ce1 Mon Sep 17 00:00:00 2001
From: Matt Montgomery <33811686+ConfusedPolarBear@users.noreply.github.com>
Date: Fri, 2 Oct 2020 12:05:39 -0500
Subject: [PATCH 177/247] Convert strings to ImageFormat

---
 Jellyfin.Api/Controllers/ImageController.cs | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Jellyfin.Api/Controllers/ImageController.cs b/Jellyfin.Api/Controllers/ImageController.cs
index 7afec1219e..6f925dec58 100644
--- a/Jellyfin.Api/Controllers/ImageController.cs
+++ b/Jellyfin.Api/Controllers/ImageController.cs
@@ -364,7 +364,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] int? quality,
             [FromQuery] string? tag,
             [FromQuery] bool? cropWhitespace,
-            [FromQuery] string? format,
+            [FromQuery] ImageFormat? format,
             [FromQuery] bool? addPlayedIndicator,
             [FromQuery] double? percentPlayed,
             [FromQuery] int? unplayedCount,
@@ -443,7 +443,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] int? quality,
             [FromRoute, Required] string tag,
             [FromQuery] bool? cropWhitespace,
-            [FromRoute, Required] string format,
+            [FromRoute, Required] ImageFormat format,
             [FromQuery] bool? addPlayedIndicator,
             [FromRoute, Required] double percentPlayed,
             [FromRoute, Required] int unplayedCount,
@@ -516,7 +516,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string name,
             [FromRoute, Required] ImageType imageType,
             [FromQuery] string tag,
-            [FromQuery] string format,
+            [FromQuery] ImageFormat? format,
             [FromQuery] int? maxWidth,
             [FromQuery] int? maxHeight,
             [FromQuery] double? percentPlayed,
@@ -595,7 +595,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string name,
             [FromRoute, Required] ImageType imageType,
             [FromQuery] string tag,
-            [FromQuery] string format,
+            [FromQuery] ImageFormat? format,
             [FromQuery] int? maxWidth,
             [FromQuery] int? maxHeight,
             [FromQuery] double? percentPlayed,
@@ -674,7 +674,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string name,
             [FromRoute, Required] ImageType imageType,
             [FromQuery] string tag,
-            [FromQuery] string format,
+            [FromQuery] ImageFormat? format,
             [FromQuery] int? maxWidth,
             [FromQuery] int? maxHeight,
             [FromQuery] double? percentPlayed,
@@ -753,7 +753,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string name,
             [FromRoute, Required] ImageType imageType,
             [FromQuery] string tag,
-            [FromQuery] string format,
+            [FromQuery] ImageFormat? format,
             [FromQuery] int? maxWidth,
             [FromQuery] int? maxHeight,
             [FromQuery] double? percentPlayed,
@@ -832,7 +832,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] string name,
             [FromRoute, Required] ImageType imageType,
             [FromRoute, Required] string tag,
-            [FromRoute, Required] string format,
+            [FromRoute, Required] ImageFormat format,
             [FromQuery] int? maxWidth,
             [FromQuery] int? maxHeight,
             [FromQuery] double? percentPlayed,
@@ -911,7 +911,7 @@ namespace Jellyfin.Api.Controllers
             [FromRoute, Required] Guid userId,
             [FromRoute, Required] ImageType imageType,
             [FromQuery] string? tag,
-            [FromQuery] string? format,
+            [FromQuery] ImageFormat? format,
             [FromQuery] int? maxWidth,
             [FromQuery] int? maxHeight,
             [FromQuery] double? percentPlayed,
@@ -1038,7 +1038,7 @@ namespace Jellyfin.Api.Controllers
             ImageType imageType,
             int? imageIndex,
             string? tag,
-            string? format,
+            ImageFormat? format,
             int? maxWidth,
             int? maxHeight,
             double? percentPlayed,
@@ -1128,12 +1128,11 @@ namespace Jellyfin.Api.Controllers
                 isHeadRequest).ConfigureAwait(false);
         }
 
-        private ImageFormat[] GetOutputFormats(string? format)
+        private ImageFormat[] GetOutputFormats(ImageFormat? format)
         {
-            if (!string.IsNullOrWhiteSpace(format)
-                && Enum.TryParse(format, true, out ImageFormat parsedFormat))
+            if (format.HasValue)
             {
-                return new[] { parsedFormat };
+                return new[] { format.Value };
             }
 
             return GetClientSupportedFormats();
@@ -1157,7 +1156,7 @@ namespace Jellyfin.Api.Controllers
 
             var acceptParam = Request.Query[HeaderNames.Accept];
 
-            var supportsWebP = SupportsFormat(supportedFormats, acceptParam, "webp", false);
+            var supportsWebP = SupportsFormat(supportedFormats, acceptParam, ImageFormat.Webp, false);
 
             if (!supportsWebP)
             {
@@ -1179,7 +1178,7 @@ namespace Jellyfin.Api.Controllers
             formats.Add(ImageFormat.Jpg);
             formats.Add(ImageFormat.Png);
 
-            if (SupportsFormat(supportedFormats, acceptParam, "gif", true))
+            if (SupportsFormat(supportedFormats, acceptParam, ImageFormat.Gif, true))
             {
                 formats.Add(ImageFormat.Gif);
             }
@@ -1187,9 +1186,10 @@ namespace Jellyfin.Api.Controllers
             return formats.ToArray();
         }
 
-        private bool SupportsFormat(IReadOnlyCollection<string> requestAcceptTypes, string acceptParam, string format, bool acceptAll)
+        private bool SupportsFormat(IReadOnlyCollection<string> requestAcceptTypes, string acceptParam, ImageFormat format, bool acceptAll)
         {
-            var mimeType = "image/" + format;
+            var normalized = format.ToString().ToLowerInvariant();
+            var mimeType = "image/" + normalized;
 
             if (requestAcceptTypes.Contains(mimeType))
             {
@@ -1201,7 +1201,7 @@ namespace Jellyfin.Api.Controllers
                 return true;
             }
 
-            return string.Equals(acceptParam, format, StringComparison.OrdinalIgnoreCase);
+            return string.Equals(acceptParam, normalized, StringComparison.OrdinalIgnoreCase);
         }
 
         private async Task<ActionResult> GetImageResult(

From 8535a718b7e9307dfcb2e04d198b0cabbdb15205 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 2 Oct 2020 19:43:34 +0200
Subject: [PATCH 178/247] Add tests for deserializing guids

---
 .../Json/JsonGuidConverterTests.cs            | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs

diff --git a/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs b/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs
new file mode 100644
index 0000000000..aef5b3a7d7
--- /dev/null
+++ b/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Text.Json;
+using MediaBrowser.Common.Json.Converters;
+using Xunit;
+
+namespace Jellyfin.Common.Tests.Extensions
+{
+    public static class JsonGuidConverterTests
+    {
+        [Fact]
+        public static void Deserialize_Valid_Success()
+        {
+            var options = new JsonSerializerOptions();
+            options.Converters.Add(new JsonGuidConverter());
+            Guid value = JsonSerializer.Deserialize<Guid>(@"""a852a27afe324084ae66db579ee3ee18""", options);
+            Assert.Equal(new Guid("a852a27afe324084ae66db579ee3ee18"), value);
+
+            value = JsonSerializer.Deserialize<Guid>(@"""e9b2dcaa-529c-426e-9433-5e9981f27f2e""", options);
+            Assert.Equal(new Guid("e9b2dcaa-529c-426e-9433-5e9981f27f2e"), value);
+        }
+    }
+}

From 6a32385588889074496dd94a6160614d01bdd63d Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 2 Oct 2020 13:30:31 -0600
Subject: [PATCH 179/247] Allow server to return .data files

---
 Jellyfin.Server/Startup.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 2f4620aa63..62ffe174cd 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.Net.Http.Headers;
+using System.Net.Mime;
 using Jellyfin.Api.TypeConverters;
 using Jellyfin.Server.Extensions;
 using Jellyfin.Server.Implementations;
@@ -11,6 +12,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
@@ -123,10 +125,15 @@ namespace Jellyfin.Server
                 mainApp.UseStaticFiles();
                 if (appConfig.HostWebClient())
                 {
+                    var extensionProvider = new FileExtensionContentTypeProvider();
+
+                    // subtitles octopus requires .data files.
+                    extensionProvider.Mappings.Add(".data", MediaTypeNames.Application.Octet);
                     mainApp.UseStaticFiles(new StaticFileOptions
                     {
                         FileProvider = new PhysicalFileProvider(_serverConfigurationManager.ApplicationPaths.WebPath),
-                        RequestPath = "/web"
+                        RequestPath = "/web",
+                        ContentTypeProvider = extensionProvider
                     });
                 }
 

From 33f80dc3c167f07348cd817f38a33a78302bda6b Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Sat, 3 Oct 2020 01:09:15 +0200
Subject: [PATCH 180/247] feat(CommaDelimitedArrayModelBinder): add none result
 check

---
 Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
index 208566dc8e..13469194a0 100644
--- a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
+++ b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
@@ -18,6 +18,11 @@ namespace Jellyfin.Api.ModelBinders
             var elementType = bindingContext.ModelType.GetElementType();
             var converter = TypeDescriptor.GetConverter(elementType);
 
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                return Task.CompletedTask;
+            }
+
             if (valueProviderResult.Length > 1)
             {
                 var result = Array.CreateInstance(elementType, valueProviderResult.Length);

From b3b98a5cc8d49174dda4d4784a7e9297b5961f68 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Sat, 3 Oct 2020 01:09:28 +0200
Subject: [PATCH 181/247] test: add TestType enum

---
 .../Jellyfin.Api.Tests/ModelBinders/TestType.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/Jellyfin.Api.Tests/ModelBinders/TestType.cs

diff --git a/tests/Jellyfin.Api.Tests/ModelBinders/TestType.cs b/tests/Jellyfin.Api.Tests/ModelBinders/TestType.cs
new file mode 100644
index 0000000000..544a74637a
--- /dev/null
+++ b/tests/Jellyfin.Api.Tests/ModelBinders/TestType.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Jellyfin.Api.Tests.ModelBinders
+{
+    public enum TestType
+    {
+#pragma warning disable SA1602 // Enumeration items should be documented
+        How,
+        Much,
+        Is,
+        The,
+        Fish
+#pragma warning restore SA1602 // Enumeration items should be documented
+    }
+}

From 1bd80a634fc941c51b13b624530ab12ce6551820 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Sat, 3 Oct 2020 01:09:45 +0200
Subject: [PATCH 182/247] test: add CommaDelimitedArrayModelBinder tests

---
 .../CommaDelimitedArrayModelBinderTests.cs    | 229 ++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs

diff --git a/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs b/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
new file mode 100644
index 0000000000..b05be6a16a
--- /dev/null
+++ b/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Text;
+using System.Threading.Tasks;
+using Jellyfin.Api.ModelBinders;
+using MediaBrowser.Controller.Entities;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Jellyfin.Api.Tests.ModelBinders
+{
+    public sealed class CommaDelimitedArrayModelBinderTests
+    {
+        [Fact]
+        public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedStringArrayQuery()
+        {
+            var queryParamName = "test";
+            var queryParamValues = new string[] { "lol", "xd" };
+            var queryParamString = "lol,xd";
+            var queryParamType = typeof(string[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            Assert.True(bindingContextMock.Object.Result.IsModelSet);
+            Assert.Equal((string[])bindingContextMock.Object.Result.Model, queryParamValues);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedIntArrayQuery()
+        {
+            var queryParamName = "test";
+            var queryParamValues = new int[] { 42, 0 };
+            var queryParamString = "42,0";
+            var queryParamType = typeof(int[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            Assert.True(bindingContextMock.Object.Result.IsModelSet);
+            Assert.Equal((int[])bindingContextMock.Object.Result.Model, queryParamValues);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedEnumArrayQuery()
+        {
+            var queryParamName = "test";
+            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamString = "How,Much";
+            var queryParamType = typeof(TestType[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            Assert.True(bindingContextMock.Object.Result.IsModelSet);
+            Assert.Equal((TestType[])bindingContextMock.Object.Result.Model, queryParamValues);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedEnumArrayQuery2()
+        {
+            var queryParamName = "test";
+            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamString = "How,,Much";
+            var queryParamType = typeof(TestType[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            Assert.True(bindingContextMock.Object.Result.IsModelSet);
+            Assert.Equal((TestType[])bindingContextMock.Object.Result.Model, queryParamValues);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_CorrectlyBindsValidEnumArrayQuery()
+        {
+            var queryParamName = "test";
+            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamString1 = "How";
+            var queryParamString2 = "Much";
+            var queryParamType = typeof(TestType[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>()
+                    {
+                        { queryParamName, new StringValues(new string[] { queryParamString1, queryParamString2 }) },
+                    }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            Assert.True(bindingContextMock.Object.Result.IsModelSet);
+            Assert.Equal((TestType[])bindingContextMock.Object.Result.Model, queryParamValues);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_CorrectlyBindsValidEnumArrayQuery2()
+        {
+            var queryParamName = "test";
+            var queryParamValues = Array.Empty<TestType>();
+            var queryParamType = typeof(TestType[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>()
+                    {
+                        { queryParamName, new StringValues(value: null) },
+                    }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            Assert.False(bindingContextMock.Object.Result.IsModelSet);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ThrowsIfCommaDelimitedEnumArrayQueryIsInvalid()
+        {
+            var queryParamName = "test";
+            var queryParamString = "🔥,😢";
+            var queryParamType = typeof(TestType[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            Func<Task> act = async () => await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            await Assert.ThrowsAsync<FormatException>(act);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ThrowsIfCommaDelimitedEnumArrayQueryIsInvalid2()
+        {
+            var queryParamName = "test";
+            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamString1 = "How";
+            var queryParamString2 = "😱";
+            var queryParamType = typeof(TestType[]);
+
+            var modelBinder = new CommaDelimitedArrayModelBinder();
+
+            var valueProvider = new QueryStringValueProvider(
+                    new BindingSource(string.Empty, string.Empty, false, false),
+                    new QueryCollection(new Dictionary<string, StringValues>()
+                    {
+                        { queryParamName, new StringValues(new string[] { queryParamString1, queryParamString2 }) },
+                    }),
+                    CultureInfo.InvariantCulture);
+            var bindingContextMock = new Mock<ModelBindingContext>();
+            bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
+            bindingContextMock.Setup(b => b.ModelName).Returns(queryParamName);
+            bindingContextMock.Setup(b => b.ModelType).Returns(queryParamType);
+            bindingContextMock.SetupProperty(b => b.Result);
+
+            Func<Task> act = async () => await modelBinder.BindModelAsync(bindingContextMock.Object);
+
+            await Assert.ThrowsAsync<FormatException>(act);
+        }
+    }
+}

From 86cbefb059e55680bbf40769cdf13849e19b31bb Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthony@lavado.ca>
Date: Fri, 2 Oct 2020 20:32:52 -0400
Subject: [PATCH 183/247] Remove Windows legacy files

---
 windows/build-jellyfin.ps1            | 190 ---------
 windows/dependencies.txt              |   2 -
 windows/dialogs/confirmation.nsddef   |  24 --
 windows/dialogs/confirmation.nsdinc   |  61 ---
 windows/dialogs/service-config.nsddef |  13 -
 windows/dialogs/service-config.nsdinc |  56 ---
 windows/dialogs/setuptype.nsddef      |  12 -
 windows/dialogs/setuptype.nsdinc      |  50 ---
 windows/helpers/ShowError.nsh         |  10 -
 windows/helpers/StrSlash.nsh          |  47 ---
 windows/jellyfin.nsi                  | 575 --------------------------
 windows/legacy/install-jellyfin.ps1   | 460 ---------------------
 windows/legacy/install.bat            |   1 -
 13 files changed, 1501 deletions(-)
 delete mode 100644 windows/build-jellyfin.ps1
 delete mode 100644 windows/dependencies.txt
 delete mode 100644 windows/dialogs/confirmation.nsddef
 delete mode 100644 windows/dialogs/confirmation.nsdinc
 delete mode 100644 windows/dialogs/service-config.nsddef
 delete mode 100644 windows/dialogs/service-config.nsdinc
 delete mode 100644 windows/dialogs/setuptype.nsddef
 delete mode 100644 windows/dialogs/setuptype.nsdinc
 delete mode 100644 windows/helpers/ShowError.nsh
 delete mode 100644 windows/helpers/StrSlash.nsh
 delete mode 100644 windows/jellyfin.nsi
 delete mode 100644 windows/legacy/install-jellyfin.ps1
 delete mode 100644 windows/legacy/install.bat

diff --git a/windows/build-jellyfin.ps1 b/windows/build-jellyfin.ps1
deleted file mode 100644
index b65e619ee1..0000000000
--- a/windows/build-jellyfin.ps1
+++ /dev/null
@@ -1,190 +0,0 @@
-[CmdletBinding()]
-param(
-    [switch]$MakeNSIS,
-    [switch]$InstallNSIS,
-    [switch]$InstallFFMPEG,
-    [switch]$InstallNSSM,
-    [switch]$SkipJellyfinBuild,
-    [switch]$GenerateZip,
-    [string]$InstallLocation = "./dist/jellyfin-win-nsis",
-    [string]$UXLocation = "../jellyfin-ux",
-    [switch]$InstallTrayApp,
-    [ValidateSet('Debug','Release')][string]$BuildType = 'Release',
-    [ValidateSet('Quiet','Minimal', 'Normal')][string]$DotNetVerbosity = 'Minimal',
-    [ValidateSet('win','win7', 'win8','win81','win10')][string]$WindowsVersion = 'win',
-    [ValidateSet('x64','x86', 'arm', 'arm64')][string]$Architecture = 'x64'
-)
-
-$ProgressPreference = 'SilentlyContinue' # Speedup all downloads by hiding progress bars.
-
-#PowershellCore and *nix check to make determine which temp dir to use.
-if(($PSVersionTable.PSEdition -eq 'Core') -and (-not $IsWindows)){
-    $TempDir = mktemp -d
-}else{
-    $TempDir = $env:Temp
-}
-#Create staging dir
-New-Item -ItemType Directory -Force -Path $InstallLocation
-$ResolvedInstallLocation = Resolve-Path $InstallLocation
-$ResolvedUXLocation = Resolve-Path $UXLocation
-
-function Build-JellyFin {
-    if(($Architecture -eq 'arm64') -and ($WindowsVersion -ne 'win10')){
-            Write-Error "arm64 only supported with Windows10 Version"
-            exit
-        }
-    if(($Architecture -eq 'arm') -and ($WindowsVersion -notin @('win10','win81','win8'))){
-            Write-Error "arm only supported with Windows 8 or higher"
-            exit
-        }
-    Write-Verbose "windowsversion-Architecture: $windowsversion-$Architecture"
-    Write-Verbose "InstallLocation: $ResolvedInstallLocation"
-    Write-Verbose "DotNetVerbosity: $DotNetVerbosity"
-    dotnet publish --self-contained -c $BuildType --output $ResolvedInstallLocation -v $DotNetVerbosity -p:GenerateDocumentationFile=true -p:DebugSymbols=false -p:DebugType=none --runtime `"$windowsversion-$Architecture`" Jellyfin.Server
-}
-
-function Install-FFMPEG {
-    param(
-        [string]$ResolvedInstallLocation,
-        [string]$Architecture,
-        [string]$FFMPEGVersionX86 = "ffmpeg-4.3-win32-shared"
-    )
-    Write-Verbose "Checking Architecture"
-    if($Architecture -notin @('x86','x64')){
-        Write-Warning "No builds available for your selected architecture of $Architecture"
-        Write-Warning "FFMPEG will not be installed"
-    }elseif($Architecture -eq 'x64'){
-         Write-Verbose "Downloading 64 bit FFMPEG"
-         Invoke-WebRequest -Uri https://repo.jellyfin.org/releases/server/windows/ffmpeg/jellyfin-ffmpeg.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose
-    }else{
-         Write-Verbose "Downloading 32 bit FFMPEG"
-         Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win32/shared/$FFMPEGVersionX86.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose
-    }
-
-    Expand-Archive "$tempdir/ffmpeg.zip" -DestinationPath "$tempdir/ffmpeg/" -Force | Write-Verbose
-    if($Architecture -eq 'x64'){
-        Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/ffmpeg" | ForEach-Object {
-            Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
-        }
-    }else{
-        Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/ffmpeg/$FFMPEGVersionX86/bin" | ForEach-Object {
-            Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
-        }
-    }
-    Remove-Item "$tempdir/ffmpeg/" -Recurse -Force -ErrorAction Continue | Write-Verbose
-    Remove-Item "$tempdir/ffmpeg.zip" -Force -ErrorAction Continue | Write-Verbose
-}
-
-function Install-NSSM {
-    param(
-        [string]$ResolvedInstallLocation,
-        [string]$Architecture
-    )
-    Write-Verbose "Checking Architecture"
-    if($Architecture -notin @('x86','x64')){
-        Write-Warning "No builds available for your selected architecture of $Architecture"
-        Write-Warning "NSSM will not be installed"
-    }else{
-         Write-Verbose "Downloading NSSM"
-         # [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-         # Temporary workaround, file is hosted in an azure blob with a custom domain in front for brevity
-         Invoke-WebRequest -Uri http://files.evilt.win/nssm/nssm-2.24-101-g897c7ad.zip -UseBasicParsing -OutFile "$tempdir/nssm.zip" | Write-Verbose
-    }
-
-    Expand-Archive "$tempdir/nssm.zip" -DestinationPath "$tempdir/nssm/" -Force | Write-Verbose
-    if($Architecture -eq 'x64'){
-        Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/nssm/nssm-2.24-101-g897c7ad/win64" | ForEach-Object {
-            Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
-        }
-    }else{
-        Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/nssm/nssm-2.24-101-g897c7ad/win32" | ForEach-Object {
-            Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
-        }
-    }
-    Remove-Item "$tempdir/nssm/" -Recurse -Force -ErrorAction Continue | Write-Verbose
-    Remove-Item "$tempdir/nssm.zip" -Force -ErrorAction Continue | Write-Verbose
-}
-
-function Make-NSIS {
-    param(
-        [string]$ResolvedInstallLocation
-    )
-
-    $env:InstallLocation = $ResolvedInstallLocation
-    if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
-        & "$tempdir/nsis/nsis-3.04/makensis.exe" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\deployment\windows\jellyfin.nsi"
-    } else {
-        & "makensis" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\deployment\windows\jellyfin.nsi"
-    }
-    Copy-Item .\deployment\windows\jellyfin_*.exe $ResolvedInstallLocation\..\
-}
-
-
-function Install-NSIS {
-    Write-Verbose "Downloading NSIS"
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-    Invoke-WebRequest -Uri https://nchc.dl.sourceforge.net/project/nsis/NSIS%203/3.04/nsis-3.04.zip -UseBasicParsing -OutFile "$tempdir/nsis.zip" | Write-Verbose
-
-    Expand-Archive "$tempdir/nsis.zip" -DestinationPath "$tempdir/nsis/" -Force | Write-Verbose
-}
-
-function Cleanup-NSIS {
-    Remove-Item "$tempdir/nsis/" -Recurse -Force -ErrorAction Continue | Write-Verbose
-    Remove-Item "$tempdir/nsis.zip" -Force -ErrorAction Continue | Write-Verbose
-}
-
-function Install-TrayApp {
-    param(
-        [string]$ResolvedInstallLocation,
-        [string]$Architecture
-    )
-    Write-Verbose "Checking Architecture"
-    if($Architecture -ne 'x64'){
-        Write-Warning "No builds available for your selected architecture of $Architecture"
-        Write-Warning "The tray app will not be available."
-    }else{
-        Write-Verbose "Downloading Tray App and copying to Jellyfin location"
-        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-        Invoke-WebRequest -Uri https://github.com/jellyfin/jellyfin-windows-tray/releases/latest/download/JellyfinTray.exe -UseBasicParsing -OutFile "$installLocation/JellyfinTray.exe" | Write-Verbose
-    }
-}
-
-if(-not $SkipJellyfinBuild.IsPresent -and -not ($InstallNSIS -eq $true)){
-    Write-Verbose "Starting Build Process: Selected Environment is $WindowsVersion-$Architecture"
-    Build-JellyFin
-}
-if($InstallFFMPEG.IsPresent -or ($InstallFFMPEG -eq $true)){
-    Write-Verbose "Starting FFMPEG Install"
-    Install-FFMPEG $ResolvedInstallLocation $Architecture
-}
-if($InstallNSSM.IsPresent -or ($InstallNSSM -eq $true)){
-    Write-Verbose "Starting NSSM Install"
-    Install-NSSM $ResolvedInstallLocation $Architecture
-}
-if($InstallTrayApp.IsPresent -or ($InstallTrayApp -eq $true)){
-    Write-Verbose "Downloading Windows Tray App"
-    Install-TrayApp $ResolvedInstallLocation $Architecture
-}
-#Copy-Item .\deployment\windows\install-jellyfin.ps1 $ResolvedInstallLocation\install-jellyfin.ps1
-#Copy-Item .\deployment\windows\install.bat $ResolvedInstallLocation\install.bat
-Copy-Item .\LICENSE $ResolvedInstallLocation\LICENSE
-if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
-    Write-Verbose "Installing NSIS"
-    Install-NSIS
-}
-if($MakeNSIS.IsPresent -or ($MakeNSIS -eq $true)){
-    Write-Verbose "Starting NSIS Package creation"
-    Make-NSIS $ResolvedInstallLocation
-}
-if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
-    Write-Verbose "Cleanup NSIS"
-    Cleanup-NSIS
-}
-if($GenerateZip.IsPresent -or ($GenerateZip -eq $true)){
-    Compress-Archive -Path $ResolvedInstallLocation -DestinationPath "$ResolvedInstallLocation/jellyfin.zip" -Force
-}
-Write-Verbose "Finished"
diff --git a/windows/dependencies.txt b/windows/dependencies.txt
deleted file mode 100644
index 16f77cce7c..0000000000
--- a/windows/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-dotnet
-nsis
diff --git a/windows/dialogs/confirmation.nsddef b/windows/dialogs/confirmation.nsddef
deleted file mode 100644
index 969ebacd62..0000000000
--- a/windows/dialogs/confirmation.nsddef
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file was created by NSISDialogDesigner 1.4.4.0
-http://coolsoft.altervista.org/nsisdialogdesigner
-Do not edit manually!
--->
-<Dialog Name="confirmation" Title="Confirmation Page" Subtitle="Please confirm your choices for Jellyfin Server installation" GenerateShowFunction="False">
-  <HeaderCustomScript>!include "helpers\StrSlash.nsh"</HeaderCustomScript>
-  <CreateFunctionCustomScript>${StrSlash} '$0' $INSTDIR
-
-  ${StrSlash} '$1' $_JELLYFINDATADIR_
-
-  ${NSD_SetText} $hCtl_confirmation_ConfirmRichText "{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1043\viewkind4\uc1 \
-    \pard\widctlpar\sa160\sl252\slmult1\b The installer will proceed based on the following inputs gathered on earlier screens.\par \
-    Installation Folder:\b0  $0\line\b \
-    Service install:\b0  $_INSTALLSERVICE_\line\b \
-    Service start:\b0  $_SERVICESTART_\line\b \
-    Service account:\b0  $_SERVICEACCOUNTTYPE_\line\b \
-    Jellyfin Data Folder:\b0  $1\par \
-\
-    \pard\sa200\sl276\slmult1\f1\lang1043\par \
-    }"</CreateFunctionCustomScript>
-  <RichText Name="ConfirmRichText" Location="12, 12" Size="426, 204" TabIndex="0" ExStyle="WS_EX_STATICEDGE" />
-</Dialog>
diff --git a/windows/dialogs/confirmation.nsdinc b/windows/dialogs/confirmation.nsdinc
deleted file mode 100644
index f00e9b43ab..0000000000
--- a/windows/dialogs/confirmation.nsdinc
+++ /dev/null
@@ -1,61 +0,0 @@
-; =========================================================
-; This file was generated by NSISDialogDesigner 1.4.4.0
-; http://coolsoft.altervista.org/nsisdialogdesigner
-;
-; Do not edit it manually, use NSISDialogDesigner instead!
-; Modified by EraYaN (2019-09-01)
-; =========================================================
-
-; handle variables
-Var hCtl_confirmation
-Var hCtl_confirmation_ConfirmRichText
-
-; HeaderCustomScript
-!include "helpers\StrSlash.nsh"
-
-
-
-; dialog create function
-Function fnc_confirmation_Create
-
-  ; === confirmation (type: Dialog) ===
-  nsDialogs::Create 1018
-  Pop $hCtl_confirmation
-  ${If} $hCtl_confirmation == error
-    Abort
-  ${EndIf}
-  !insertmacro MUI_HEADER_TEXT "Confirmation Page" "Please confirm your choices for Jellyfin Server installation"
-
-  ; === ConfirmRichText (type: RichText) ===
-  nsDialogs::CreateControl /NOUNLOAD "RichEdit20A" ${ES_READONLY}|${WS_VISIBLE}|${WS_CHILD}|${WS_TABSTOP}|${WS_VSCROLL}|${ES_MULTILINE}|${ES_WANTRETURN} ${WS_EX_STATICEDGE} 8u 7u 280u 126u ""
-  Pop $hCtl_confirmation_ConfirmRichText
-  ${NSD_AddExStyle} $hCtl_confirmation_ConfirmRichText ${WS_EX_STATICEDGE}
-
-  ; CreateFunctionCustomScript
-  ${StrSlash} '$0' $INSTDIR
-
-  ${StrSlash} '$1' $_JELLYFINDATADIR_
-
-  ${If} $_INSTALLSERVICE_ == "Yes"
-  ${NSD_SetText} $hCtl_confirmation_ConfirmRichText "{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1043\viewkind4\uc1 \
-    \pard\widctlpar\sa160\sl252\slmult1\b The installer will proceed based on the following inputs gathered on earlier screens.\par \
-    Installation Folder:\b0  $0\line\b \
-    Service install:\b0  $_INSTALLSERVICE_\line\b \
-    Service start:\b0  $_SERVICESTART_\line\b \
-    Service account:\b0  $_SERVICEACCOUNTTYPE_\line\b \
-    Jellyfin Data Folder:\b0  $1\par \
-    \
-    \pard\sa200\sl276\slmult1\f1\lang1043\par \
-    }"
-  ${Else}
-  ${NSD_SetText} $hCtl_confirmation_ConfirmRichText "{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1043\viewkind4\uc1 \
-    \pard\widctlpar\sa160\sl252\slmult1\b The installer will proceed based on the following inputs gathered on earlier screens.\par \
-    Installation Folder:\b0  $0\line\b \
-    Service install:\b0  $_INSTALLSERVICE_\line\b \
-    Jellyfin Data Folder:\b0  $1\par \
-    \
-    \pard\sa200\sl276\slmult1\f1\lang1043\par \
-    }"
-  ${EndIf}
-
-FunctionEnd
diff --git a/windows/dialogs/service-config.nsddef b/windows/dialogs/service-config.nsddef
deleted file mode 100644
index 3509ada249..0000000000
--- a/windows/dialogs/service-config.nsddef
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file was created by NSISDialogDesigner 1.4.4.0
-http://coolsoft.altervista.org/nsisdialogdesigner
-Do not edit manually!
--->
-<Dialog Name="service_config" Title="CoOnfigure the service" Subtitle="This controls what type of access the server gets to this system." GenerateShowFunction="False">
-  <CheckBox Name="StartServiceAfterInstall" Location="12, 192" Size="426, 24" Text="Start Service after Install" Checked="True" TabIndex="0" />
-  <Label Name="LocalSystemAccountLabel" Location="12, 115" Size="426, 46" Text="The Local System account has full access to every resource and file on the system. This can have very real security implications, do not use unless absolutely neseccary." TabIndex="1" />
-  <Label Name="NetworkServiceAccountLabel" Location="12, 39" Size="426, 46" Text="The NetworkService account is a predefined local account used by the service control manager. It is the recommended way to install the Jellyfin Server service." TabIndex="2" />
-  <RadioButton Name="UseLocalSystemAccount" Location="12, 88" Size="426, 24" Text="Use Local System account" TabIndex="3" />
-  <RadioButton Name="UseNetworkServiceAccount" Location="12, 12" Size="426, 24" Text="Use Network Service account (Recommended)" Font="Microsoft Sans Serif, 8.25pt, style=Bold" Checked="True" TabIndex="4" />
-</Dialog>
\ No newline at end of file
diff --git a/windows/dialogs/service-config.nsdinc b/windows/dialogs/service-config.nsdinc
deleted file mode 100644
index 58c350f2ec..0000000000
--- a/windows/dialogs/service-config.nsdinc
+++ /dev/null
@@ -1,56 +0,0 @@
-; =========================================================
-; This file was generated by NSISDialogDesigner 1.4.4.0
-; http://coolsoft.altervista.org/nsisdialogdesigner
-;
-; Do not edit it manually, use NSISDialogDesigner instead!
-; =========================================================
-
-; handle variables
-Var hCtl_service_config
-Var hCtl_service_config_StartServiceAfterInstall
-Var hCtl_service_config_LocalSystemAccountLabel
-Var hCtl_service_config_NetworkServiceAccountLabel
-Var hCtl_service_config_UseLocalSystemAccount
-Var hCtl_service_config_UseNetworkServiceAccount
-Var hCtl_service_config_Font1
-
-
-; dialog create function
-Function fnc_service_config_Create
-
-  ; custom font definitions
-  CreateFont $hCtl_service_config_Font1 "Microsoft Sans Serif" "8.25" "700"
-
-  ; === service_config (type: Dialog) ===
-  nsDialogs::Create 1018
-  Pop $hCtl_service_config
-  ${If} $hCtl_service_config == error
-    Abort
-  ${EndIf}
-  !insertmacro MUI_HEADER_TEXT "Configure the service" "This controls what type of access the server gets to this system."
-
-  ; === StartServiceAfterInstall (type: Checkbox) ===
-  ${NSD_CreateCheckbox} 8u 118u 280u 15u "Start Service after Install"
-  Pop $hCtl_service_config_StartServiceAfterInstall
-  ${NSD_Check} $hCtl_service_config_StartServiceAfterInstall
-
-  ; === LocalSystemAccountLabel (type: Label) ===
-  ${NSD_CreateLabel} 8u 71u 280u 28u "The Local System account has full access to every resource and file on the system. This can have very real security implications, do not use unless absolutely neseccary."
-  Pop $hCtl_service_config_LocalSystemAccountLabel
-
-  ; === NetworkServiceAccountLabel (type: Label) ===
-  ${NSD_CreateLabel} 8u 24u 280u 28u "The NetworkService account is a predefined local account used by the service control manager. It is the recommended way to install the Jellyfin Server service."
-  Pop $hCtl_service_config_NetworkServiceAccountLabel
-
-  ; === UseLocalSystemAccount (type: RadioButton) ===
-  ${NSD_CreateRadioButton} 8u 54u 280u 15u "Use Local System account"
-  Pop $hCtl_service_config_UseLocalSystemAccount
-  ${NSD_AddStyle} $hCtl_service_config_UseLocalSystemAccount ${WS_GROUP}
-
-  ; === UseNetworkServiceAccount (type: RadioButton) ===
-  ${NSD_CreateRadioButton} 8u 7u 280u 15u "Use Network Service account (Recommended)"
-  Pop $hCtl_service_config_UseNetworkServiceAccount
-  SendMessage $hCtl_service_config_UseNetworkServiceAccount ${WM_SETFONT} $hCtl_service_config_Font1 0
-  ${NSD_Check} $hCtl_service_config_UseNetworkServiceAccount
-
-FunctionEnd
diff --git a/windows/dialogs/setuptype.nsddef b/windows/dialogs/setuptype.nsddef
deleted file mode 100644
index b55ceeaaa6..0000000000
--- a/windows/dialogs/setuptype.nsddef
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file was created by NSISDialogDesigner 1.4.4.0
-http://coolsoft.altervista.org/nsisdialogdesigner
-Do not edit manually!
--->
-<Dialog Name="setuptype" Title="Setup Type" Subtitle="Control how Jellyfin is installed.">
-  <Label Name="InstallasaServiceLabel" Location="12, 115" Size="426, 46" Text="Install Jellyfin as a service. This method is recommended for Advanced Users. Additional setup is required to access network shares." TabIndex="0" />
-  <RadioButton Name="InstallasaService" Location="12, 88" Size="426, 24" Text="Install as a Service (Advanced Users)" TabIndex="1" />
-  <Label Name="BasicInstallLabel" Location="12, 39" Size="426, 46" Text="The basic install will run Jellyfin in your current user account.$\nThis is recommended for new users and those with existing Jellyfin installs older than 10.4." TabIndex="2" />
-  <RadioButton Name="BasicInstall" Location="12, 12" Size="426, 24" Text="Basic Install (Recommended)" Font="Microsoft Sans Serif, 8.25pt, style=Bold" Checked="True" TabIndex="3" />
-</Dialog>
\ No newline at end of file
diff --git a/windows/dialogs/setuptype.nsdinc b/windows/dialogs/setuptype.nsdinc
deleted file mode 100644
index 8746ad2cc6..0000000000
--- a/windows/dialogs/setuptype.nsdinc
+++ /dev/null
@@ -1,50 +0,0 @@
-; =========================================================
-; This file was generated by NSISDialogDesigner 1.4.4.0
-; http://coolsoft.altervista.org/nsisdialogdesigner
-;
-; Do not edit it manually, use NSISDialogDesigner instead!
-; =========================================================
-
-; handle variables
-Var hCtl_setuptype
-Var hCtl_setuptype_InstallasaServiceLabel
-Var hCtl_setuptype_InstallasaService
-Var hCtl_setuptype_BasicInstallLabel
-Var hCtl_setuptype_BasicInstall
-Var hCtl_setuptype_Font1
-
-
-; dialog create function
-Function fnc_setuptype_Create
-  
-  ; custom font definitions
-  CreateFont $hCtl_setuptype_Font1 "Microsoft Sans Serif" "8.25" "700"
-  
-  ; === setuptype (type: Dialog) ===
-  nsDialogs::Create 1018
-  Pop $hCtl_setuptype
-  ${If} $hCtl_setuptype == error
-    Abort
-  ${EndIf}
-  !insertmacro MUI_HEADER_TEXT "Setup Type" "Control how Jellyfin is installed."
-  
-  ; === InstallasaServiceLabel (type: Label) ===
-  ${NSD_CreateLabel} 8u 71u 280u 28u "Install Jellyfin as a service. This method is recommended for Advanced Users. Additional setup is required to access network shares."
-  Pop $hCtl_setuptype_InstallasaServiceLabel
-  
-  ; === InstallasaService (type: RadioButton) ===
-  ${NSD_CreateRadioButton} 8u 54u 280u 15u "Install as a Service (Advanced Users)"
-  Pop $hCtl_setuptype_InstallasaService
-  ${NSD_AddStyle} $hCtl_setuptype_InstallasaService ${WS_GROUP}
-  
-  ; === BasicInstallLabel (type: Label) ===
-  ${NSD_CreateLabel} 8u 24u 280u 28u "The basic install will run Jellyfin in your current user account.$\nThis is recommended for new users and those with existing Jellyfin installs older than 10.4."
-  Pop $hCtl_setuptype_BasicInstallLabel
-  
-  ; === BasicInstall (type: RadioButton) ===
-  ${NSD_CreateRadioButton} 8u 7u 280u 15u "Basic Install (Recommended)"
-  Pop $hCtl_setuptype_BasicInstall
-  SendMessage $hCtl_setuptype_BasicInstall ${WM_SETFONT} $hCtl_setuptype_Font1 0
-  ${NSD_Check} $hCtl_setuptype_BasicInstall
-  
-FunctionEnd
diff --git a/windows/helpers/ShowError.nsh b/windows/helpers/ShowError.nsh
deleted file mode 100644
index 6e09b1e407..0000000000
--- a/windows/helpers/ShowError.nsh
+++ /dev/null
@@ -1,10 +0,0 @@
-; Show error
-!macro ShowError TEXT RETRYLABEL
-  MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP "${TEXT}" IDIGNORE +2 IDRETRY ${RETRYLABEL}
-  Abort
-!macroend
-
-!macro ShowErrorFinal TEXT
-  MessageBox MB_OK|MB_ICONSTOP "${TEXT}"
-  Abort
-!macroend
diff --git a/windows/helpers/StrSlash.nsh b/windows/helpers/StrSlash.nsh
deleted file mode 100644
index b8aa771aa6..0000000000
--- a/windows/helpers/StrSlash.nsh
+++ /dev/null
@@ -1,47 +0,0 @@
-; Adapted from: https://nsis.sourceforge.io/Another_String_Replace_(and_Slash/BackSlash_Converter) (2019-08-31)
-
-!macro _StrSlashConstructor out in
-  Push "${in}"
-  Push "\"
-  Call StrSlash
-  Pop ${out}
-!macroend
-
-!define StrSlash '!insertmacro "_StrSlashConstructor"'
-
-; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
-; Push "\"
-; Call StrSlash
-; Pop $R0
-; ;Now $R0 contains 'c:/this/and/that/filename.htm'
-Function StrSlash
-  Exch $R3 ; $R3 = needle ("\" or "/")
-  Exch
-  Exch $R1 ; $R1 = String to replacement in (haystack)
-  Push $R2 ; Replaced haystack
-  Push $R4 ; $R4 = not $R3 ("/" or "\")
-  Push $R6
-  Push $R7 ; Scratch reg
-  StrCpy $R2 ""
-  StrLen $R6 $R1
-  StrCpy $R4 "\"
-  StrCmp $R3 "/" loop
-  StrCpy $R4 "/"
-loop:
-  StrCpy $R7 $R1 1
-  StrCpy $R1 $R1 $R6 1
-  StrCmp $R7 $R3 found
-  StrCpy $R2 "$R2$R7"
-  StrCmp $R1 "" done loop
-found:
-  StrCpy $R2 "$R2$R4"
-  StrCmp $R1 "" done loop
-done:
-  StrCpy $R3 $R2
-  Pop $R7
-  Pop $R6
-  Pop $R4
-  Pop $R2
-  Pop $R1
-  Exch $R3
-FunctionEnd
diff --git a/windows/jellyfin.nsi b/windows/jellyfin.nsi
deleted file mode 100644
index fada62d981..0000000000
--- a/windows/jellyfin.nsi
+++ /dev/null
@@ -1,575 +0,0 @@
-!verbose 3
-SetCompressor /SOLID bzip2
-ShowInstDetails show
-ShowUninstDetails show
-Unicode True
-
-;--------------------------------
-!define SF_USELECTED  0 ; used to check selected options status, rest are inherited from Sections.nsh
-
-    !include "MUI2.nsh"
-    !include "Sections.nsh"
-    !include "LogicLib.nsh"
-
-    !include "helpers\ShowError.nsh"
-
-; Global variables that we'll use
-    Var _JELLYFINVERSION_
-    Var _JELLYFINDATADIR_
-    Var _SETUPTYPE_
-    Var _INSTALLSERVICE_
-    Var _SERVICESTART_
-    Var _SERVICEACCOUNTTYPE_
-    Var _EXISTINGINSTALLATION_
-    Var _EXISTINGSERVICE_
-    Var _MAKESHORTCUTS_
-    Var _FOLDEREXISTS_
-;
-!ifdef x64
-    !define ARCH "x64"
-    !define NAMESUFFIX "(64 bit)"
-    !define INSTALL_DIRECTORY "$PROGRAMFILES64\Jellyfin\Server"
-!endif
-
-!ifdef x84
-    !define ARCH "x86"
-    !define NAMESUFFIX "(32 bit)"
-    !define INSTALL_DIRECTORY "$PROGRAMFILES32\Jellyfin\Server"
-!endif
-
-!ifndef ARCH
-    !error "Set the Arch with /Dx86 or /Dx64"
-!endif
-
-;--------------------------------
-
-    !define REG_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\JellyfinServer" ;Registry to show up in Add/Remove Programs
-    !define REG_CONFIG_KEY "Software\Jellyfin\Server" ;Registry to store all configuration
-
-    !getdllversion "$%InstallLocation%\jellyfin.dll" ver_ ;Align installer version with jellyfin.dll version
-
-    Name "Jellyfin Server ${ver_1}.${ver_2}.${ver_3} ${NAMESUFFIX}" ; This is referred in various header text labels
-    OutFile "jellyfin_${ver_1}.${ver_2}.${ver_3}_windows-${ARCH}.exe" ; Naming convention jellyfin_{version}_windows-{arch].exe
-    BrandingText "Jellyfin Server ${ver_1}.${ver_2}.${ver_3} Installer" ; This shows in just over the buttons
-
-; installer attributes, these show up in details tab on installer properties
-    VIProductVersion "${ver_1}.${ver_2}.${ver_3}.0" ; VIProductVersion format, should be X.X.X.X
-    VIFileVersion "${ver_1}.${ver_2}.${ver_3}.0" ; VIFileVersion format, should be X.X.X.X
-    VIAddVersionKey "ProductName" "Jellyfin Server"
-    VIAddVersionKey "FileVersion" "${ver_1}.${ver_2}.${ver_3}.0"
-    VIAddVersionKey "LegalCopyright" "(c) 2019 Jellyfin Contributors. Code released under the GNU General Public License"
-    VIAddVersionKey "FileDescription" "Jellyfin Server: The Free Software Media System"
-
-;TODO, check defaults
-    InstallDir ${INSTALL_DIRECTORY} ;Default installation folder
-    InstallDirRegKey HKLM "${REG_CONFIG_KEY}" "InstallFolder" ;Read the registry for install folder,
-
-    RequestExecutionLevel admin ; ask it upfront for service control, and installing in priv folders
-
-    CRCCheck on ; make sure the installer wasn't corrupted while downloading
-
-    !define MUI_ABORTWARNING ;Prompts user in case of aborting install
-
-; TODO: Replace with nice Jellyfin Icons
-!ifdef UXPATH
-    !define MUI_ICON "${UXPATH}\branding\NSIS\modern-install.ico" ; Installer Icon
-    !define MUI_UNICON "${UXPATH}\branding\NSIS\modern-install.ico" ; Uninstaller Icon
-
-    !define MUI_HEADERIMAGE
-    !define MUI_HEADERIMAGE_BITMAP "${UXPATH}\branding\NSIS\installer-header.bmp"
-    !define MUI_WELCOMEFINISHPAGE_BITMAP "${UXPATH}\branding\NSIS\installer-right.bmp"
-    !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${UXPATH}\branding\NSIS\installer-right.bmp"
-!endif
-
-;--------------------------------
-;Pages
-
-; Welcome Page
-    !define MUI_WELCOMEPAGE_TEXT "The installer will ask for details to install Jellyfin Server."
-    !insertmacro MUI_PAGE_WELCOME
-; License Page
-    !insertmacro MUI_PAGE_LICENSE "$%InstallLocation%\LICENSE" ; picking up generic GPL
-
-; Setup Type Page
-    Page custom ShowSetupTypePage SetupTypePage_Config
-    
-; Components Page
-    !define MUI_PAGE_CUSTOMFUNCTION_PRE HideComponentsPage
-    !insertmacro MUI_PAGE_COMPONENTS
-    !define MUI_PAGE_CUSTOMFUNCTION_PRE HideInstallDirectoryPage ; Controls when to hide / show
-    !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Install folder" ; shows just above the folder selection dialog
-    !insertmacro MUI_PAGE_DIRECTORY
-
-; Data folder Page
-    !define MUI_PAGE_CUSTOMFUNCTION_PRE HideDataDirectoryPage ; Controls when to hide / show
-    !define MUI_PAGE_HEADER_TEXT "Choose Data Location"
-    !define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install the Jellyfin Server data."
-    !define MUI_DIRECTORYPAGE_TEXT_TOP "The installer will set the following folder for Jellyfin Server data. To install in a different folder, click Browse and select another folder. Please make sure the folder exists and is accessible. Click Next to continue."
-    !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Data folder"
-    !define MUI_DIRECTORYPAGE_VARIABLE $_JELLYFINDATADIR_
-    !insertmacro MUI_PAGE_DIRECTORY
-
-; Custom Dialogs
-    !include "dialogs\setuptype.nsdinc"
-    !include "dialogs\service-config.nsdinc"
-    !include "dialogs\confirmation.nsdinc"
-
-; Select service account type
-    #!define MUI_PAGE_CUSTOMFUNCTION_PRE HideServiceConfigPage ; Controls when to hide / show (This does not work for Page, might need to go PageEx)
-    #!define MUI_PAGE_CUSTOMFUNCTION_SHOW fnc_service_config_Show
-    #!define MUI_PAGE_CUSTOMFUNCTION_LEAVE ServiceConfigPage_Config
-    #!insertmacro MUI_PAGE_CUSTOM ServiceAccountType
-    Page custom ShowServiceConfigPage ServiceConfigPage_Config
-
-; Confirmation Page
-    Page custom ShowConfirmationPage ; just letting the user know what they chose to install
-
-; Actual Installion Page
-    !insertmacro MUI_PAGE_INSTFILES
-
-    !insertmacro MUI_UNPAGE_CONFIRM
-    !insertmacro MUI_UNPAGE_INSTFILES
-    #!insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages; Add more languages later here if needed
-    !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Installer Sections
-Section "!Jellyfin Server (required)" InstallJellyfinServer
-    SectionIn RO ; Mandatory section, isn't this the whole purpose to run the installer.
-
-    StrCmp "$_EXISTINGINSTALLATION_" "Yes" RunUninstaller CarryOn ; Silently uninstall in case of previous installation
-
-    RunUninstaller:
-    DetailPrint "Looking for uninstaller at $INSTDIR"
-    FindFirst $0 $1 "$INSTDIR\Uninstall.exe"
-    FindClose $0
-    StrCmp $1 "" CarryOn ; the registry key was there but uninstaller was not found
-
-    DetailPrint "Silently running the uninstaller at $INSTDIR"
-    ExecWait '"$INSTDIR\Uninstall.exe" /S _?=$INSTDIR' $0
-    DetailPrint "Uninstall finished, $0"
-
-    CarryOn:
-    ${If} $_EXISTINGSERVICE_ == 'Yes'
-        ExecWait '"$INSTDIR\nssm.exe" stop JellyfinServer' $0
-        ${If} $0 <> 0
-            MessageBox MB_OK|MB_ICONSTOP "Could not stop the Jellyfin Server service."
-            Abort
-        ${EndIf}
-        DetailPrint "Stopped Jellyfin Server service, $0"
-    ${EndIf}
-
-    SetOutPath "$INSTDIR"
-
-    File "/oname=icon.ico" "${UXPATH}\branding\NSIS\modern-install.ico"
-    File /r $%InstallLocation%\*
-    
-
-; Write the InstallFolder, DataFolder, Network Service info into the registry for later use
-    WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "InstallFolder" "$INSTDIR"
-    WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "DataFolder" "$_JELLYFINDATADIR_"
-    WriteRegStr HKLM "${REG_CONFIG_KEY}" "ServiceAccountType" "$_SERVICEACCOUNTTYPE_"
-
-    !getdllversion "$%InstallLocation%\jellyfin.dll" ver_
-    StrCpy $_JELLYFINVERSION_ "${ver_1}.${ver_2}.${ver_3}" ;
-
-; Write the uninstall keys for Windows
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayName" "Jellyfin Server $_JELLYFINVERSION_ ${NAMESUFFIX}"
-    WriteRegExpandStr HKLM "${REG_UNINST_KEY}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayIcon" '"$INSTDIR\Uninstall.exe",0'
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "Publisher" "The Jellyfin Project"
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "https://jellyfin.org/"
-    WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayVersion" "$_JELLYFINVERSION_"
-    WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoModify" 1
-    WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoRepair" 1
-
-;Create uninstaller
-    WriteUninstaller "$INSTDIR\Uninstall.exe"
-SectionEnd
-
-Section "Jellyfin Server Service" InstallService
-${If} $_INSTALLSERVICE_ == "Yes" ; Only run this if we're going to install the service!
-    ExecWait '"$INSTDIR\nssm.exe" statuscode JellyfinServer' $0
-    DetailPrint "Jellyfin Server service statuscode, $0"
-    ${If} $0 == 0
-        InstallRetry:
-        ExecWait '"$INSTDIR\nssm.exe" install JellyfinServer "$INSTDIR\jellyfin.exe" --service --datadir \"$_JELLYFINDATADIR_\"' $0
-        ${If} $0 <> 0
-            !insertmacro ShowError "Could not install the Jellyfin Server service." InstallRetry
-        ${EndIf}
-        DetailPrint "Jellyfin Server Service install, $0"
-    ${Else}
-        DetailPrint "Jellyfin Server Service exists, updating..."
-
-        ConfigureApplicationRetry:
-        ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer Application "$INSTDIR\jellyfin.exe"' $0
-        ${If} $0 <> 0
-            !insertmacro ShowError "Could not configure the Jellyfin Server service." ConfigureApplicationRetry
-        ${EndIf}
-        DetailPrint "Jellyfin Server Service setting (Application), $0"
-
-        ConfigureAppParametersRetry:
-        ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer AppParameters --service --datadir \"$_JELLYFINDATADIR_\"' $0
-        ${If} $0 <> 0
-            !insertmacro ShowError "Could not configure the Jellyfin Server service." ConfigureAppParametersRetry
-        ${EndIf}
-        DetailPrint "Jellyfin Server Service setting (AppParameters), $0"
-    ${EndIf}
-
-
-    Sleep 3000 ; Give time for Windows to catchup
-    ConfigureStartRetry:
-    ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer Start SERVICE_DELAYED_AUTO_START' $0
-    ${If} $0 <> 0
-        !insertmacro ShowError "Could not configure the Jellyfin Server service." ConfigureStartRetry
-    ${EndIf}
-    DetailPrint "Jellyfin Server Service setting (Start), $0"
-
-    ConfigureDescriptionRetry:
-    ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer Description "Jellyfin Server: The Free Software Media System"' $0
-    ${If} $0 <> 0
-        !insertmacro ShowError "Could not configure the Jellyfin Server service." ConfigureDescriptionRetry
-    ${EndIf}
-    DetailPrint "Jellyfin Server Service setting (Description), $0"
-    ConfigureDisplayNameRetry:
-    ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer DisplayName "Jellyfin Server"' $0
-    ${If} $0 <> 0
-        !insertmacro ShowError "Could not configure the Jellyfin Server service." ConfigureDisplayNameRetry
-
-    ${EndIf}
-    DetailPrint "Jellyfin Server Service setting (DisplayName), $0"
-
-    Sleep 3000
-    ${If} $_SERVICEACCOUNTTYPE_ == "NetworkService" ; the default install using NSSM is Local System
-        ConfigureNetworkServiceRetry:
-        ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer Objectname "Network Service"' $0
-        ${If} $0 <> 0
-            !insertmacro ShowError "Could not configure the Jellyfin Server service account." ConfigureNetworkServiceRetry
-        ${EndIf}
-        DetailPrint "Jellyfin Server service account change, $0"
-    ${EndIf}
-
-    Sleep 3000
-    ConfigureDefaultAppExit:
-        ExecWait '"$INSTDIR\nssm.exe" set JellyfinServer AppExit Default Exit' $0
-        ${If} $0 <> 0
-            !insertmacro ShowError "Could not configure the Jellyfin Server service app exit action." ConfigureDefaultAppExit
-        ${EndIf}
-        DetailPrint "Jellyfin Server service exit action set, $0"
-${EndIf}
-
-SectionEnd
-
-Section "-start service" StartService
-${If} $_SERVICESTART_ == "Yes"
-${AndIf} $_INSTALLSERVICE_ == "Yes"
-    StartRetry:
-    ExecWait '"$INSTDIR\nssm.exe" start JellyfinServer' $0
-    ${If} $0 <> 0
-        !insertmacro ShowError "Could not start the Jellyfin Server service." StartRetry
-    ${EndIf}
-    DetailPrint "Jellyfin Server service start, $0"
-${EndIf}
-SectionEnd
-
-Section "Create Shortcuts" CreateWinShortcuts
-    ${If} $_MAKESHORTCUTS_ == "Yes"
-        CreateDirectory "$SMPROGRAMS\Jellyfin Server"
-        CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0 SW_SHOWMAXIMIZED
-        CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfintray.exe" "" "$INSTDIR\icon.ico" 0
-        ;CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0 SW_SHOWMINIMIZED
-        CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfintray.exe" "" "$INSTDIR\icon.ico" 0
-    ${EndIf}
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
-;Language strings
-    LangString DESC_InstallJellyfinServer ${LANG_ENGLISH} "Install Jellyfin Server"
-    LangString DESC_InstallService ${LANG_ENGLISH} "Install As a Service"
-
-;Assign language strings to sections
-    !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${InstallJellyfinServer} $(DESC_InstallJellyfinServer)
-    !insertmacro MUI_DESCRIPTION_TEXT ${InstallService} $(DESC_InstallService)
-    !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-    ReadRegStr $INSTDIR HKLM "${REG_CONFIG_KEY}" "InstallFolder"  ; read the installation folder
-    ReadRegStr $_JELLYFINDATADIR_ HKLM "${REG_CONFIG_KEY}" "DataFolder"  ; read the data folder
-    ReadRegStr $_SERVICEACCOUNTTYPE_ HKLM "${REG_CONFIG_KEY}" "ServiceAccountType"  ; read the account name
-
-    DetailPrint "Jellyfin Install location: $INSTDIR"
-    DetailPrint "Jellyfin Data folder: $_JELLYFINDATADIR_"
-
-    MessageBox MB_YESNO|MB_ICONINFORMATION "Do you want to retain the Jellyfin Server data folder? The media will not be touched. $\r$\nIf unsure choose YES." /SD IDYES IDYES PreserveData
-
-    RMDir /r /REBOOTOK "$_JELLYFINDATADIR_"
-
-    PreserveData:
-
-    ExecWait '"$INSTDIR\nssm.exe" statuscode JellyfinServer' $0
-    DetailPrint "Jellyfin Server service statuscode, $0"
-    IntCmp $0 0 NoServiceUninstall ; service doesn't exist, may be run from desktop shortcut
-
-    Sleep 3000 ; Give time for Windows to catchup
-
-    UninstallStopRetry:
-    ExecWait '"$INSTDIR\nssm.exe" stop JellyfinServer' $0
-    ${If} $0 <> 0
-        !insertmacro ShowError "Could not stop the Jellyfin Server service." UninstallStopRetry
-    ${EndIf}
-    DetailPrint "Stopped Jellyfin Server service, $0"
-
-    UninstallRemoveRetry:
-    ExecWait '"$INSTDIR\nssm.exe" remove JellyfinServer confirm' $0
-    ${If} $0 <> 0
-        !insertmacro ShowError "Could not remove the Jellyfin Server service." UninstallRemoveRetry
-    ${EndIf}
-    DetailPrint "Removed Jellyfin Server service, $0"
-
-    Sleep 3000 ; Give time for Windows to catchup
-
-    NoServiceUninstall: ; existing install was present but no service was detected. Remove shortcuts if account is set to none
-        ${If} $_SERVICEACCOUNTTYPE_ == "None"
-            RMDir /r "$SMPROGRAMS\Jellyfin Server"
-            Delete "$DESKTOP\Jellyfin Server.lnk"
-            DetailPrint "Removed old shortcuts..."
-        ${EndIf}
-
-    Delete "$INSTDIR\*.*"
-    RMDir /r /REBOOTOK "$INSTDIR\jellyfin-web"
-    Delete "$INSTDIR\Uninstall.exe"
-    RMDir /r /REBOOTOK "$INSTDIR"
-    
-    DeleteRegKey HKLM "Software\Jellyfin"
-    DeleteRegKey HKLM "${REG_UNINST_KEY}"
-
-SectionEnd
-
-Function .onInit
-; Setting up defaults
-    StrCpy $_INSTALLSERVICE_ "Yes"
-    StrCpy $_SERVICESTART_ "Yes"
-    StrCpy $_SERVICEACCOUNTTYPE_ "NetworkService"
-    StrCpy $_EXISTINGINSTALLATION_ "No"
-    StrCpy $_EXISTINGSERVICE_ "No"
-    StrCpy $_MAKESHORTCUTS_ "No"
-
-    SetShellVarContext current
-    StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
-
-    System::Call 'kernel32::CreateMutex(p 0, i 0, t "JellyfinServerMutex") p .r1 ?e'
-    Pop $R0
-
-    StrCmp $R0 0 +3
-    !insertmacro ShowErrorFinal "The installer is already running."
-
-;Detect if Jellyfin is already installed.
-; In case it is installed, let the user choose either
-;	1. Exit installer
-;   2. Upgrade without messing with data
-; 		2a. Don't ask for any details, uninstall and install afresh with old settings
-
-; Read Registry for previous installation
-    ClearErrors
-    ReadRegStr "$0" HKLM "${REG_CONFIG_KEY}" "InstallFolder"
-    IfErrors NoExisitingInstall
-
-    DetailPrint "Existing Jellyfin Server detected at: $0"
-    StrCpy "$INSTDIR" "$0" ; set the location fro registry as new default
-
-    StrCpy $_EXISTINGINSTALLATION_ "Yes" ; Set our flag to be used later
-    SectionSetText ${InstallJellyfinServer} "Upgrade Jellyfin Server (required)" ; Change install text to "Upgrade"
-
-  ; check if service was run using Network Service account
-    ClearErrors
-    ReadRegStr $_SERVICEACCOUNTTYPE_ HKLM "${REG_CONFIG_KEY}" "ServiceAccountType" ; in case of error _SERVICEACCOUNTTYPE_ will be NetworkService as default
-
-    ClearErrors
-    ReadRegStr $_JELLYFINDATADIR_ HKLM "${REG_CONFIG_KEY}" "DataFolder" ; in case of error, the default holds
-
-    ; Hide sections which will not be needed in case of previous install
-    ; SectionSetText ${InstallService} ""
-
-; check if there is a service called Jellyfin, there should be
-; hack : nssm statuscode Jellyfin will return non zero return code in case it exists
-    ExecWait '"$INSTDIR\nssm.exe" statuscode JellyfinServer' $0
-    DetailPrint "Jellyfin Server service statuscode, $0"
-    IntCmp $0 0 NoService ; service doesn't exist, may be run from desktop shortcut
-
-    ; if service was detected, set defaults going forward.
-    StrCpy $_EXISTINGSERVICE_ "Yes"
-    StrCpy $_INSTALLSERVICE_ "Yes"
-    StrCpy $_SERVICESTART_ "Yes"
-    StrCpy $_MAKESHORTCUTS_ "No"
-    SectionSetText ${CreateWinShortcuts} ""
-
-  
-    NoService: ; existing install was present but no service was detected
-        ${If} $_SERVICEACCOUNTTYPE_ == "None"
-            StrCpy $_SETUPTYPE_ "Basic"
-            StrCpy $_INSTALLSERVICE_ "No"
-            StrCpy $_SERVICESTART_ "No"
-            StrCpy $_MAKESHORTCUTS_ "Yes"
-        ${EndIf}
-
-; Let the user know that we'll upgrade and provide an option to quit.
-    MessageBox MB_OKCANCEL|MB_ICONINFORMATION "Existing installation of Jellyfin Server was detected, it'll be upgraded, settings will be retained. \
-    $\r$\nClick OK to proceed, Cancel to exit installer." /SD IDOK IDOK ProceedWithUpgrade
-    Quit ; Quit if the user is not sure about upgrade
-
-    ProceedWithUpgrade:
-
-    NoExisitingInstall: ; by this time, the variables have been correctly set to reflect previous install details
-
-FunctionEnd
-
-Function HideInstallDirectoryPage
-    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for InstallFolder
-        Abort
-    ${EndIf}
-FunctionEnd
-
-Function HideDataDirectoryPage
-    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for InstallFolder
-        Abort
-    ${EndIf}
-FunctionEnd
-
-Function HideServiceConfigPage
-    ${If} $_INSTALLSERVICE_ == "No" ; Not running as a service, don't ask for service type
-    ${OrIf} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for InstallFolder
-        Abort
-    ${EndIf}
-FunctionEnd
-
-Function HideConfirmationPage
-    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for InstallFolder
-        Abort
-    ${EndIf}
-FunctionEnd
-
-Function HideSetupTypePage
-    ${If} $_EXISTINGINSTALLATION_ == "Yes" ; Existing installation detected, so don't ask for SetupType
-        Abort
-    ${EndIf}
-FunctionEnd
-
-Function HideComponentsPage
-     ${If} $_SETUPTYPE_ == "Basic" ; Basic installation chosen, don't show components choice
-        Abort
-    ${EndIf}
-FunctionEnd
-
-; Setup Type dialog show function
-Function ShowSetupTypePage
-  Call HideSetupTypePage
-  Call fnc_setuptype_Create
-  nsDialogs::Show
-FunctionEnd
-
-; Service Config dialog show function
-Function ShowServiceConfigPage
-  Call HideServiceConfigPage
-  Call fnc_service_config_Create
-  nsDialogs::Show
-FunctionEnd
-
-; Confirmation dialog show function
-Function ShowConfirmationPage
-  Call HideConfirmationPage
-  Call fnc_confirmation_Create
-  nsDialogs::Show
-FunctionEnd
-
-; Declare temp variables to read the options from the custom page.
-Var StartServiceAfterInstall
-Var UseNetworkServiceAccount
-Var UseLocalSystemAccount
-Var BasicInstall
-
-
-Function SetupTypePage_Config
-${NSD_GetState} $hCtl_setuptype_BasicInstall $BasicInstall
- IfFileExists "$LOCALAPPDATA\Jellyfin" folderfound foldernotfound ; if the folder exists, use this, otherwise, go with new default
-        folderfound:
-            StrCpy $_FOLDEREXISTS_ "Yes"
-            Goto InstallCheck
-        foldernotfound:
-            StrCpy $_FOLDEREXISTS_ "No"
-            Goto InstallCheck
-
-InstallCheck:
-${If} $BasicInstall == 1
-    StrCpy $_SETUPTYPE_ "Basic"
-    StrCpy $_INSTALLSERVICE_ "No"
-    StrCpy $_SERVICESTART_ "No"
-    StrCpy $_SERVICEACCOUNTTYPE_ "None"
-    StrCpy $_MAKESHORTCUTS_ "Yes"
-    ${If} $_FOLDEREXISTS_ == "Yes"
-        StrCpy $_JELLYFINDATADIR_ "$LOCALAPPDATA\Jellyfin\"
-    ${EndIf}
-${Else}
-    StrCpy $_SETUPTYPE_ "Advanced"
-    StrCpy $_INSTALLSERVICE_ "Yes"
-    StrCpy $_MAKESHORTCUTS_ "No"
-    ${If} $_FOLDEREXISTS_ == "Yes"
-            MessageBox MB_OKCANCEL|MB_ICONINFORMATION "An existing data folder was detected.\
-            $\r$\nBasic Setup is highly recommended.\
-            $\r$\nIf you proceed, you will need to set up Jellyfin again." IDOK GoAhead IDCANCEL GoBack
-        GoBack:
-            Abort
-    ${EndIf}
-        GoAhead:
-            StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
-            SectionSetText ${CreateWinShortcuts} ""
-${EndIf}
-    
-FunctionEnd
-
-Function ServiceConfigPage_Config
-${NSD_GetState} $hCtl_service_config_StartServiceAfterInstall $StartServiceAfterInstall
-${If} $StartServiceAfterInstall == 1
-    StrCpy $_SERVICESTART_ "Yes"
-${Else}
-    StrCpy $_SERVICESTART_ "No"
-${EndIf}
-${NSD_GetState} $hCtl_service_config_UseNetworkServiceAccount $UseNetworkServiceAccount
-${NSD_GetState} $hCtl_service_config_UseLocalSystemAccount $UseLocalSystemAccount
-
-${If} $UseNetworkServiceAccount == 1
-    StrCpy $_SERVICEACCOUNTTYPE_ "NetworkService"
-${ElseIf} $UseLocalSystemAccount == 1
-    StrCpy $_SERVICEACCOUNTTYPE_ "LocalSystem"
-${Else}
-    !insertmacro ShowErrorFinal "Service account type not properly configured."
-${EndIf}
-
-FunctionEnd
-
-; This function handles the choices during component selection
-Function .onSelChange
-
-; If we are not installing service, we don't need to set the NetworkService account or StartService
-    SectionGetFlags ${InstallService} $0
-    ${If} $0 = ${SF_SELECTED}
-        StrCpy $_INSTALLSERVICE_ "Yes"
-    ${Else}
-        StrCpy $_INSTALLSERVICE_ "No"
-        StrCpy $_SERVICESTART_ "No"
-        StrCpy $_SERVICEACCOUNTTYPE_ "None"
-    ${EndIf}
-FunctionEnd
-
-Function .onInstSuccess
-    #ExecShell "open" "http://localhost:8096"
-FunctionEnd
diff --git a/windows/legacy/install-jellyfin.ps1 b/windows/legacy/install-jellyfin.ps1
deleted file mode 100644
index e909a0468e..0000000000
--- a/windows/legacy/install-jellyfin.ps1
+++ /dev/null
@@ -1,460 +0,0 @@
-[CmdletBinding()]
-
-param(
-    [Switch]$Quiet,
-    [Switch]$InstallAsService,
-    [System.Management.Automation.pscredential]$ServiceUser,
-    [switch]$CreateDesktopShorcut,
-    [switch]$LaunchJellyfin,
-    [switch]$MigrateEmbyLibrary,
-    [string]$InstallLocation,
-    [string]$EmbyLibraryLocation,
-    [string]$JellyfinLibraryLocation
-)
-<# This form was created using POSHGUI.com  a free online gui designer for PowerShell
-.NAME
-    Install-Jellyfin
-#>
-
-#This doesn't need to be used by default anymore, but I am keeping it in as a function for future use.
-function Elevate-Window {
-    # Get the ID and security principal of the current user account
-    $myWindowsID=[System.Security.Principal.WindowsIdentity]::GetCurrent()
-    $myWindowsPrincipal=new-object System.Security.Principal.WindowsPrincipal($myWindowsID)
- 
-    # Get the security principal for the Administrator role
-    $adminRole=[System.Security.Principal.WindowsBuiltInRole]::Administrator
- 
-    # Check to see if we are currently running "as Administrator"
-    if ($myWindowsPrincipal.IsInRole($adminRole))
-    {
-        # We are running "as Administrator" - so change the title and background color to indicate this
-        $Host.UI.RawUI.WindowTitle = $myInvocation.MyCommand.Definition + "(Elevated)"
-        $Host.UI.RawUI.BackgroundColor = "DarkBlue"
-        clear-host
-    }
-    else
-    {
-        # We are not running "as Administrator" - so relaunch as administrator
-   
-        # Create a new process object that starts PowerShell
-        $newProcess = new-object System.Diagnostics.ProcessStartInfo "PowerShell";
-   
-        # Specify the current script path and name as a parameter
-        $newProcess.Arguments = $myInvocation.MyCommand.Definition;
-   
-        # Indicate that the process should be elevated
-        $newProcess.Verb = "runas";
-   
-        # Start the new process
-        [System.Diagnostics.Process]::Start($newProcess);
-   
-        # Exit from the current, unelevated, process
-        exit
-    }
-}
-
-#FIXME The install methods should be a function that takes all the params, the quiet flag should be a paramset
-
-if($Quiet.IsPresent -or $Quiet -eq $true){
-    if([string]::IsNullOrEmpty($JellyfinLibraryLocation)){
-        $Script:JellyfinDataDir = "$env:LOCALAPPDATA\jellyfin\"
-    }else{
-        $Script:JellyfinDataDir = $JellyfinLibraryLocation
-    }
-    if([string]::IsNullOrEmpty($InstallLocation)){
-        $Script:DefaultJellyfinInstallDirectory = "$env:Appdata\jellyfin\"
-    }else{
-        $Script:DefaultJellyfinInstallDirectory = $InstallLocation
-    }
-    
-    if([string]::IsNullOrEmpty($EmbyLibraryLocation)){
-        $Script:defaultEmbyDataDir = "$env:Appdata\Emby-Server\data\"
-    }else{
-        $Script:defaultEmbyDataDir = $EmbyLibraryLocation
-    }
-    
-    if($InstallAsService.IsPresent -or $InstallAsService -eq $true){
-        $Script:InstallAsService = $true  
-    }else{$Script:InstallAsService = $false}
-    if($null -eq $ServiceUser){
-        $Script:InstallServiceAsUser = $false
-    }else{
-        $Script:InstallServiceAsUser = $true
-        $Script:UserCredentials = $ServiceUser
-        $Script:JellyfinDataDir = "$env:HOMEDRIVE\Users\$($Script:UserCredentials.UserName)\Appdata\Local\jellyfin\"}
-    if($CreateDesktopShorcut.IsPresent -or $CreateDesktopShorcut -eq $true) {$Script:CreateShortcut = $true}else{$Script:CreateShortcut = $false}
-    if($MigrateEmbyLibrary.IsPresent -or $MigrateEmbyLibrary -eq $true){$Script:MigrateLibrary = $true}else{$Script:MigrateLibrary = $false}
-    if($LaunchJellyfin.IsPresent -or $LaunchJellyfin -eq $true){$Script:StartJellyfin = $true}else{$Script:StartJellyfin = $false}
-    
-    if(-not (Test-Path $Script:DefaultJellyfinInstallDirectory)){
-        mkdir $Script:DefaultJellyfinInstallDirectory
-    }
-    Copy-Item -Path $PSScriptRoot/* -DestinationPath "$Script:DefaultJellyfinInstallDirectory/" -Force -Recurse
-    if($Script:InstallAsService){
-        if($Script:InstallServiceAsUser){
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" install Jellyfin `"$Script:DefaultJellyfinInstallDirectory\jellyfin.exe`" --datadir `"$Script:JellyfinDataDir`"
-            Start-Sleep -Milliseconds 500
-            &sc.exe config Jellyfin obj=".\$($Script:UserCredentials.UserName)" password="$($Script:UserCredentials.GetNetworkCredential().Password)"
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" set Jellyfin Start SERVICE_DELAYED_AUTO_START 
-        }else{
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" install Jellyfin `"$Script:DefaultJellyfinInstallDirectory\jellyfin.exe`" --datadir `"$Script:JellyfinDataDir`"
-            Start-Sleep -Milliseconds 500
-            #&"$Script:DefaultJellyfinInstallDirectory\nssm.exe" set Jellyfin ObjectName $Script:UserCredentials.UserName $Script:UserCredentials.GetNetworkCredential().Password
-            #Set-Service -Name Jellyfin -Credential $Script:UserCredentials
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" set Jellyfin Start SERVICE_DELAYED_AUTO_START 
-        }
-    }
-    if($Script:MigrateLibrary){
-        Copy-Item -Path $Script:defaultEmbyDataDir/config -Destination $Script:JellyfinDataDir -force -Recurse
-        Copy-Item -Path $Script:defaultEmbyDataDir/cache -Destination $Script:JellyfinDataDir -force -Recurse
-        Copy-Item -Path $Script:defaultEmbyDataDir/data -Destination $Script:JellyfinDataDir -force -Recurse
-        Copy-Item -Path $Script:defaultEmbyDataDir/metadata -Destination $Script:JellyfinDataDir -force -Recurse
-        Copy-Item -Path $Script:defaultEmbyDataDir/root -Destination $Script:JellyfinDataDir -force -Recurse
-    }
-    if($Script:CreateShortcut){
-        $WshShell = New-Object -comObject WScript.Shell
-        $Shortcut = $WshShell.CreateShortcut("$Home\Desktop\Jellyfin.lnk")
-        $Shortcut.TargetPath = "$Script:DefaultJellyfinInstallDirectory\jellyfin.exe"
-        $Shortcut.Save()
-    }
-    if($Script:StartJellyfin){
-        if($Script:InstallAsService){
-            Get-Service Jellyfin | Start-Service
-        }else{
-            Start-Process -FilePath $Script:DefaultJellyfinInstallDirectory\jellyfin.exe -PassThru
-        }
-    }
-}else{
-
-}
-Add-Type -AssemblyName System.Windows.Forms
-[System.Windows.Forms.Application]::EnableVisualStyles()
-
-$Script:JellyFinDataDir = "$env:LOCALAPPDATA\jellyfin\"
-$Script:DefaultJellyfinInstallDirectory = "$env:Appdata\jellyfin\"
-$Script:defaultEmbyDataDir = "$env:Appdata\Emby-Server\"
-$Script:InstallAsService = $False
-$Script:InstallServiceAsUser = $false
-$Script:CreateShortcut = $false
-$Script:MigrateLibrary = $false
-$Script:StartJellyfin = $false
-
-function InstallJellyfin {
-    Write-Host "Install as service: $Script:InstallAsService" 
-    Write-Host "Install as serviceuser: $Script:InstallServiceAsUser"
-    Write-Host "Create Shortcut: $Script:CreateShortcut"
-    Write-Host "MigrateLibrary: $Script:MigrateLibrary"
-    $GUIElementsCollection | ForEach-Object {
-        $_.Enabled = $false
-    }
-    Write-Host "Making Jellyfin directory"
-    $ProgressBar.Minimum = 1
-    $ProgressBar.Maximum = 100
-    $ProgressBar.Value = 1
-    if($Script:DefaultJellyfinInstallDirectory -ne $InstallLocationBox.Text){
-        Write-Host "Custom Install Location Chosen: $($InstallLocationBox.Text)"
-        $Script:DefaultJellyfinInstallDirectory = $InstallLocationBox.Text
-    }
-    if($Script:JellyfinDataDir -ne $CustomLibraryBox.Text){
-        Write-Host "Custom Library Location Chosen: $($CustomLibraryBox.Text)"
-        $Script:JellyfinDataDir = $CustomLibraryBox.Text
-    }
-    if(-not (Test-Path $Script:DefaultJellyfinInstallDirectory)){
-        mkdir $Script:DefaultJellyfinInstallDirectory
-    }
-    Write-Host "Copying Jellyfin Data"
-    $progressbar.Value = 10 
-    Copy-Item -Path $PSScriptRoot/* -Destination $Script:DefaultJellyfinInstallDirectory/ -Force -Recurse
-    Write-Host "Finished Copying"
-    $ProgressBar.Value = 50
-    if($Script:InstallAsService){
-        if($Script:InstallServiceAsUser){
-            Write-Host "Installing Service as user $($Script:UserCredentials.UserName)"
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" install Jellyfin `"$Script:DefaultJellyfinInstallDirectory\jellyfin.exe`" --datadir `"$Script:JellyfinDataDir`"
-            Start-Sleep -Milliseconds 2000
-            &sc.exe config Jellyfin obj=".\$($Script:UserCredentials.UserName)" password="$($Script:UserCredentials.GetNetworkCredential().Password)"
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" set Jellyfin Start SERVICE_DELAYED_AUTO_START 
-        }else{
-            Write-Host "Installing Service as LocalSystem"
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" install Jellyfin `"$Script:DefaultJellyfinInstallDirectory\jellyfin.exe`" --datadir `"$Script:JellyfinDataDir`"
-            Start-Sleep -Milliseconds 2000
-            &"$Script:DefaultJellyfinInstallDirectory\nssm.exe" set Jellyfin Start SERVICE_DELAYED_AUTO_START 
-        }
-    }
-    $progressbar.Value = 60
-    if($Script:MigrateLibrary){
-        if($Script:defaultEmbyDataDir -ne $LibraryLocationBox.Text){
-           Write-Host "Custom location defined for emby library: $($LibraryLocationBox.Text)"
-           $Script:defaultEmbyDataDir = $LibraryLocationBox.Text
-        }
-        Write-Host "Copying emby library from $Script:defaultEmbyDataDir to $Script:JellyFinDataDir"
-        Write-Host "This could take a while depending on the size of your library. Please be patient"
-        Write-Host "Copying config"
-        Copy-Item -Path $Script:defaultEmbyDataDir/config -Destination $Script:JellyfinDataDir -force -Recurse
-        Write-Host "Copying cache"
-        Copy-Item -Path $Script:defaultEmbyDataDir/cache -Destination $Script:JellyfinDataDir -force -Recurse
-        Write-Host "Copying data"
-        Copy-Item -Path $Script:defaultEmbyDataDir/data -Destination $Script:JellyfinDataDir -force -Recurse
-        Write-Host "Copying metadata"
-        Copy-Item -Path $Script:defaultEmbyDataDir/metadata -Destination $Script:JellyfinDataDir -force -Recurse
-        Write-Host "Copying root dir"
-        Copy-Item -Path $Script:defaultEmbyDataDir/root -Destination $Script:JellyfinDataDir  -force -Recurse
-    }
-    $progressbar.Value = 80
-    if($Script:CreateShortcut){
-        Write-Host "Creating Shortcut"
-        $WshShell = New-Object -comObject WScript.Shell
-        $Shortcut = $WshShell.CreateShortcut("$Home\Desktop\Jellyfin.lnk")
-        $Shortcut.TargetPath = "$Script:DefaultJellyfinInstallDirectory\jellyfin.exe"
-        $Shortcut.Save()
-    }
-    $ProgressBar.Value = 90
-    if($Script:StartJellyfin){
-        if($Script:InstallAsService){
-            Write-Host "Starting Jellyfin Service"
-            Get-Service Jellyfin | Start-Service
-        }else{
-            Write-Host "Starting Jellyfin"
-            Start-Process -FilePath $Script:DefaultJellyfinInstallDirectory\jellyfin.exe -PassThru
-        }
-    }
-    $progressbar.Value = 100
-    Write-Host Finished
-    $wshell = New-Object -ComObject Wscript.Shell
-    $wshell.Popup("Operation Completed",0,"Done",0x1)
-    $InstallForm.Close()
-}
-function ServiceBoxCheckChanged {
-    if($InstallAsServiceCheck.Checked){
-        $Script:InstallAsService         = $true
-        $ServiceUserLabel.Visible = $true
-        $ServiceUserLabel.Enabled = $true
-        $ServiceUserBox.Visible = $true
-        $ServiceUserBox.Enabled = $true
-    }else{
-        $Script:InstallAsService         = $false
-        $ServiceUserLabel.Visible = $false
-        $ServiceUserLabel.Enabled = $false
-        $ServiceUserBox.Visible = $false
-        $ServiceUserBox.Enabled = $false
-    }
-}
-function UserSelect {
-    if($ServiceUserBox.Text -eq 'Local System')
-    {
-        $Script:InstallServiceAsUser = $false
-         $Script:UserCredentials = $null
-         $ServiceUserBox.Items.RemoveAt(1)
-         $ServiceUserBox.Items.Add("Custom User")
-    }elseif($ServiceUserBox.Text -eq 'Custom User'){
-        $Script:InstallServiceAsUser = $true
-        $Script:UserCredentials = Get-Credential -Message "Please enter the credentials of the user you with to run Jellyfin Service as" -UserName $env:USERNAME
-        $ServiceUserBox.Items[1] = "$($Script:UserCredentials.UserName)"
-    }
-}
-function CreateShortcutBoxCheckChanged {
-    if($CreateShortcutCheck.Checked){
-        $Script:CreateShortcut = $true
-    }else{
-        $Script:CreateShortcut = $False
-    }
-}
-function StartJellyFinBoxCheckChanged {
-    if($StartProgramCheck.Checked){
-        $Script:StartJellyfin = $true
-    }else{
-        $Script:StartJellyfin = $false
-    }
-}
-
-function CustomLibraryCheckChanged {
-    if($CustomLibraryCheck.Checked){
-        $Script:UseCustomLibrary = $true
-        $CustomLibraryBox.Enabled = $true
-    }else{
-        $Script:UseCustomLibrary = $false
-        $CustomLibraryBox.Enabled = $false
-    }
-}
-
-function MigrateLibraryCheckboxChanged {
-
-    if($MigrateLibraryCheck.Checked){
-        $Script:MigrateLibrary         = $true
-        $LibraryMigrationLabel.Visible = $true
-        $LibraryMigrationLabel.Enabled = $true
-        $LibraryLocationBox.Visible = $true
-        $LibraryLocationBox.Enabled = $true
-    }else{
-        $Script:MigrateLibrary         = $false
-        $LibraryMigrationLabel.Visible = $false
-        $LibraryMigrationLabel.Enabled = $false
-        $LibraryLocationBox.Visible = $false
-        $LibraryLocationBox.Enabled = $false
-    }
-
-}
-
-
-#region begin GUI{ 
-
-$InstallForm                     = New-Object system.Windows.Forms.Form
-$InstallForm.ClientSize          = '320,240'
-$InstallForm.text                = "Terrible Jellyfin Installer"
-$InstallForm.TopMost             = $false
-
-$GUIElementsCollection = @()
-
-$InstallButton                   = New-Object system.Windows.Forms.Button
-$InstallButton.text              = "Install"
-$InstallButton.width             = 60
-$InstallButton.height            = 30
-$InstallButton.location          = New-Object System.Drawing.Point(5,5)
-$InstallButton.Font              = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $InstallButton
-
-$ProgressBar                     = New-Object system.Windows.Forms.ProgressBar
-$ProgressBar.width               = 245
-$ProgressBar.height              = 30
-$ProgressBar.location            = New-Object System.Drawing.Point(70,5)
-
-$InstallLocationLabel            = New-Object system.Windows.Forms.Label
-$InstallLocationLabel.text       = "Install Location"
-$InstallLocationLabel.TextAlign  = [System.Drawing.ContentAlignment]::MiddleLeft
-$InstallLocationLabel.AutoSize   = $true
-$InstallLocationLabel.width      = 100
-$InstallLocationLabel.height     = 20
-$InstallLocationLabel.location   = New-Object System.Drawing.Point(5,50)
-$InstallLocationLabel.Font       = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $InstallLocationLabel
-
-$InstallLocationBox              = New-Object system.Windows.Forms.TextBox
-$InstallLocationBox.multiline    = $false
-$InstallLocationBox.width        = 205
-$InstallLocationBox.height       = 20
-$InstallLocationBox.location     = New-Object System.Drawing.Point(110,50)
-$InstallLocationBox.Text            = $Script:DefaultJellyfinInstallDirectory
-$InstallLocationBox.Font         = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $InstallLocationBox
-
-$CustomLibraryCheck                       = New-Object system.Windows.Forms.CheckBox
-$CustomLibraryCheck.text                  = "Custom Library Location:"
-$CustomLibraryCheck.TextAlign  = [System.Drawing.ContentAlignment]::MiddleLeft
-$CustomLibraryCheck.AutoSize              = $false
-$CustomLibraryCheck.width                 = 180
-$CustomLibraryCheck.height                = 20
-$CustomLibraryCheck.location              = New-Object System.Drawing.Point(5,75)
-$CustomLibraryCheck.Font                  = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $CustomLibraryCheck
-
-$CustomLibraryBox              = New-Object system.Windows.Forms.TextBox
-$CustomLibraryBox.multiline    = $false
-$CustomLibraryBox.width        = 130
-$CustomLibraryBox.height       = 20
-$CustomLibraryBox.location     = New-Object System.Drawing.Point(185,75)
-$CustomLibraryBox.Text            = $Script:JellyFinDataDir
-$CustomLibraryBox.Font         = 'Microsoft Sans Serif,10'
-$CustomLibraryBox.Enabled      = $false
-$GUIElementsCollection += $CustomLibraryBox
-
-$InstallAsServiceCheck                       = New-Object system.Windows.Forms.CheckBox
-$InstallAsServiceCheck.text                  = "Install as Service"
-$InstallAsServiceCheck.AutoSize              = $false
-$InstallAsServiceCheck.width                 = 140
-$InstallAsServiceCheck.height                = 20
-$InstallAsServiceCheck.location              = New-Object System.Drawing.Point(5,125)
-$InstallAsServiceCheck.Font                  = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $InstallAsServiceCheck
-
-$ServiceUserLabel            = New-Object system.Windows.Forms.Label
-$ServiceUserLabel.text       = "Run Service As:"
-$ServiceUserLabel.AutoSize   = $true
-$ServiceUserLabel.TextAlign  = [System.Drawing.ContentAlignment]::MiddleLeft
-$ServiceUserLabel.width      = 100
-$ServiceUserLabel.height     = 20
-$ServiceUserLabel.location   = New-Object System.Drawing.Point(15,145)
-$ServiceUserLabel.Font       = 'Microsoft Sans Serif,10'
-$ServiceUserLabel.Visible    = $false
-$ServiceUserLabel.Enabled    = $false
-$GUIElementsCollection += $ServiceUserLabel
-
-$ServiceUserBox                  = New-Object system.Windows.Forms.ComboBox
-$ServiceUserBox.text             = "Run Service As"
-$ServiceUserBox.width            = 195
-$ServiceUserBox.height           = 20
-@('Local System','Custom User') | ForEach-Object {[void] $ServiceUserBox.Items.Add($_)}
-$ServiceUserBox.location         = New-Object System.Drawing.Point(120,145)
-$ServiceUserBox.Font             = 'Microsoft Sans Serif,10'
-$ServiceUserBox.Visible          = $false
-$ServiceUserBox.Enabled          = $false
-$ServiceUserBox.DropDownStyle    = [System.Windows.Forms.ComboBoxStyle]::DropDownList
-$GUIElementsCollection += $ServiceUserBox
-
-$MigrateLibraryCheck                       = New-Object system.Windows.Forms.CheckBox
-$MigrateLibraryCheck.text                  = "Import Emby/Old JF Library"
-$MigrateLibraryCheck.AutoSize              = $false
-$MigrateLibraryCheck.width                 = 160
-$MigrateLibraryCheck.height                = 20
-$MigrateLibraryCheck.location              = New-Object System.Drawing.Point(5,170)
-$MigrateLibraryCheck.Font                  = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $MigrateLibraryCheck
-
-$LibraryMigrationLabel            = New-Object system.Windows.Forms.Label
-$LibraryMigrationLabel.text       = "Emby/Old JF Library Path"
-$LibraryMigrationLabel.TextAlign  = [System.Drawing.ContentAlignment]::MiddleLeft
-$LibraryMigrationLabel.AutoSize   = $false
-$LibraryMigrationLabel.width      = 120
-$LibraryMigrationLabel.height     = 20
-$LibraryMigrationLabel.location   = New-Object System.Drawing.Point(15,190)
-$LibraryMigrationLabel.Font       = 'Microsoft Sans Serif,10'
-$LibraryMigrationLabel.Visible    = $false
-$LibraryMigrationLabel.Enabled    = $false
-$GUIElementsCollection += $LibraryMigrationLabel
-
-$LibraryLocationBox              = New-Object system.Windows.Forms.TextBox
-$LibraryLocationBox.multiline    = $false
-$LibraryLocationBox.width        = 175
-$LibraryLocationBox.height       = 20
-$LibraryLocationBox.location     = New-Object System.Drawing.Point(140,190)
-$LibraryLocationBox.Text            = $Script:defaultEmbyDataDir
-$LibraryLocationBox.Font         = 'Microsoft Sans Serif,10'
-$LibraryLocationBox.Visible      = $false
-$LibraryLocationBox.Enabled      = $false
-$GUIElementsCollection += $LibraryLocationBox
-
-$CreateShortcutCheck                       = New-Object system.Windows.Forms.CheckBox
-$CreateShortcutCheck.text                  = "Desktop Shortcut"
-$CreateShortcutCheck.AutoSize              = $false
-$CreateShortcutCheck.width                 = 150
-$CreateShortcutCheck.height                = 20
-$CreateShortcutCheck.location              = New-Object System.Drawing.Point(5,215)
-$CreateShortcutCheck.Font                  = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $CreateShortcutCheck
-
-$StartProgramCheck                       = New-Object system.Windows.Forms.CheckBox
-$StartProgramCheck.text                  = "Start Jellyfin"
-$StartProgramCheck.AutoSize              = $false
-$StartProgramCheck.width                 = 160
-$StartProgramCheck.height                = 20
-$StartProgramCheck.location              = New-Object System.Drawing.Point(160,215)
-$StartProgramCheck.Font                  = 'Microsoft Sans Serif,10'
-$GUIElementsCollection += $StartProgramCheck
-
-$InstallForm.controls.AddRange($GUIElementsCollection)
-$InstallForm.Controls.Add($ProgressBar)
-
-#region gui events {
-$InstallButton.Add_Click({ InstallJellyfin })
-$CustomLibraryCheck.Add_CheckedChanged({CustomLibraryCheckChanged})
-$InstallAsServiceCheck.Add_CheckedChanged({ServiceBoxCheckChanged})
-$ServiceUserBox.Add_SelectedValueChanged({ UserSelect })
-$MigrateLibraryCheck.Add_CheckedChanged({MigrateLibraryCheckboxChanged})
-$CreateShortcutCheck.Add_CheckedChanged({CreateShortcutBoxCheckChanged})
-$StartProgramCheck.Add_CheckedChanged({StartJellyFinBoxCheckChanged})
-#endregion events }
-
-#endregion GUI }
-
-
-[void]$InstallForm.ShowDialog()
diff --git a/windows/legacy/install.bat b/windows/legacy/install.bat
deleted file mode 100644
index e21479a79a..0000000000
--- a/windows/legacy/install.bat
+++ /dev/null
@@ -1 +0,0 @@
-powershell.exe -executionpolicy Bypass -file install-jellyfin.ps1

From ec0ff5d02fa53ca5b902d0bd5b477199170f3d28 Mon Sep 17 00:00:00 2001
From: "github@esslinger.dev" <simon@esslinger.dev>
Date: Sat, 3 Oct 2020 12:40:28 +0200
Subject: [PATCH 184/247] test: use descriptive test method names

---
 .../ModelBinders/CommaDelimitedArrayModelBinderTests.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs b/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
index b05be6a16a..c801b4a523 100644
--- a/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
+++ b/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
@@ -93,7 +93,7 @@ namespace Jellyfin.Api.Tests.ModelBinders
         }
 
         [Fact]
-        public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedEnumArrayQuery2()
+        public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedEnumArrayQueryWithDoubleCommas()
         {
             var queryParamName = "test";
             var queryParamValues = new TestType[] { TestType.How, TestType.Much };
@@ -148,7 +148,7 @@ namespace Jellyfin.Api.Tests.ModelBinders
         }
 
         [Fact]
-        public async Task BindModelAsync_CorrectlyBindsValidEnumArrayQuery2()
+        public async Task BindModelAsync_CorrectlyBindsEmptyEnumArrayQuery()
         {
             var queryParamName = "test";
             var queryParamValues = Array.Empty<TestType>();

From 211c9cd60850c6c33d1211cc5a7e35a94b19bab4 Mon Sep 17 00:00:00 2001
From: KonH <konh@yandex.ru>
Date: Sat, 3 Oct 2020 22:03:23 +0700
Subject: [PATCH 185/247] Remove unnecessary null checks in some places

Related to https://github.com/jellyfin/jellyfin/issues/2149
---
 Jellyfin.Api/Helpers/MediaInfoHelper.cs              | 2 +-
 Jellyfin.Api/Helpers/TranscodingJobHelper.cs         | 5 +----
 Jellyfin.Server.Implementations/Users/UserManager.cs | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Jellyfin.Api/Helpers/MediaInfoHelper.cs b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
index 1207fb5134..e78f63b256 100644
--- a/Jellyfin.Api/Helpers/MediaInfoHelper.cs
+++ b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
@@ -554,7 +554,7 @@ namespace Jellyfin.Api.Helpers
         private long? GetMaxBitrate(long? clientMaxBitrate, User user, string ipAddress)
         {
             var maxBitrate = clientMaxBitrate;
-            var remoteClientMaxBitrate = user?.RemoteClientBitrateLimit ?? 0;
+            var remoteClientMaxBitrate = user.RemoteClientBitrateLimit ?? 0;
 
             if (remoteClientMaxBitrate <= 0)
             {
diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
index 64d1227f7c..0db1fabffe 100644
--- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
+++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
@@ -740,10 +740,7 @@ namespace Jellyfin.Api.Helpers
         /// <param name="state">The state.</param>
         private void OnFfMpegProcessExited(Process process, TranscodingJobDto job, StreamState state)
         {
-            if (job != null)
-            {
-                job.HasExited = true;
-            }
+            job.HasExited = true;
 
             _logger.LogDebug("Disposing stream resources");
             state.Dispose();
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 8f04baa089..dfd7ee99da 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -799,7 +799,7 @@ namespace Jellyfin.Server.Implementations.Users
 
         private IList<IPasswordResetProvider> GetPasswordResetProviders(User user)
         {
-            var passwordResetProviderId = user?.PasswordResetProviderId;
+            var passwordResetProviderId = user.PasswordResetProviderId;
             var providers = _passwordResetProviders.Where(i => i.IsEnabled).ToArray();
 
             if (!string.IsNullOrEmpty(passwordResetProviderId))

From e01209a6f5305084fa4857cf634a0287fd916fd3 Mon Sep 17 00:00:00 2001
From: Maxr1998 <max.rumpf1998@gmail.com>
Date: Sat, 3 Oct 2020 17:14:09 +0200
Subject: [PATCH 186/247] Log stream type and codec for missing direct play
 profile

---
 MediaBrowser.Model/Dlna/StreamBuilder.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index d9e7e4fbb4..fc0aad0727 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -455,9 +455,10 @@ namespace MediaBrowser.Model.Dlna
 
             if (directPlayProfile == null)
             {
-                _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}",
+                _logger.LogInformation("Profile: {0}, No audio direct play profiles found for {1} with codec {2}",
                     options.Profile.Name ?? "Unknown Profile",
-                    item.Path ?? "Unknown path");
+                    item.Path ?? "Unknown path",
+                    audioStream.Codec ?? "Unknown codec");
 
                 return (Enumerable.Empty<PlayMethod>(), GetTranscodeReasonsFromDirectPlayProfile(item, null, audioStream, options.Profile.DirectPlayProfiles));
             }
@@ -972,9 +973,10 @@ namespace MediaBrowser.Model.Dlna
 
             if (directPlay == null)
             {
-                _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}",
+                _logger.LogInformation("Profile: {0}, No video direct play profiles found for {1} with codec {2}",
                     profile.Name ?? "Unknown Profile",
-                    mediaSource.Path ?? "Unknown path");
+                    mediaSource.Path ?? "Unknown path",
+                    videoStream.Codec ?? "Unknown codec");
 
                 return (null, GetTranscodeReasonsFromDirectPlayProfile(mediaSource, videoStream, audioStream, profile.DirectPlayProfiles));
             }

From e9524f89d63894ea9af62cd1b61ddd89cb8b9e82 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 19:49:35 +0200
Subject: [PATCH 187/247] Migrate the TMDb providers to the TMDbLib library

---
 .../ApplicationHost.cs                        |   2 +
 .../Extensions/EnumerableExtensions.cs        |  46 ++
 .../MediaBrowser.Providers.csproj             |   1 +
 .../Tmdb/BoxSets/TmdbBoxSetImageProvider.cs   | 143 ++---
 .../Tmdb/BoxSets/TmdbBoxSetProvider.cs        | 260 ++------
 .../Models/Collections/CollectionImages.cs    |  14 -
 .../Models/Collections/CollectionResult.cs    |  23 -
 .../Plugins/Tmdb/Models/Collections/Part.cs   |  17 -
 .../Plugins/Tmdb/Models/General/Backdrop.cs   |  21 -
 .../Plugins/Tmdb/Models/General/Crew.cs       |  19 -
 .../Tmdb/Models/General/ExternalIds.cs        |  17 -
 .../Plugins/Tmdb/Models/General/Genre.cs      |  11 -
 .../Plugins/Tmdb/Models/General/Images.cs     |  13 -
 .../Plugins/Tmdb/Models/General/Keyword.cs    |  11 -
 .../Plugins/Tmdb/Models/General/Keywords.cs   |  11 -
 .../Plugins/Tmdb/Models/General/Poster.cs     |  21 -
 .../Plugins/Tmdb/Models/General/Profile.cs    |  17 -
 .../Plugins/Tmdb/Models/General/Still.cs      |  23 -
 .../Tmdb/Models/General/StillImages.cs        |  11 -
 .../Plugins/Tmdb/Models/General/Video.cs      |  23 -
 .../Plugins/Tmdb/Models/General/Videos.cs     |  11 -
 .../Tmdb/Models/Movies/BelongsToCollection.cs |  15 -
 .../Plugins/Tmdb/Models/Movies/Cast.cs        |  19 -
 .../Plugins/Tmdb/Models/Movies/Casts.cs       |  14 -
 .../Plugins/Tmdb/Models/Movies/Country.cs     |  15 -
 .../Plugins/Tmdb/Models/Movies/MovieResult.cs |  80 ---
 .../Tmdb/Models/Movies/ProductionCompany.cs   |  11 -
 .../Tmdb/Models/Movies/ProductionCountry.cs   |  11 -
 .../Plugins/Tmdb/Models/Movies/Releases.cs    |  11 -
 .../Tmdb/Models/Movies/SpokenLanguage.cs      |  11 -
 .../Plugins/Tmdb/Models/Movies/Trailers.cs    |  11 -
 .../Plugins/Tmdb/Models/Movies/Youtube.cs     |  13 -
 .../Tmdb/Models/People/PersonImages.cs        |  12 -
 .../Tmdb/Models/People/PersonResult.cs        |  38 --
 .../Models/Search/ExternalIdLookupResult.cs   |  11 -
 .../Plugins/Tmdb/Models/Search/MovieResult.cs |  78 ---
 .../Tmdb/Models/Search/PersonSearchResult.cs  |  31 -
 .../Tmdb/Models/Search/TmdbSearchResult.cs    |  33 -
 .../Plugins/Tmdb/Models/Search/TvResult.cs    |  25 -
 .../Plugins/Tmdb/Models/TV/Cast.cs            |  19 -
 .../Plugins/Tmdb/Models/TV/ContentRating.cs   |  11 -
 .../Plugins/Tmdb/Models/TV/ContentRatings.cs  |  11 -
 .../Plugins/Tmdb/Models/TV/CreatedBy.cs       |  13 -
 .../Plugins/Tmdb/Models/TV/Credits.cs         |  14 -
 .../Plugins/Tmdb/Models/TV/Episode.cs         |  23 -
 .../Plugins/Tmdb/Models/TV/EpisodeCredits.cs  |  16 -
 .../Plugins/Tmdb/Models/TV/EpisodeResult.cs   |  38 --
 .../Plugins/Tmdb/Models/TV/GuestStar.cs       |  19 -
 .../Plugins/Tmdb/Models/TV/Network.cs         |  11 -
 .../Plugins/Tmdb/Models/TV/Season.cs          |  17 -
 .../Plugins/Tmdb/Models/TV/SeasonImages.cs    |  12 -
 .../Plugins/Tmdb/Models/TV/SeasonResult.cs    |  33 -
 .../Plugins/Tmdb/Models/TV/SeriesResult.cs    |  71 ---
 .../Tmdb/Movies/GenericTmdbMovieInfo.cs       | 309 ----------
 .../Plugins/Tmdb/Movies/TmdbImageProvider.cs  | 212 -------
 .../Plugins/Tmdb/Movies/TmdbImageSettings.cs  |  22 -
 .../Tmdb/Movies/TmdbMovieExternalId.cs        |   3 +-
 .../Tmdb/Movies/TmdbMovieImageProvider.cs     | 128 ++++
 .../Plugins/Tmdb/Movies/TmdbMovieProvider.cs  | 574 ++++++++----------
 .../Plugins/Tmdb/Movies/TmdbSearch.cs         | 302 ---------
 .../Tmdb/Music/TmdbMusicVideoProvider.cs      |  34 --
 .../Tmdb/People/TmdbPersonImageProvider.cs    | 104 +---
 .../Plugins/Tmdb/People/TmdbPersonProvider.cs | 248 ++------
 .../Tmdb/TV/TmdbEpisodeImageProvider.cs       | 112 ++--
 .../Plugins/Tmdb/TV/TmdbEpisodeProvider.cs    | 277 +++++----
 .../Tmdb/TV/TmdbEpisodeProviderBase.cs        | 156 -----
 .../Tmdb/TV/TmdbSeasonImageProvider.cs        | 112 +---
 .../Plugins/Tmdb/TV/TmdbSeasonProvider.cs     | 259 +++-----
 .../Tmdb/TV/TmdbSeriesImageProvider.cs        | 165 ++---
 .../Plugins/Tmdb/TV/TmdbSeriesProvider.cs     | 525 ++++++----------
 .../Plugins/Tmdb/TmdbClientManager.cs         | 469 ++++++++++++++
 .../Plugins/Tmdb/TmdbUtils.cs                 |  90 ++-
 .../Tmdb/Trailers/TmdbTrailerProvider.cs      |  43 --
 73 files changed, 1677 insertions(+), 3929 deletions(-)
 create mode 100644 MediaBrowser.Model/Extensions/EnumerableExtensions.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionImages.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/Part.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Backdrop.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Crew.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/ExternalIds.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Genre.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Images.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keyword.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keywords.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Poster.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Profile.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Still.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/StillImages.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Video.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/BelongsToCollection.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Cast.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Casts.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Country.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/MovieResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCompany.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCountry.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Releases.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/SpokenLanguage.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Youtube.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Search/ExternalIdLookupResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Search/MovieResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Search/PersonSearchResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TmdbSearchResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TvResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Cast.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRating.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRatings.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/CreatedBy.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Credits.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Episode.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeCredits.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/GuestStar.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Network.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Season.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonImages.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeriesResult.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs
 create mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
 create mode 100644 MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 7a46fdf2e7..0c8b0339bd 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -97,6 +97,7 @@ using MediaBrowser.Model.Tasks;
 using MediaBrowser.Providers.Chapters;
 using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Plugins.TheTvdb;
+using MediaBrowser.Providers.Plugins.Tmdb;
 using MediaBrowser.Providers.Subtitles;
 using MediaBrowser.XbmcMetadata.Providers;
 using Microsoft.AspNetCore.Mvc;
@@ -537,6 +538,7 @@ namespace Emby.Server.Implementations
 
             ServiceCollection.AddSingleton(_fileSystemManager);
             ServiceCollection.AddSingleton<TvdbClientManager>();
+            ServiceCollection.AddSingleton<TmdbClientManager>();
 
             ServiceCollection.AddSingleton(_networkManager);
 
diff --git a/MediaBrowser.Model/Extensions/EnumerableExtensions.cs b/MediaBrowser.Model/Extensions/EnumerableExtensions.cs
new file mode 100644
index 0000000000..712fa381ee
--- /dev/null
+++ b/MediaBrowser.Model/Extensions/EnumerableExtensions.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Model.Providers;
+
+namespace MediaBrowser.Model.Extensions
+{
+    /// <summary>
+    /// Extension methods for <see cref="IEnumerable{T}"/>.
+    /// </summary>
+    public static class EnumerableExtensions
+    {
+        /// <summary>
+        /// Orders <see cref="RemoteImageInfo"/> by requested language in descending order, prioritizing "en" over other non-matches.
+        /// </summary>
+        /// <param name="remoteImageInfos">The remote image infos.</param>
+        /// <param name="requestedLanguage">The requested language for the images.</param>
+        /// <returns>The ordered remote image infos.</returns>
+        public static IEnumerable<RemoteImageInfo> OrderByLanguageDescending(this IEnumerable<RemoteImageInfo> remoteImageInfos, string requestedLanguage)
+        {
+            var isRequestedLanguageEn = string.Equals(requestedLanguage, "en", StringComparison.OrdinalIgnoreCase);
+
+            return remoteImageInfos.OrderByDescending(i =>
+                {
+                    if (string.Equals(requestedLanguage, i.Language, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return 3;
+                    }
+
+                    if (!isRequestedLanguageEn && string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return 2;
+                    }
+
+                    if (string.IsNullOrEmpty(i.Language))
+                    {
+                        return isRequestedLanguageEn ? 3 : 2;
+                    }
+
+                    return 0;
+                })
+                .ThenByDescending(i => i.CommunityRating ?? 0)
+                .ThenByDescending(i => i.VoteCount ?? 0);
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 813dd441f5..11e30940fd 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -21,6 +21,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="OptimizedPriorityQueue" Version="4.2.0" />
     <PackageReference Include="PlaylistsNET" Version="1.1.2" />
+    <PackageReference Include="TMDbLib" Version="1.7.1-alpha" />
     <PackageReference Include="TvDbSharper" Version="3.2.2" />
   </ItemGroup>
 
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
index f6592afe46..df1e12240d 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -12,25 +13,25 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Collections;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
 {
     public class TmdbBoxSetImageProvider : IRemoteImageProvider, IHasOrder
     {
         private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public TmdbBoxSetImageProvider(IHttpClientFactory httpClientFactory)
+        public TmdbBoxSetImageProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
             _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
         }
 
-        public string Name => ProviderName;
+        public string Name => TmdbUtils.ProviderName;
 
-        public static string ProviderName => TmdbUtils.ProviderName;
+        public int Order => 0;
 
         public bool Supports(BaseItem item)
         {
@@ -48,112 +49,60 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
 
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
-            var tmdbId = item.GetProviderId(MetadataProvider.Tmdb);
+            var tmdbId = Convert.ToInt32(item.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            if (!string.IsNullOrEmpty(tmdbId))
+            if (tmdbId <= 0)
             {
-                var language = item.GetPreferredMetadataLanguage();
-
-                var mainResult = await TmdbBoxSetProvider.Current.GetMovieDbResult(tmdbId, null, cancellationToken).ConfigureAwait(false);
-
-                if (mainResult != null)
-                {
-                    var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-                    var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-                    return GetImages(mainResult, language, tmdbImageUrl);
-                }
+                return Enumerable.Empty<RemoteImageInfo>();
             }
 
-            return new List<RemoteImageInfo>();
-        }
+            var language = item.GetPreferredMetadataLanguage();
 
-        private IEnumerable<RemoteImageInfo> GetImages(CollectionResult obj, string language, string baseUrl)
-        {
-            var list = new List<RemoteImageInfo>();
+            var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken).ConfigureAwait(false);
 
-            var images = obj.Images ?? new CollectionImages();
-
-            list.AddRange(GetPosters(images).Select(i => new RemoteImageInfo
+            if (collection?.Images == null)
             {
-                Url = baseUrl + i.File_Path,
-                CommunityRating = i.Vote_Average,
-                VoteCount = i.Vote_Count,
-                Width = i.Width,
-                Height = i.Height,
-                Language = TmdbMovieProvider.AdjustImageLanguage(i.Iso_639_1, language),
-                ProviderName = Name,
-                Type = ImageType.Primary,
-                RatingType = RatingType.Score
-            }));
+                return Enumerable.Empty<RemoteImageInfo>();
+            }
 
-            list.AddRange(GetBackdrops(images).Select(i => new RemoteImageInfo
+            var remoteImages = new List<RemoteImageInfo>();
+
+            for (var i = 0; i < collection.Images.Posters.Count; i++)
             {
-                Url = baseUrl + i.File_Path,
-                CommunityRating = i.Vote_Average,
-                VoteCount = i.Vote_Count,
-                Width = i.Width,
-                Height = i.Height,
-                ProviderName = Name,
-                Type = ImageType.Backdrop,
-                RatingType = RatingType.Score
-            }));
+                var poster = collection.Images.Posters[i];
+                remoteImages.Add(new RemoteImageInfo
+                {
+                    Url = _tmdbClientManager.GetPosterUrl(poster.FilePath),
+                    CommunityRating = poster.VoteAverage,
+                    VoteCount = poster.VoteCount,
+                    Width = poster.Width,
+                    Height = poster.Height,
+                    Language = TmdbUtils.AdjustImageLanguage(poster.Iso_639_1, language),
+                    ProviderName = Name,
+                    Type = ImageType.Primary,
+                    RatingType = RatingType.Score
+                });
+            }
 
-            var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
-
-            return list.OrderByDescending(i =>
+            for (var i = 0; i < collection.Images.Backdrops.Count; i++)
             {
-                if (string.Equals(language, i.Language, StringComparison.OrdinalIgnoreCase))
+                var backdrop = collection.Images.Backdrops[i];
+                remoteImages.Add(new RemoteImageInfo
                 {
-                    return 3;
-                }
+                    Url = _tmdbClientManager.GetBackdropUrl(backdrop.FilePath),
+                    CommunityRating = backdrop.VoteAverage,
+                    VoteCount = backdrop.VoteCount,
+                    Width = backdrop.Width,
+                    Height = backdrop.Height,
+                    ProviderName = Name,
+                    Type = ImageType.Backdrop,
+                    RatingType = RatingType.Score
+                });
+            }
 
-                if (!isLanguageEn)
-                {
-                    if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 2;
-                    }
-                }
-
-                if (string.IsNullOrEmpty(i.Language))
-                {
-                    return isLanguageEn ? 3 : 2;
-                }
-
-                return 0;
-            })
-                .ThenByDescending(i => i.CommunityRating ?? 0)
-                .ThenByDescending(i => i.VoteCount ?? 0);
+            return remoteImages.OrderByLanguageDescending(language);
         }
 
-        /// <summary>
-        /// Gets the posters.
-        /// </summary>
-        /// <param name="images">The images.</param>
-        /// <returns>IEnumerable{MovieDbProvider.Poster}.</returns>
-        private IEnumerable<Poster> GetPosters(CollectionImages images)
-        {
-            return images.Posters ?? new List<Poster>();
-        }
-
-        /// <summary>
-        /// Gets the backdrops.
-        /// </summary>
-        /// <param name="images">The images.</param>
-        /// <returns>IEnumerable{MovieDbProvider.Backdrop}.</returns>
-        private IEnumerable<Backdrop> GetBackdrops(CollectionImages images)
-        {
-            var eligibleBackdrops = images.Backdrops == null ? new List<Backdrop>() :
-                images.Backdrops;
-
-            return eligibleBackdrops.OrderByDescending(i => i.Vote_Average)
-                .ThenByDescending(i => i.Vote_Count);
-        }
-
-        public int Order => 0;
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetProvider.cs
index e7328b5535..fcd8e614c1 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetProvider.cs
@@ -3,270 +3,118 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Collections;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
 {
     public class TmdbBoxSetProvider : IRemoteMetadataProvider<BoxSet, BoxSetInfo>
     {
-        private const string GetCollectionInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/collection/{0}?api_key={1}&append_to_response=images";
-
-        internal static TmdbBoxSetProvider Current;
-
-        private readonly ILogger<TmdbBoxSetProvider> _logger;
-        private readonly IJsonSerializer _json;
-        private readonly IServerConfigurationManager _config;
-        private readonly IFileSystem _fileSystem;
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly ILibraryManager _libraryManager;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public TmdbBoxSetProvider(
-            ILogger<TmdbBoxSetProvider> logger,
-            IJsonSerializer json,
-            IServerConfigurationManager config,
-            IFileSystem fileSystem,
-            IHttpClientFactory httpClientFactory,
-            ILibraryManager libraryManager)
+        public TmdbBoxSetProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
-            _logger = logger;
-            _json = json;
-            _config = config;
-            _fileSystem = fileSystem;
             _httpClientFactory = httpClientFactory;
-            _libraryManager = libraryManager;
-            Current = this;
+            _tmdbClientManager = tmdbClientManager;
         }
 
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+        public string Name => TmdbUtils.ProviderName;
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(BoxSetInfo searchInfo, CancellationToken cancellationToken)
         {
-            var tmdbId = searchInfo.GetProviderId(MetadataProvider.Tmdb);
+            var tmdbId = Convert.ToInt32(searchInfo.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            var language = searchInfo.MetadataLanguage;
 
-            if (!string.IsNullOrEmpty(tmdbId))
+            if (tmdbId > 0)
             {
-                await EnsureInfo(tmdbId, searchInfo.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken).ConfigureAwait(false);
 
-                var dataFilePath = GetDataFilePath(_config.ApplicationPaths, tmdbId, searchInfo.MetadataLanguage);
-                var info = _json.DeserializeFromFile<CollectionResult>(dataFilePath);
-
-                var images = (info.Images ?? new CollectionImages()).Posters ?? new List<Poster>();
-
-                var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-                var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
+                if (collection == null)
+                {
+                    return Enumerable.Empty<RemoteSearchResult>();
+                }
 
                 var result = new RemoteSearchResult
                 {
-                    Name = info.Name,
-                    SearchProviderName = Name,
-                    ImageUrl = images.Count == 0 ? null : (tmdbImageUrl + images[0].File_Path)
+                    Name = collection.Name,
+                    SearchProviderName = Name
                 };
 
-                result.SetProviderId(MetadataProvider.Tmdb, info.Id.ToString(_usCulture));
+                if (collection.Images != null)
+                {
+                    result.ImageUrl = _tmdbClientManager.GetPosterUrl(collection.PosterPath);
+                }
+
+                result.SetProviderId(MetadataProvider.Tmdb, collection.Id.ToString(CultureInfo.InvariantCulture));
 
                 return new[] { result };
             }
 
-            return await new TmdbSearch(_logger, _json, _libraryManager).GetSearchResults(searchInfo, cancellationToken).ConfigureAwait(false);
+            var collectionSearchResults = await _tmdbClientManager.SearchCollectionAsync(searchInfo.Name, language, cancellationToken).ConfigureAwait(false);
+
+            var collections = new List<RemoteSearchResult>();
+            for (var i = 0; i < collectionSearchResults.Count; i++)
+            {
+                var collection = new RemoteSearchResult
+                {
+                    Name = collectionSearchResults[i].Name,
+                    SearchProviderName = Name
+                };
+                collection.SetProviderId(MetadataProvider.Tmdb, collectionSearchResults[i].Id.ToString(CultureInfo.InvariantCulture));
+
+                collections.Add(collection);
+            }
+
+            return collections;
         }
 
         public async Task<MetadataResult<BoxSet>> GetMetadata(BoxSetInfo id, CancellationToken cancellationToken)
         {
-            var tmdbId = id.GetProviderId(MetadataProvider.Tmdb);
-
+            var tmdbId = Convert.ToInt32(id.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            var language = id.MetadataLanguage;
             // We don't already have an Id, need to fetch it
-            if (string.IsNullOrEmpty(tmdbId))
+            if (tmdbId <= 0)
             {
-                var searchResults = await new TmdbSearch(_logger, _json, _libraryManager).GetSearchResults(id, cancellationToken).ConfigureAwait(false);
+                var searchResults = await _tmdbClientManager.SearchCollectionAsync(id.Name, language, cancellationToken).ConfigureAwait(false);
 
-                var searchResult = searchResults.FirstOrDefault();
-
-                if (searchResult != null)
+                if (searchResults != null && searchResults.Count > 0)
                 {
-                    tmdbId = searchResult.GetProviderId(MetadataProvider.Tmdb);
+                    tmdbId = searchResults[0].Id;
                 }
             }
 
             var result = new MetadataResult<BoxSet>();
 
-            if (!string.IsNullOrEmpty(tmdbId))
+            if (tmdbId > 0)
             {
-                var mainResult = await GetMovieDbResult(tmdbId, id.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken).ConfigureAwait(false);
 
-                if (mainResult != null)
+                if (collection != null)
                 {
+                    var item = new BoxSet
+                    {
+                        Name = collection.Name,
+                        Overview = collection.Overview
+                    };
+
+                    item.SetProviderId(MetadataProvider.Tmdb, collection.Id.ToString(CultureInfo.InvariantCulture));
+
                     result.HasMetadata = true;
-                    result.Item = GetItem(mainResult);
+                    result.Item = item;
                 }
             }
 
             return result;
         }
 
-        internal async Task<CollectionResult> GetMovieDbResult(string tmdbId, string language, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            await EnsureInfo(tmdbId, language, cancellationToken).ConfigureAwait(false);
-
-            var dataFilePath = GetDataFilePath(_config.ApplicationPaths, tmdbId, language);
-
-            if (!string.IsNullOrEmpty(dataFilePath))
-            {
-                return _json.DeserializeFromFile<CollectionResult>(dataFilePath);
-            }
-
-            return null;
-        }
-
-        private BoxSet GetItem(CollectionResult obj)
-        {
-            var item = new BoxSet
-            {
-                Name = obj.Name,
-                Overview = obj.Overview
-            };
-
-            item.SetProviderId(MetadataProvider.Tmdb, obj.Id.ToString(_usCulture));
-
-            return item;
-        }
-
-        private async Task DownloadInfo(string tmdbId, string preferredMetadataLanguage, CancellationToken cancellationToken)
-        {
-            var mainResult = await FetchMainResult(tmdbId, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-            if (mainResult == null)
-            {
-                return;
-            }
-
-            var dataFilePath = GetDataFilePath(_config.ApplicationPaths, tmdbId, preferredMetadataLanguage);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-
-            _json.SerializeToFile(mainResult, dataFilePath);
-        }
-
-        private async Task<CollectionResult> FetchMainResult(string id, string language, CancellationToken cancellationToken)
-        {
-            var url = string.Format(CultureInfo.InvariantCulture, GetCollectionInfo3, id, TmdbUtils.ApiKey);
-
-            if (!string.IsNullOrEmpty(language))
-            {
-                url += string.Format(CultureInfo.InvariantCulture, "&language={0}", TmdbMovieProvider.NormalizeLanguage(language));
-
-                // Get images in english and with no language
-                url += "&include_image_language=" + TmdbMovieProvider.GetImageLanguagesParam(language);
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var mainResponse = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await mainResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            var mainResult = await _json.DeserializeFromStreamAsync<CollectionResult>(stream).ConfigureAwait(false);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            if (mainResult != null && string.IsNullOrEmpty(mainResult.Name))
-            {
-                if (!string.IsNullOrEmpty(language) && !string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
-                {
-                    url = string.Format(CultureInfo.InvariantCulture, GetCollectionInfo3, id, TmdbUtils.ApiKey) + "&language=en";
-
-                    if (!string.IsNullOrEmpty(language))
-                    {
-                        // Get images in english and with no language
-                        url += "&include_image_language=" + TmdbMovieProvider.GetImageLanguagesParam(language);
-                    }
-
-                    using var langRequestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-                    foreach (var header in TmdbUtils.AcceptHeaders)
-                    {
-                        langRequestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-                    }
-
-                    await using var langStream = await mainResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-                    mainResult = await _json.DeserializeFromStreamAsync<CollectionResult>(langStream).ConfigureAwait(false);
-                }
-            }
-
-            return mainResult;
-        }
-
-        internal Task EnsureInfo(string tmdbId, string preferredMetadataLanguage, CancellationToken cancellationToken)
-        {
-            var path = GetDataFilePath(_config.ApplicationPaths, tmdbId, preferredMetadataLanguage);
-
-            var fileInfo = _fileSystem.GetFileSystemInfo(path);
-
-            if (fileInfo.Exists)
-            {
-                // If it's recent or automatic updates are enabled, don't re-download
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
-                {
-                    return Task.CompletedTask;
-                }
-            }
-
-            return DownloadInfo(tmdbId, preferredMetadataLanguage, cancellationToken);
-        }
-
-        public string Name => TmdbUtils.ProviderName;
-
-        private static string GetDataFilePath(IApplicationPaths appPaths, string tmdbId, string preferredLanguage)
-        {
-            var path = GetDataPath(appPaths, tmdbId);
-
-            var filename = string.Format(CultureInfo.InvariantCulture, "all-{0}.json", preferredLanguage ?? string.Empty);
-
-            return Path.Combine(path, filename);
-        }
-
-        private static string GetDataPath(IApplicationPaths appPaths, string tmdbId)
-        {
-            var dataPath = GetCollectionsDataPath(appPaths);
-
-            return Path.Combine(dataPath, tmdbId);
-        }
-
-        private static string GetCollectionsDataPath(IApplicationPaths appPaths)
-        {
-            var dataPath = Path.Combine(appPaths.CachePath, "tmdb-collections");
-
-            return dataPath;
-        }
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionImages.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionImages.cs
deleted file mode 100644
index 0a8994d540..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionImages.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Collections
-{
-    public class CollectionImages
-    {
-        public List<Backdrop> Backdrops { get; set; }
-
-        public List<Poster> Posters { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionResult.cs
deleted file mode 100644
index c6b851c237..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/CollectionResult.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Collections
-{
-    public class CollectionResult
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Overview { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public string Backdrop_Path { get; set; }
-
-        public List<Part> Parts { get; set; }
-
-        public CollectionImages Images { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/Part.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/Part.cs
deleted file mode 100644
index a48124b3e1..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Collections/Part.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Collections
-{
-    public class Part
-    {
-        public string Title { get; set; }
-
-        public int Id { get; set; }
-
-        public string Release_Date { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public string Backdrop_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Backdrop.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Backdrop.cs
deleted file mode 100644
index 5b7627f6e8..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Backdrop.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Backdrop
-    {
-        public double Aspect_Ratio { get; set; }
-
-        public string File_Path { get; set; }
-
-        public int Height { get; set; }
-
-        public string Iso_639_1 { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-
-        public int Width { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Crew.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Crew.cs
deleted file mode 100644
index 339ecb6285..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Crew.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Crew
-    {
-        public int Id { get; set; }
-
-        public string Credit_Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Department { get; set; }
-
-        public string Job { get; set; }
-
-        public string Profile_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/ExternalIds.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/ExternalIds.cs
deleted file mode 100644
index aac4420e8b..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/ExternalIds.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class ExternalIds
-    {
-        public string Imdb_Id { get; set; }
-
-        public object Freebase_Id { get; set; }
-
-        public string Freebase_Mid { get; set; }
-
-        public int? Tvdb_Id { get; set; }
-
-        public int? Tvrage_Id { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Genre.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Genre.cs
deleted file mode 100644
index 9ba1c15c65..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Genre.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Genre
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Images.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Images.cs
deleted file mode 100644
index 0538cf174d..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Images.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Images
-    {
-        public List<Backdrop> Backdrops { get; set; }
-
-        public List<Poster> Posters { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keyword.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keyword.cs
deleted file mode 100644
index fff86931be..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keyword.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Keyword
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keywords.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keywords.cs
deleted file mode 100644
index 235ecb5682..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Keywords.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Keywords
-    {
-        public List<Keyword> Results { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Poster.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Poster.cs
deleted file mode 100644
index 4f61e978be..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Poster.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Poster
-    {
-        public double Aspect_Ratio { get; set; }
-
-        public string File_Path { get; set; }
-
-        public int Height { get; set; }
-
-        public string Iso_639_1 { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-
-        public int Width { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Profile.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Profile.cs
deleted file mode 100644
index 0a1f8843eb..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Profile.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Profile
-    {
-        public string File_Path { get; set; }
-
-        public int Width { get; set; }
-
-        public int Height { get; set; }
-
-        public object Iso_639_1 { get; set; }
-
-        public double Aspect_Ratio { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Still.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Still.cs
deleted file mode 100644
index 61de819b93..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Still.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Still
-    {
-        public double Aspect_Ratio { get; set; }
-
-        public string File_Path { get; set; }
-
-        public int Height { get; set; }
-
-        public string Id { get; set; }
-
-        public string Iso_639_1 { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-
-        public int Width { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/StillImages.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/StillImages.cs
deleted file mode 100644
index 59ab18b7bf..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/StillImages.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class StillImages
-    {
-        public List<Still> Stills { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Video.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Video.cs
deleted file mode 100644
index ebd5c7acee..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Video.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Video
-    {
-        public string Id { get; set; }
-
-        public string Iso_639_1 { get; set; }
-
-        public string Iso_3166_1 { get; set; }
-
-        public string Key { get; set; }
-
-        public string Name { get; set; }
-
-        public string Site { get; set; }
-
-        public string Size { get; set; }
-
-        public string Type { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs
deleted file mode 100644
index 1c673fdbd6..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/General/Videos.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.General
-{
-    public class Videos
-    {
-        public IReadOnlyList<Video> Results { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/BelongsToCollection.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/BelongsToCollection.cs
deleted file mode 100644
index e8745be140..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/BelongsToCollection.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class BelongsToCollection
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public string Backdrop_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Cast.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Cast.cs
deleted file mode 100644
index 937cfb8f6b..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Cast.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class Cast
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Character { get; set; }
-
-        public int Order { get; set; }
-
-        public int Cast_Id { get; set; }
-
-        public string Profile_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Casts.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Casts.cs
deleted file mode 100644
index 37547640f5..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Casts.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class Casts
-    {
-        public List<Cast> Cast { get; set; }
-
-        public List<Crew> Crew { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Country.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Country.cs
deleted file mode 100644
index edd656a461..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Country.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class Country
-    {
-        public string Iso_3166_1 { get; set; }
-
-        public string Certification { get; set; }
-
-        public DateTime Release_Date { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/MovieResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/MovieResult.cs
deleted file mode 100644
index 704ebcd5a1..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/MovieResult.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class MovieResult
-    {
-        public bool Adult { get; set; }
-
-        public string Backdrop_Path { get; set; }
-
-        public BelongsToCollection Belongs_To_Collection { get; set; }
-
-        public long Budget { get; set; }
-
-        public List<Genre> Genres { get; set; }
-
-        public string Homepage { get; set; }
-
-        public int Id { get; set; }
-
-        public string Imdb_Id { get; set; }
-
-        public string Original_Title { get; set; }
-
-        public string Original_Name { get; set; }
-
-        public string Overview { get; set; }
-
-        public double Popularity { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public List<ProductionCompany> Production_Companies { get; set; }
-
-        public List<ProductionCountry> Production_Countries { get; set; }
-
-        public string Release_Date { get; set; }
-
-        public long Revenue { get; set; }
-
-        public int Runtime { get; set; }
-
-        public List<SpokenLanguage> Spoken_Languages { get; set; }
-
-        public string Status { get; set; }
-
-        public string Tagline { get; set; }
-
-        public string Title { get; set; }
-
-        public string Name { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-
-        public Casts Casts { get; set; }
-
-        public Releases Releases { get; set; }
-
-        public Images Images { get; set; }
-
-        public Keywords Keywords { get; set; }
-
-        public Trailers Trailers { get; set; }
-
-        public string GetOriginalTitle()
-        {
-            return Original_Name ?? Original_Title;
-        }
-
-        public string GetTitle()
-        {
-            return Name ?? Title ?? GetOriginalTitle();
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCompany.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCompany.cs
deleted file mode 100644
index 2788731b2e..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCompany.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class ProductionCompany
-    {
-        public string Name { get; set; }
-
-        public int Id { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCountry.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCountry.cs
deleted file mode 100644
index 1b6f2cc67a..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/ProductionCountry.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class ProductionCountry
-    {
-        public string Iso_3166_1 { get; set; }
-
-        public string Name { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Releases.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Releases.cs
deleted file mode 100644
index 276fbaaf55..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Releases.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class Releases
-    {
-        public List<Country> Countries { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/SpokenLanguage.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/SpokenLanguage.cs
deleted file mode 100644
index 67231d219d..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/SpokenLanguage.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class SpokenLanguage
-    {
-        public string Iso_639_1 { get; set; }
-
-        public string Name { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs
deleted file mode 100644
index 0571772944..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Trailers.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class Trailers
-    {
-        public IReadOnlyList<Youtube> Youtube { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Youtube.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Youtube.cs
deleted file mode 100644
index 6885b7dab5..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Movies/Youtube.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Movies
-{
-    public class Youtube
-    {
-        public string Name { get; set; }
-
-        public string Size { get; set; }
-
-        public string Source { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs
deleted file mode 100644
index d82e0fc6de..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonImages.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.People
-{
-    public class PersonImages
-    {
-        public IReadOnlyList<Profile> Profiles { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonResult.cs
deleted file mode 100644
index 460ced49a0..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/People/PersonResult.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.People
-{
-    public class PersonResult
-    {
-        public bool Adult { get; set; }
-
-        public List<string> Also_Known_As { get; set; }
-
-        public string Biography { get; set; }
-
-        public string Birthday { get; set; }
-
-        public string Deathday { get; set; }
-
-        public string Homepage { get; set; }
-
-        public int Id { get; set; }
-
-        public string Imdb_Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Place_Of_Birth { get; set; }
-
-        public double Popularity { get; set; }
-
-        public string Profile_Path { get; set; }
-
-        public PersonImages Images { get; set; }
-
-        public ExternalIds External_Ids { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/ExternalIdLookupResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/ExternalIdLookupResult.cs
deleted file mode 100644
index 87c2a723d1..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/ExternalIdLookupResult.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Search
-{
-    public class ExternalIdLookupResult
-    {
-        public List<TvResult> Tv_Results { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/MovieResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/MovieResult.cs
deleted file mode 100644
index 401c75c319..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/MovieResult.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Search
-{
-    public class MovieResult
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="MovieResult" /> is adult.
-        /// </summary>
-        /// <value><c>true</c> if adult; otherwise, <c>false</c>.</value>
-        public bool Adult { get; set; }
-
-        /// <summary>
-        /// Gets or sets the backdrop_path.
-        /// </summary>
-        /// <value>The backdrop_path.</value>
-        public string Backdrop_Path { get; set; }
-
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the original_title.
-        /// </summary>
-        /// <value>The original_title.</value>
-        public string Original_Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the original_name.
-        /// </summary>
-        /// <value>The original_name.</value>
-        public string Original_Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the release_date.
-        /// </summary>
-        /// <value>The release_date.</value>
-        public string Release_Date { get; set; }
-
-        /// <summary>
-        /// Gets or sets the poster_path.
-        /// </summary>
-        /// <value>The poster_path.</value>
-        public string Poster_Path { get; set; }
-
-        /// <summary>
-        /// Gets or sets the popularity.
-        /// </summary>
-        /// <value>The popularity.</value>
-        public double Popularity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title.
-        /// </summary>
-        /// <value>The title.</value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the vote_average.
-        /// </summary>
-        /// <value>The vote_average.</value>
-        public double Vote_Average { get; set; }
-
-        /// <summary>
-        /// For collection search results.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the vote_count.
-        /// </summary>
-        /// <value>The vote_count.</value>
-        public int Vote_Count { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/PersonSearchResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/PersonSearchResult.cs
deleted file mode 100644
index 4cff45ca64..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/PersonSearchResult.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Search
-{
-    public class PersonSearchResult
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="PersonSearchResult" /> is adult.
-        /// </summary>
-        /// <value><c>true</c> if adult; otherwise, <c>false</c>.</value>
-        public bool Adult { get; set; }
-
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the profile_ path.
-        /// </summary>
-        /// <value>The profile_ path.</value>
-        public string Profile_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TmdbSearchResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TmdbSearchResult.cs
deleted file mode 100644
index 3b9257b623..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TmdbSearchResult.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Search
-{
-    public class TmdbSearchResult<T>
-    {
-        /// <summary>
-        /// Gets or sets the page.
-        /// </summary>
-        /// <value>The page.</value>
-        public int Page { get; set; }
-
-        /// <summary>
-        /// Gets or sets the results.
-        /// </summary>
-        /// <value>The results.</value>
-        public List<T> Results { get; set; }
-
-        /// <summary>
-        /// Gets or sets the total_pages.
-        /// </summary>
-        /// <value>The total_pages.</value>
-        public int Total_Pages { get; set; }
-
-        /// <summary>
-        /// Gets or sets the total_results.
-        /// </summary>
-        /// <value>The total_results.</value>
-        public int Total_Results { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TvResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TvResult.cs
deleted file mode 100644
index b2bb068b58..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/Search/TvResult.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.Search
-{
-    public class TvResult
-    {
-        public string Backdrop_Path { get; set; }
-
-        public string First_Air_Date { get; set; }
-
-        public int Id { get; set; }
-
-        public string Original_Name { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public double Popularity { get; set; }
-
-        public string Name { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Cast.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Cast.cs
deleted file mode 100644
index 4ce26c65ee..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Cast.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class Cast
-    {
-        public string Character { get; set; }
-
-        public string Credit_Id { get; set; }
-
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Profile_Path { get; set; }
-
-        public int Order { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRating.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRating.cs
deleted file mode 100644
index aef4e28632..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRating.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class ContentRating
-    {
-        public string Iso_3166_1 { get; set; }
-
-        public string Rating { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRatings.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRatings.cs
deleted file mode 100644
index ae1b5668d3..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/ContentRatings.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class ContentRatings
-    {
-        public List<ContentRating> Results { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/CreatedBy.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/CreatedBy.cs
deleted file mode 100644
index ba36632e04..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/CreatedBy.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class CreatedBy
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Profile_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Credits.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Credits.cs
deleted file mode 100644
index 47205d8751..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Credits.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class Credits
-    {
-        public List<Cast> Cast { get; set; }
-
-        public List<Crew> Crew { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Episode.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Episode.cs
deleted file mode 100644
index 53e3c26959..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Episode.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class Episode
-    {
-        public string Air_Date { get; set; }
-
-        public int Episode_Number { get; set; }
-
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Overview { get; set; }
-
-        public string Still_Path { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeCredits.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeCredits.cs
deleted file mode 100644
index 9707e4bf49..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeCredits.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class EpisodeCredits
-    {
-        public List<Cast> Cast { get; set; }
-
-        public List<Crew> Crew { get; set; }
-
-        public List<GuestStar> Guest_Stars { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeResult.cs
deleted file mode 100644
index 4458bad367..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/EpisodeResult.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class EpisodeResult
-    {
-        public DateTime Air_Date { get; set; }
-
-        public int Episode_Number { get; set; }
-
-        public string Name { get; set; }
-
-        public string Overview { get; set; }
-
-        public int Id { get; set; }
-
-        public object Production_Code { get; set; }
-
-        public int Season_Number { get; set; }
-
-        public string Still_Path { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-
-        public StillImages Images { get; set; }
-
-        public ExternalIds External_Ids { get; set; }
-
-        public EpisodeCredits Credits { get; set; }
-
-        public Tmdb.Models.General.Videos Videos { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/GuestStar.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/GuestStar.cs
deleted file mode 100644
index 8f39886418..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/GuestStar.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class GuestStar
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public string Credit_Id { get; set; }
-
-        public string Character { get; set; }
-
-        public int Order { get; set; }
-
-        public string Profile_Path { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Network.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Network.cs
deleted file mode 100644
index 3dc310d330..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Network.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class Network
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Season.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Season.cs
deleted file mode 100644
index 9cbd283a95..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/Season.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class Season
-    {
-        public string Air_Date { get; set; }
-
-        public int Episode_Count { get; set; }
-
-        public int Id { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public int Season_Number { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonImages.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonImages.cs
deleted file mode 100644
index f364d4921b..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonImages.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class SeasonImages
-    {
-        public List<Poster> Posters { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonResult.cs
deleted file mode 100644
index e98048eacc..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeasonResult.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class SeasonResult
-    {
-        public DateTime Air_Date { get; set; }
-
-        public List<Episode> Episodes { get; set; }
-
-        public string Name { get; set; }
-
-        public string Overview { get; set; }
-
-        public int Id { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public int Season_Number { get; set; }
-
-        public Credits Credits { get; set; }
-
-        public SeasonImages Images { get; set; }
-
-        public ExternalIds External_Ids { get; set; }
-
-        public General.Videos Videos { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeriesResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeriesResult.cs
deleted file mode 100644
index 331cd59fa6..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Models/TV/SeriesResult.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Models.TV
-{
-    public class SeriesResult
-    {
-        public string Backdrop_Path { get; set; }
-
-        public List<CreatedBy> Created_By { get; set; }
-
-        public List<int> Episode_Run_Time { get; set; }
-
-        public DateTime First_Air_Date { get; set; }
-
-        public List<Genre> Genres { get; set; }
-
-        public string Homepage { get; set; }
-
-        public int Id { get; set; }
-
-        public bool In_Production { get; set; }
-
-        public List<string> Languages { get; set; }
-
-        public DateTime Last_Air_Date { get; set; }
-
-        public string Name { get; set; }
-
-        public List<Network> Networks { get; set; }
-
-        public int Number_Of_Episodes { get; set; }
-
-        public int Number_Of_Seasons { get; set; }
-
-        public string Original_Name { get; set; }
-
-        public List<string> Origin_Country { get; set; }
-
-        public string Overview { get; set; }
-
-        public string Popularity { get; set; }
-
-        public string Poster_Path { get; set; }
-
-        public List<Season> Seasons { get; set; }
-
-        public string Status { get; set; }
-
-        public double Vote_Average { get; set; }
-
-        public int Vote_Count { get; set; }
-
-        public Credits Credits { get; set; }
-
-        public Images Images { get; set; }
-
-        public Keywords Keywords { get; set; }
-
-        public ExternalIds External_Ids { get; set; }
-
-        public General.Videos Videos { get; set; }
-
-        public ContentRatings Content_Ratings { get; set; }
-
-        public string ResultLanguage { get; set; }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
deleted file mode 100644
index 3c626f9ebf..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/GenericTmdbMovieInfo.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Movies;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
-{
-    public class GenericTmdbMovieInfo<T>
-        where T : BaseItem, new()
-    {
-        private readonly ILogger _logger;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IFileSystem _fileSystem;
-
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
-        public GenericTmdbMovieInfo(ILogger logger, IJsonSerializer jsonSerializer, ILibraryManager libraryManager, IFileSystem fileSystem)
-        {
-            _logger = logger;
-            _jsonSerializer = jsonSerializer;
-            _libraryManager = libraryManager;
-            _fileSystem = fileSystem;
-        }
-
-        public async Task<MetadataResult<T>> GetMetadata(ItemLookupInfo itemId, CancellationToken cancellationToken)
-        {
-            var tmdbId = itemId.GetProviderId(MetadataProvider.Tmdb);
-            var imdbId = itemId.GetProviderId(MetadataProvider.Imdb);
-
-            // Don't search for music video id's because it is very easy to misidentify.
-            if (string.IsNullOrEmpty(tmdbId) && string.IsNullOrEmpty(imdbId) && typeof(T) != typeof(MusicVideo))
-            {
-                var searchResults = await new TmdbSearch(_logger, _jsonSerializer, _libraryManager).GetMovieSearchResults(itemId, cancellationToken).ConfigureAwait(false);
-
-                var searchResult = searchResults.FirstOrDefault();
-
-                if (searchResult != null)
-                {
-                    tmdbId = searchResult.GetProviderId(MetadataProvider.Tmdb);
-                }
-            }
-
-            if (!string.IsNullOrEmpty(tmdbId) || !string.IsNullOrEmpty(imdbId))
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                return await FetchMovieData(tmdbId, imdbId, itemId.MetadataLanguage, itemId.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
-            }
-
-            return new MetadataResult<T>();
-        }
-
-        /// <summary>
-        /// Fetches the movie data.
-        /// </summary>
-        /// <param name="tmdbId">The TMDB identifier.</param>
-        /// <param name="imdbId">The imdb identifier.</param>
-        /// <param name="language">The language.</param>
-        /// <param name="preferredCountryCode">The preferred country code.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{`0}.</returns>
-        private async Task<MetadataResult<T>> FetchMovieData(string tmdbId, string imdbId, string language, string preferredCountryCode, CancellationToken cancellationToken)
-        {
-            var item = new MetadataResult<T>
-            {
-                Item = new T()
-            };
-
-            string dataFilePath = null;
-            MovieResult movieInfo = null;
-
-            // Id could be ImdbId or TmdbId
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                movieInfo = await TmdbMovieProvider.Current.FetchMainResult(imdbId, false, language, cancellationToken).ConfigureAwait(false);
-                if (movieInfo != null)
-                {
-                    tmdbId = movieInfo.Id.ToString(_usCulture);
-
-                    dataFilePath = TmdbMovieProvider.Current.GetDataFilePath(tmdbId, language);
-                    Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-                    _jsonSerializer.SerializeToFile(movieInfo, dataFilePath);
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(tmdbId))
-            {
-                await TmdbMovieProvider.Current.EnsureMovieInfo(tmdbId, language, cancellationToken).ConfigureAwait(false);
-
-                dataFilePath = dataFilePath ?? TmdbMovieProvider.Current.GetDataFilePath(tmdbId, language);
-                movieInfo = movieInfo ?? _jsonSerializer.DeserializeFromFile<MovieResult>(dataFilePath);
-
-                var settings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-                ProcessMainInfo(item, settings, preferredCountryCode, movieInfo);
-                item.HasMetadata = true;
-            }
-
-            return item;
-        }
-
-        /// <summary>
-        /// Processes the main info.
-        /// </summary>
-        /// <param name="resultItem">The result item.</param>
-        /// <param name="settings">The settings.</param>
-        /// <param name="preferredCountryCode">The preferred country code.</param>
-        /// <param name="movieData">The movie data.</param>
-        private void ProcessMainInfo(MetadataResult<T> resultItem, TmdbSettingsResult settings, string preferredCountryCode, MovieResult movieData)
-        {
-            var movie = resultItem.Item;
-
-            movie.Name = movieData.GetTitle() ?? movie.Name;
-
-            movie.OriginalTitle = movieData.GetOriginalTitle();
-
-            movie.Overview = string.IsNullOrWhiteSpace(movieData.Overview) ? null : WebUtility.HtmlDecode(movieData.Overview);
-            movie.Overview = movie.Overview != null ? movie.Overview.Replace("\n\n", "\n") : null;
-
-            // movie.HomePageUrl = movieData.homepage;
-
-            if (!string.IsNullOrEmpty(movieData.Tagline))
-            {
-                movie.Tagline = movieData.Tagline;
-            }
-
-            if (movieData.Production_Countries != null)
-            {
-                movie.ProductionLocations = movieData
-                    .Production_Countries
-                    .Select(i => i.Name)
-                    .ToArray();
-            }
-
-            movie.SetProviderId(MetadataProvider.Tmdb, movieData.Id.ToString(_usCulture));
-            movie.SetProviderId(MetadataProvider.Imdb, movieData.Imdb_Id);
-
-            if (movieData.Belongs_To_Collection != null)
-            {
-                movie.SetProviderId(MetadataProvider.TmdbCollection,
-                                    movieData.Belongs_To_Collection.Id.ToString(CultureInfo.InvariantCulture));
-
-                if (movie is Movie movieItem)
-                {
-                    movieItem.CollectionName = movieData.Belongs_To_Collection.Name;
-                }
-            }
-
-            string voteAvg = movieData.Vote_Average.ToString(CultureInfo.InvariantCulture);
-
-            if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var rating))
-            {
-                movie.CommunityRating = rating;
-            }
-
-            // movie.VoteCount = movieData.vote_count;
-
-            if (movieData.Releases != null && movieData.Releases.Countries != null)
-            {
-                var releases = movieData.Releases.Countries.Where(i => !string.IsNullOrWhiteSpace(i.Certification)).ToList();
-
-                var ourRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, preferredCountryCode, StringComparison.OrdinalIgnoreCase));
-                var usRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
-
-                if (ourRelease != null)
-                {
-                    var ratingPrefix = string.Equals(preferredCountryCode, "us", StringComparison.OrdinalIgnoreCase) ? "" : preferredCountryCode + "-";
-                    var newRating = ratingPrefix + ourRelease.Certification;
-
-                    newRating = newRating.Replace("de-", "FSK-", StringComparison.OrdinalIgnoreCase);
-
-                    movie.OfficialRating = newRating;
-                }
-                else if (usRelease != null)
-                {
-                    movie.OfficialRating = usRelease.Certification;
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(movieData.Release_Date))
-            {
-                // These dates are always in this exact format
-                if (DateTime.TryParse(movieData.Release_Date, _usCulture, DateTimeStyles.None, out var r))
-                {
-                    movie.PremiereDate = r.ToUniversalTime();
-                    movie.ProductionYear = movie.PremiereDate.Value.Year;
-                }
-            }
-
-            // studios
-            if (movieData.Production_Companies != null)
-            {
-                movie.SetStudios(movieData.Production_Companies.Select(c => c.Name));
-            }
-
-            // genres
-            // Movies get this from imdb
-            var genres = movieData.Genres ?? new List<Tmdb.Models.General.Genre>();
-
-            foreach (var genre in genres.Select(g => g.Name))
-            {
-                movie.AddGenre(genre);
-            }
-
-            resultItem.ResetPeople();
-            var tmdbImageUrl = settings.images.GetImageUrl("original");
-
-            // Actors, Directors, Writers - all in People
-            // actors come from cast
-            if (movieData.Casts != null && movieData.Casts.Cast != null)
-            {
-                foreach (var actor in movieData.Casts.Cast.OrderBy(a => a.Order))
-                {
-                    var personInfo = new PersonInfo
-                    {
-                        Name = actor.Name.Trim(),
-                        Role = actor.Character,
-                        Type = PersonType.Actor,
-                        SortOrder = actor.Order
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(actor.Profile_Path))
-                    {
-                        personInfo.ImageUrl = tmdbImageUrl + actor.Profile_Path;
-                    }
-
-                    if (actor.Id > 0)
-                    {
-                        personInfo.SetProviderId(MetadataProvider.Tmdb, actor.Id.ToString(CultureInfo.InvariantCulture));
-                    }
-
-                    resultItem.AddPerson(personInfo);
-                }
-            }
-
-            // and the rest from crew
-            if (movieData.Casts?.Crew != null)
-            {
-                var keepTypes = new[]
-                {
-                    PersonType.Director,
-                    PersonType.Writer,
-                    PersonType.Producer
-                };
-
-                foreach (var person in movieData.Casts.Crew)
-                {
-                    // Normalize this
-                    var type = TmdbUtils.MapCrewToPersonType(person);
-
-                    if (!keepTypes.Contains(type, StringComparer.OrdinalIgnoreCase) &&
-                        !keepTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
-                    {
-                        continue;
-                    }
-
-                    var personInfo = new PersonInfo
-                    {
-                        Name = person.Name.Trim(),
-                        Role = person.Job,
-                        Type = type
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(person.Profile_Path))
-                    {
-                        personInfo.ImageUrl = tmdbImageUrl + person.Profile_Path;
-                    }
-
-                    if (person.Id > 0)
-                    {
-                        personInfo.SetProviderId(MetadataProvider.Tmdb, person.Id.ToString(CultureInfo.InvariantCulture));
-                    }
-
-                    resultItem.AddPerson(personInfo);
-                }
-            }
-
-            // if (movieData.keywords != null && movieData.keywords.keywords != null)
-            //{
-            //    movie.Keywords = movieData.keywords.keywords.Select(i => i.name).ToList();
-            //}
-
-            if (movieData.Trailers != null && movieData.Trailers.Youtube != null)
-            {
-                movie.RemoteTrailers = movieData.Trailers.Youtube.Select(i => new MediaUrl
-                {
-                    Url = string.Format(CultureInfo.InvariantCulture, "https://www.youtube.com/watch?v={0}", i.Source),
-                    Name = i.Name
-                }).ToArray();
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs
deleted file mode 100644
index 9db7e09974..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageProvider.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Movies;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
-{
-    public class TmdbImageProvider : IRemoteImageProvider, IHasOrder
-    {
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IFileSystem _fileSystem;
-
-        public TmdbImageProvider(IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory, IFileSystem fileSystem)
-        {
-            _jsonSerializer = jsonSerializer;
-            _httpClientFactory = httpClientFactory;
-            _fileSystem = fileSystem;
-        }
-
-        public string Name => ProviderName;
-
-        public static string ProviderName => TmdbUtils.ProviderName;
-
-        /// <inheritdoc />
-        public int Order => 0;
-
-        public bool Supports(BaseItem item)
-        {
-            return item is Movie || item is MusicVideo || item is Trailer;
-        }
-
-        public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
-        {
-            return new List<ImageType>
-            {
-                ImageType.Primary,
-                ImageType.Backdrop
-            };
-        }
-
-        public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
-        {
-            var list = new List<RemoteImageInfo>();
-
-            var language = item.GetPreferredMetadataLanguage();
-
-            var results = await FetchImages(item, null, _jsonSerializer, cancellationToken).ConfigureAwait(false);
-
-            if (results == null)
-            {
-                return list;
-            }
-
-            var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-            var supportedImages = GetSupportedImages(item).ToList();
-
-            if (supportedImages.Contains(ImageType.Primary))
-            {
-                list.AddRange(GetPosters(results).Select(i => new RemoteImageInfo
-                {
-                    Url = tmdbImageUrl + i.File_Path,
-                    CommunityRating = i.Vote_Average,
-                    VoteCount = i.Vote_Count,
-                    Width = i.Width,
-                    Height = i.Height,
-                    Language = TmdbMovieProvider.AdjustImageLanguage(i.Iso_639_1, language),
-                    ProviderName = Name,
-                    Type = ImageType.Primary,
-                    RatingType = RatingType.Score
-                }));
-            }
-
-            if (supportedImages.Contains(ImageType.Backdrop))
-            {
-                list.AddRange(GetBackdrops(results).Select(i => new RemoteImageInfo
-                {
-                    Url = tmdbImageUrl + i.File_Path,
-                    CommunityRating = i.Vote_Average,
-                    VoteCount = i.Vote_Count,
-                    Width = i.Width,
-                    Height = i.Height,
-                    ProviderName = Name,
-                    Type = ImageType.Backdrop,
-                    RatingType = RatingType.Score
-                }));
-            }
-
-            var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
-
-            return list.OrderByDescending(i =>
-            {
-                if (string.Equals(language, i.Language, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-
-                if (!isLanguageEn)
-                {
-                    if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 2;
-                    }
-                }
-
-                if (string.IsNullOrEmpty(i.Language))
-                {
-                    return isLanguageEn ? 3 : 2;
-                }
-
-                return 0;
-            })
-                .ThenByDescending(i => i.CommunityRating ?? 0)
-                .ThenByDescending(i => i.VoteCount ?? 0);
-        }
-
-        /// <summary>
-        /// Gets the posters.
-        /// </summary>
-        /// <param name="images">The images.</param>
-        /// <returns>IEnumerable{MovieDbProvider.Poster}.</returns>
-        private IEnumerable<Poster> GetPosters(Images images)
-        {
-            return images.Posters ?? new List<Poster>();
-        }
-
-        /// <summary>
-        /// Gets the backdrops.
-        /// </summary>
-        /// <param name="images">The images.</param>
-        /// <returns>IEnumerable{MovieDbProvider.Backdrop}.</returns>
-        private IEnumerable<Backdrop> GetBackdrops(Images images)
-        {
-            var eligibleBackdrops = images.Backdrops == null ? new List<Backdrop>() :
-                images.Backdrops;
-
-            return eligibleBackdrops.OrderByDescending(i => i.Vote_Average)
-                .ThenByDescending(i => i.Vote_Count);
-        }
-
-        /// <summary>
-        /// Fetches the images.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="language">The language.</param>
-        /// <param name="jsonSerializer">The json serializer.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{MovieImages}.</returns>
-        private async Task<Images> FetchImages(BaseItem item, string language, IJsonSerializer jsonSerializer, CancellationToken cancellationToken)
-        {
-            var tmdbId = item.GetProviderId(MetadataProvider.Tmdb);
-
-            if (string.IsNullOrWhiteSpace(tmdbId))
-            {
-                var imdbId = item.GetProviderId(MetadataProvider.Imdb);
-                if (!string.IsNullOrWhiteSpace(imdbId))
-                {
-                    var movieInfo = await TmdbMovieProvider.Current.FetchMainResult(imdbId, false, language, cancellationToken).ConfigureAwait(false);
-                    if (movieInfo != null)
-                    {
-                        tmdbId = movieInfo.Id.ToString(CultureInfo.InvariantCulture);
-                    }
-                }
-            }
-
-            if (string.IsNullOrWhiteSpace(tmdbId))
-            {
-                return null;
-            }
-
-            await TmdbMovieProvider.Current.EnsureMovieInfo(tmdbId, language, cancellationToken).ConfigureAwait(false);
-
-            var path = TmdbMovieProvider.Current.GetDataFilePath(tmdbId, language);
-
-            if (!string.IsNullOrEmpty(path))
-            {
-                var fileInfo = _fileSystem.GetFileInfo(path);
-
-                if (fileInfo.Exists)
-                {
-                    return jsonSerializer.DeserializeFromFile<MovieResult>(path).Images;
-                }
-            }
-
-            return null;
-        }
-
-        public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs
deleted file mode 100644
index 1ba8f9072a..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbImageSettings.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
-{
-    internal class TmdbImageSettings
-    {
-        public IReadOnlyList<string> backdrop_sizes { get; set; }
-
-        public string secure_base_url { get; set; }
-
-        public IReadOnlyList<string> poster_sizes { get; set; }
-
-        public IReadOnlyList<string> profile_sizes { get; set; }
-
-        public string GetImageUrl(string image)
-        {
-            return secure_base_url + image;
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieExternalId.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieExternalId.cs
index 9610e40585..f1a1b65d82 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieExternalId.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieExternalId.cs
@@ -1,4 +1,3 @@
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Providers;
@@ -33,7 +32,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 return true;
             }
 
-            return item is Movie || item is MusicVideo || item is Trailer;
+            return item is Movie;
         }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs
new file mode 100644
index 0000000000..dac9e961c6
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs
@@ -0,0 +1,128 @@
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Providers;
+using TMDbLib.Objects.Find;
+
+namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
+{
+    public class TmdbMovieImageProvider : IRemoteImageProvider, IHasOrder
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
+
+        public TmdbMovieImageProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
+        {
+            _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
+        }
+
+        public int Order => 0;
+
+        public string Name => TmdbUtils.ProviderName;
+
+        public bool Supports(BaseItem item)
+        {
+            return item is Movie || item is Trailer;
+        }
+
+        public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
+        {
+            return new List<ImageType>
+            {
+                ImageType.Primary,
+                ImageType.Backdrop
+            };
+        }
+
+        public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
+        {
+            var language = item.GetPreferredMetadataLanguage();
+
+            var movieTmdbId = Convert.ToInt32(item.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            if (movieTmdbId <= 0)
+            {
+                var movieImdbId = item.GetProviderId(MetadataProvider.Imdb);
+                if (string.IsNullOrEmpty(movieImdbId))
+                {
+                    return Enumerable.Empty<RemoteImageInfo>();
+                }
+
+                var movieResult = await _tmdbClientManager.FindByExternalIdAsync(movieImdbId, FindExternalSource.Imdb, language, cancellationToken).ConfigureAwait(false);
+                if (movieResult?.MovieResults != null && movieResult.MovieResults.Count > 0)
+                {
+                    movieTmdbId = movieResult.MovieResults[0].Id;
+                }
+            }
+
+            if (movieTmdbId <= 0)
+            {
+                return Enumerable.Empty<RemoteImageInfo>();
+            }
+
+            var movie = await _tmdbClientManager
+                .GetMovieAsync(movieTmdbId, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken)
+                .ConfigureAwait(false);
+
+            if (movie?.Images == null)
+            {
+                return Enumerable.Empty<RemoteImageInfo>();
+            }
+
+            var remoteImages = new List<RemoteImageInfo>();
+
+            for (var i = 0; i < movie.Images.Posters.Count; i++)
+            {
+                var poster = movie.Images.Posters[i];
+                remoteImages.Add(new RemoteImageInfo
+                {
+                    Url = _tmdbClientManager.GetPosterUrl(poster.FilePath),
+                    CommunityRating = poster.VoteAverage,
+                    VoteCount = poster.VoteCount,
+                    Width = poster.Width,
+                    Height = poster.Height,
+                    Language = TmdbUtils.AdjustImageLanguage(poster.Iso_639_1, language),
+                    ProviderName = Name,
+                    Type = ImageType.Primary,
+                    RatingType = RatingType.Score
+                });
+            }
+
+            for (var i = 0; i < movie.Images.Backdrops.Count; i++)
+            {
+                var backdrop = movie.Images.Backdrops[i];
+                remoteImages.Add(new RemoteImageInfo
+                {
+                    Url = _tmdbClientManager.GetPosterUrl(backdrop.FilePath),
+                    CommunityRating = backdrop.VoteAverage,
+                    VoteCount = backdrop.VoteCount,
+                    Width = backdrop.Width,
+                    Height = backdrop.Height,
+                    ProviderName = Name,
+                    Type = ImageType.Backdrop,
+                    RatingType = RatingType.Score
+                });
+            }
+
+            return remoteImages.OrderByLanguageDescending(language);
+        }
+
+        public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
+        {
+            return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index 31cfd86494..4dd29e773a 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -3,25 +3,19 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common;
-using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Movies;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
@@ -31,365 +25,271 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
     /// </summary>
     public class TmdbMovieProvider : IRemoteMetadataProvider<Movie, MovieInfo>, IHasOrder
     {
-        private const string TmdbConfigUrl = TmdbUtils.BaseTmdbApiUrl + "3/configuration?api_key={0}";
-        private const string GetMovieInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/movie/{0}?api_key={1}&append_to_response=casts,releases,images,keywords,trailers";
-
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
-        private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IFileSystem _fileSystem;
-        private readonly IServerConfigurationManager _configurationManager;
         private readonly ILogger<TmdbMovieProvider> _logger;
         private readonly ILibraryManager _libraryManager;
-        private readonly IApplicationHost _appHost;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        /// <summary>
-        /// The _TMDB settings task.
-        /// </summary>
-        private TmdbSettingsResult _tmdbSettings;
-
-        public TmdbMovieProvider(
-            IJsonSerializer jsonSerializer,
-            IHttpClientFactory httpClientFactory,
-            IFileSystem fileSystem,
-            IServerConfigurationManager configurationManager,
-            ILogger<TmdbMovieProvider> logger,
-            ILibraryManager libraryManager,
-            IApplicationHost appHost)
-        {
-            _jsonSerializer = jsonSerializer;
-            _httpClientFactory = httpClientFactory;
-            _fileSystem = fileSystem;
-            _configurationManager = configurationManager;
-            _logger = logger;
-            _libraryManager = libraryManager;
-            _appHost = appHost;
-            Current = this;
-        }
-
-        internal static TmdbMovieProvider Current { get; private set; }
-
-        /// <inheritdoc />
         public string Name => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public int Order => 1;
 
-        public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
+        internal static TmdbMovieProvider Current { get; private set; }
+
+        public TmdbMovieProvider(
+            ILogger<TmdbMovieProvider> logger,
+            ILibraryManager libraryManager,
+            TmdbClientManager tmdbClientManager,
+            IHttpClientFactory httpClientFactory)
         {
-            return GetMovieSearchResults(searchInfo, cancellationToken);
+            _logger = logger;
+            _libraryManager = libraryManager;
+            _tmdbClientManager = tmdbClientManager;
+            _httpClientFactory = httpClientFactory;
+            Current = this;
         }
 
-        public async Task<IEnumerable<RemoteSearchResult>> GetMovieSearchResults(ItemLookupInfo searchInfo, CancellationToken cancellationToken)
+        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
         {
-            var tmdbId = searchInfo.GetProviderId(MetadataProvider.Tmdb);
+            var tmdbId = Convert.ToInt32(searchInfo.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            if (!string.IsNullOrEmpty(tmdbId))
+            if (tmdbId == 0)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                await EnsureMovieInfo(tmdbId, searchInfo.MetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-                var dataFilePath = GetDataFilePath(tmdbId, searchInfo.MetadataLanguage);
-
-                var obj = _jsonSerializer.DeserializeFromFile<MovieResult>(dataFilePath);
-
-                var tmdbSettings = await GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-                var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-                var remoteResult = new RemoteSearchResult
+                var movieResults = await _tmdbClientManager
+                    .SearchMovieAsync(searchInfo.Name, searchInfo.MetadataLanguage, cancellationToken)
+                    .ConfigureAwait(false);
+                var remoteSearchResults = new List<RemoteSearchResult>();
+                for (var i = 0; i < movieResults.Count; i++)
                 {
-                    Name = obj.GetTitle(),
-                    SearchProviderName = Name,
-                    ImageUrl = string.IsNullOrWhiteSpace(obj.Poster_Path) ? null : tmdbImageUrl + obj.Poster_Path
+                    var movieResult = movieResults[i];
+                    var remoteSearchResult = new RemoteSearchResult
+                    {
+                        Name = movieResult.Title ?? movieResult.OriginalTitle,
+                        ImageUrl = _tmdbClientManager.GetPosterUrl(movieResult.PosterPath),
+                        Overview = movieResult.Overview,
+                        SearchProviderName = Name
+                    };
+
+                    var releaseDate = movieResult.ReleaseDate?.ToUniversalTime();
+                    remoteSearchResult.PremiereDate = releaseDate;
+                    remoteSearchResult.ProductionYear = releaseDate?.Year;
+
+                    remoteSearchResult.SetProviderId(MetadataProvider.Tmdb, movieResult.Id.ToString(CultureInfo.InvariantCulture));
+                    remoteSearchResults.Add(remoteSearchResult);
+                }
+
+                return remoteSearchResults;
+            }
+
+            var movie = await _tmdbClientManager
+                .GetMovieAsync(tmdbId, searchInfo.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage), cancellationToken)
+                .ConfigureAwait(false);
+
+            var remoteResult = new RemoteSearchResult
+            {
+                Name = movie.Title ?? movie.OriginalTitle,
+                SearchProviderName = Name,
+                ImageUrl = _tmdbClientManager.GetPosterUrl(movie.PosterPath),
+                Overview = movie.Overview
+            };
+
+            if (movie.ReleaseDate != null)
+            {
+                var releaseDate = movie.ReleaseDate.Value.ToUniversalTime();
+                remoteResult.PremiereDate = releaseDate;
+                remoteResult.ProductionYear = releaseDate.Year;
+            }
+
+            remoteResult.SetProviderId(MetadataProvider.Tmdb, movie.Id.ToString(CultureInfo.InvariantCulture));
+
+            if (!string.IsNullOrWhiteSpace(movie.ImdbId))
+            {
+                remoteResult.SetProviderId(MetadataProvider.Imdb, movie.ImdbId);
+            }
+
+            return new[] { remoteResult };
+        }
+
+        public async Task<MetadataResult<Movie>> GetMetadata(MovieInfo info, CancellationToken cancellationToken)
+        {
+            var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
+            var imdbId = info.GetProviderId(MetadataProvider.Imdb);
+
+            if (string.IsNullOrEmpty(tmdbId) && string.IsNullOrEmpty(imdbId))
+            {
+                // ParseName is required here.
+                // Caller provides the filename with extension stripped and NOT the parsed filename
+                var parsedName = _libraryManager.ParseName(info.Name);
+                var searchResults = await _tmdbClientManager.SearchMovieAsync(parsedName.Name, parsedName.Year ?? 0, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+
+                if (searchResults.Count > 0)
+                {
+                    tmdbId = searchResults[0].Id.ToString(CultureInfo.InvariantCulture);
+                }
+            }
+
+            if (string.IsNullOrEmpty(tmdbId))
+            {
+                return new MetadataResult<Movie>();
+            }
+
+            var movieResult = await _tmdbClientManager
+                .GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                .ConfigureAwait(false);
+
+            var movie = new Movie
+            {
+                Name = movieResult.Title ?? movieResult.OriginalTitle,
+                Overview = movieResult.Overview?.Replace("\n\n", "\n", StringComparison.InvariantCulture),
+                Tagline = movieResult.Tagline,
+                ProductionLocations = movieResult.ProductionCountries.Select(pc => pc.Name).ToArray()
+            };
+            var metadataResult = new MetadataResult<Movie>
+            {
+                HasMetadata = true,
+                ResultLanguage = info.MetadataLanguage,
+                Item = movie
+            };
+
+            movie.SetProviderId(MetadataProvider.Tmdb, tmdbId);
+            movie.SetProviderId(MetadataProvider.Imdb, movieResult.ImdbId);
+            if (movieResult.BelongsToCollection != null)
+            {
+                movie.SetProviderId(MetadataProvider.TmdbCollection, movieResult.BelongsToCollection.Id.ToString(CultureInfo.InvariantCulture));
+                movie.CollectionName = movieResult.BelongsToCollection.Name;
+            }
+
+            movie.CommunityRating = Convert.ToSingle(movieResult.VoteAverage);
+
+            if (movieResult.Releases?.Countries != null)
+            {
+                var releases = movieResult.Releases.Countries.Where(i => !string.IsNullOrWhiteSpace(i.Certification)).ToList();
+
+                var ourRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, info.MetadataCountryCode, StringComparison.OrdinalIgnoreCase));
+                var usRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
+
+                if (ourRelease != null)
+                {
+                    var ratingPrefix = string.Equals(info.MetadataCountryCode, "us", StringComparison.OrdinalIgnoreCase) ? string.Empty : info.MetadataCountryCode + "-";
+                    var newRating = ratingPrefix + ourRelease.Certification;
+
+                    newRating = newRating.Replace("de-", "FSK-", StringComparison.OrdinalIgnoreCase);
+
+                    movie.OfficialRating = newRating;
+                }
+                else if (usRelease != null)
+                {
+                    movie.OfficialRating = usRelease.Certification;
+                }
+            }
+
+            movie.PremiereDate = movieResult.ReleaseDate;
+            movie.ProductionYear = movieResult.ReleaseDate?.Year;
+
+            if (movieResult.ProductionCompanies != null)
+            {
+                movie.SetStudios(movieResult.ProductionCompanies.Select(c => c.Name));
+            }
+
+            var genres = movieResult.Genres;
+
+            foreach (var genre in genres.Select(g => g.Name))
+            {
+                movie.AddGenre(genre);
+            }
+
+            if (movieResult.Credits?.Cast != null)
+            {
+                // TODO configurable
+                foreach (var actor in movieResult.Credits.Cast.OrderBy(a => a.Order).Take(TmdbUtils.MaxCastMembers))
+                {
+                    var personInfo = new PersonInfo
+                    {
+                        Name = actor.Name.Trim(),
+                        Role = actor.Character,
+                        Type = PersonType.Actor,
+                        SortOrder = actor.Order
+                    };
+
+                    if (!string.IsNullOrWhiteSpace(actor.ProfilePath))
+                    {
+                        personInfo.ImageUrl = _tmdbClientManager.GetProfileUrl(actor.ProfilePath);
+                    }
+
+                    if (actor.Id > 0)
+                    {
+                        personInfo.SetProviderId(MetadataProvider.Tmdb, actor.Id.ToString(CultureInfo.InvariantCulture));
+                    }
+
+                    metadataResult.AddPerson(personInfo);
+                }
+            }
+
+            if (movieResult.Credits?.Crew != null)
+            {
+                var keepTypes = new[]
+                {
+                    PersonType.Director,
+                    PersonType.Writer,
+                    PersonType.Producer
                 };
 
-                if (!string.IsNullOrWhiteSpace(obj.Release_Date))
+                foreach (var person in movieResult.Credits.Crew)
                 {
-                    // These dates are always in this exact format
-                    if (DateTime.TryParse(obj.Release_Date, _usCulture, DateTimeStyles.None, out var r))
+                    // Normalize this
+                    var type = TmdbUtils.MapCrewToPersonType(person);
+
+                    if (!keepTypes.Contains(type, StringComparer.OrdinalIgnoreCase) &&
+                        !keepTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                     {
-                        remoteResult.PremiereDate = r.ToUniversalTime();
-                        remoteResult.ProductionYear = remoteResult.PremiereDate.Value.Year;
+                        continue;
                     }
+
+                    var personInfo = new PersonInfo
+                    {
+                        Name = person.Name.Trim(),
+                        Role = person.Job,
+                        Type = type
+                    };
+
+                    if (!string.IsNullOrWhiteSpace(person.ProfilePath))
+                    {
+                        personInfo.ImageUrl = _tmdbClientManager.GetPosterUrl(person.ProfilePath);
+                    }
+
+                    if (person.Id > 0)
+                    {
+                        personInfo.SetProviderId(MetadataProvider.Tmdb, person.Id.ToString(CultureInfo.InvariantCulture));
+                    }
+
+                    metadataResult.AddPerson(personInfo);
                 }
+            }
 
-                remoteResult.SetProviderId(MetadataProvider.Tmdb, obj.Id.ToString(_usCulture));
 
-                if (!string.IsNullOrWhiteSpace(obj.Imdb_Id))
+            if (movieResult.Videos?.Results != null)
+            {
+                var trailers = new List<MediaUrl>();
+                for (var i = 0; i < movieResult.Videos.Results.Count; i++)
                 {
-                    remoteResult.SetProviderId(MetadataProvider.Imdb, obj.Imdb_Id);
+                    var video = movieResult.Videos.Results[0];
+                    if (!TmdbUtils.IsTrailerType(video))
+                    {
+                        continue;
+                    }
+
+                    trailers.Add(new MediaUrl
+                    {
+                        Url = string.Format(CultureInfo.InvariantCulture, "https://www.youtube.com/watch?v={0}", video.Key),
+                        Name = video.Name
+                    });
                 }
 
-                return new[] { remoteResult };
+                movie.RemoteTrailers = trailers;
             }
 
-            return await new TmdbSearch(_logger, _jsonSerializer, _libraryManager).GetMovieSearchResults(searchInfo, cancellationToken).ConfigureAwait(false);
-        }
-
-        public Task<MetadataResult<Movie>> GetMetadata(MovieInfo info, CancellationToken cancellationToken)
-        {
-            return GetItemMetadata<Movie>(info, cancellationToken);
-        }
-
-        public Task<MetadataResult<T>> GetItemMetadata<T>(ItemLookupInfo id, CancellationToken cancellationToken)
-            where T : BaseItem, new()
-        {
-            var movieDb = new GenericTmdbMovieInfo<T>(_logger, _jsonSerializer, _libraryManager, _fileSystem);
-
-            return movieDb.GetMetadata(id, cancellationToken);
-        }
-
-        /// <summary>
-        /// Gets the TMDB settings.
-        /// </summary>
-        /// <returns>Task{TmdbSettingsResult}.</returns>
-        internal async Task<TmdbSettingsResult> GetTmdbSettings(CancellationToken cancellationToken)
-        {
-            if (_tmdbSettings != null)
-            {
-                return _tmdbSettings;
-            }
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, string.Format(CultureInfo.InvariantCulture, TmdbConfigUrl, TmdbUtils.ApiKey));
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            _tmdbSettings = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSettingsResult>(stream).ConfigureAwait(false);
-            return _tmdbSettings;
-        }
-
-        /// <summary>
-        /// Gets the movie data path.
-        /// </summary>
-        /// <param name="appPaths">The app paths.</param>
-        /// <param name="tmdbId">The TMDB id.</param>
-        /// <returns>System.String.</returns>
-        internal static string GetMovieDataPath(IApplicationPaths appPaths, string tmdbId)
-        {
-            var dataPath = GetMoviesDataPath(appPaths);
-
-            return Path.Combine(dataPath, tmdbId);
-        }
-
-        internal static string GetMoviesDataPath(IApplicationPaths appPaths)
-        {
-            var dataPath = Path.Combine(appPaths.CachePath, "tmdb-movies2");
-
-            return dataPath;
-        }
-
-        /// <summary>
-        /// Downloads the movie info.
-        /// </summary>
-        /// <param name="id">The id.</param>
-        /// <param name="preferredMetadataLanguage">The preferred metadata language.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        internal async Task DownloadMovieInfo(string id, string preferredMetadataLanguage, CancellationToken cancellationToken)
-        {
-            var mainResult = await FetchMainResult(id, true, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-            if (mainResult == null)
-            {
-                return;
-            }
-
-            var dataFilePath = GetDataFilePath(id, preferredMetadataLanguage);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-
-            _jsonSerializer.SerializeToFile(mainResult, dataFilePath);
-        }
-
-        internal Task EnsureMovieInfo(string tmdbId, string language, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            var path = GetDataFilePath(tmdbId, language);
-
-            var fileInfo = _fileSystem.GetFileSystemInfo(path);
-
-            if (fileInfo.Exists)
-            {
-                // If it's recent or automatic updates are enabled, don't re-download
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
-                {
-                    return Task.CompletedTask;
-                }
-            }
-
-            return DownloadMovieInfo(tmdbId, language, cancellationToken);
-        }
-
-        internal string GetDataFilePath(string tmdbId, string preferredLanguage)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            var path = GetMovieDataPath(_configurationManager.ApplicationPaths, tmdbId);
-
-            if (string.IsNullOrWhiteSpace(preferredLanguage))
-            {
-                preferredLanguage = "alllang";
-            }
-
-            var filename = string.Format(CultureInfo.InvariantCulture, "all-{0}.json", preferredLanguage);
-
-            return Path.Combine(path, filename);
-        }
-
-        public static string GetImageLanguagesParam(string preferredLanguage)
-        {
-            var languages = new List<string>();
-
-            if (!string.IsNullOrEmpty(preferredLanguage))
-            {
-                preferredLanguage = NormalizeLanguage(preferredLanguage);
-
-                languages.Add(preferredLanguage);
-
-                if (preferredLanguage.Length == 5) // like en-US
-                {
-                    // Currenty, TMDB supports 2-letter language codes only
-                    // They are planning to change this in the future, thus we're
-                    // supplying both codes if we're having a 5-letter code.
-                    languages.Add(preferredLanguage.Substring(0, 2));
-                }
-            }
-
-            languages.Add("null");
-
-            if (!string.Equals(preferredLanguage, "en", StringComparison.OrdinalIgnoreCase))
-            {
-                languages.Add("en");
-            }
-
-            return string.Join(',', languages);
-        }
-
-        public static string NormalizeLanguage(string language)
-        {
-            if (!string.IsNullOrEmpty(language))
-            {
-                // They require this to be uppercase
-                // Everything after the hyphen must be written in uppercase due to a way TMDB wrote their api.
-                // See here: https://www.themoviedb.org/talk/5119221d760ee36c642af4ad?page=3#56e372a0c3a3685a9e0019ab
-                var parts = language.Split('-');
-
-                if (parts.Length == 2)
-                {
-                    language = parts[0] + "-" + parts[1].ToUpperInvariant();
-                }
-            }
-
-            return language;
-        }
-
-        public static string AdjustImageLanguage(string imageLanguage, string requestLanguage)
-        {
-            if (!string.IsNullOrEmpty(imageLanguage)
-                && !string.IsNullOrEmpty(requestLanguage)
-                && requestLanguage.Length > 2
-                && imageLanguage.Length == 2
-                && requestLanguage.StartsWith(imageLanguage, StringComparison.OrdinalIgnoreCase))
-            {
-                return requestLanguage;
-            }
-
-            return imageLanguage;
-        }
-
-        /// <summary>
-        /// Fetches the main result.
-        /// </summary>
-        /// <param name="id">The id.</param>
-        /// <param name="isTmdbId">if set to <c>true</c> [is TMDB identifier].</param>
-        /// <param name="language">The language.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{CompleteMovieData}.</returns>
-        internal async Task<MovieResult> FetchMainResult(string id, bool isTmdbId, string language, CancellationToken cancellationToken)
-        {
-            var url = string.Format(CultureInfo.InvariantCulture, GetMovieInfo3, id, TmdbUtils.ApiKey);
-
-            if (!string.IsNullOrEmpty(language))
-            {
-                url += string.Format(CultureInfo.InvariantCulture, "&language={0}", NormalizeLanguage(language));
-
-                // Get images in english and with no language
-                url += "&include_image_language=" + GetImageLanguagesParam(language);
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var mainResponse = await GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            if (mainResponse.StatusCode == HttpStatusCode.NotFound)
-            {
-                return null;
-            }
-
-            await using var stream = await mainResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            var mainResult = await _jsonSerializer.DeserializeFromStreamAsync<MovieResult>(stream).ConfigureAwait(false);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            // If the language preference isn't english, then have the overview fallback to english if it's blank
-            if (mainResult != null &&
-                string.IsNullOrEmpty(mainResult.Overview) &&
-                !string.IsNullOrEmpty(language) &&
-                !string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
-            {
-                _logger.LogInformation("MovieDbProvider couldn't find meta for language " + language + ". Trying English...");
-
-                url = string.Format(CultureInfo.InvariantCulture, GetMovieInfo3, id, TmdbUtils.ApiKey) + "&language=en";
-
-                if (!string.IsNullOrEmpty(language))
-                {
-                    // Get images in english and with no language
-                    url += "&include_image_language=" + GetImageLanguagesParam(language);
-                }
-
-                using var langRequestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-                foreach (var header in TmdbUtils.AcceptHeaders)
-                {
-                    langRequestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-                }
-
-                using var langResponse = await GetMovieDbResponse(langRequestMessage, cancellationToken).ConfigureAwait(false);
-
-                await using var langStream = await langResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-                var langResult = await _jsonSerializer.DeserializeFromStreamAsync<MovieResult>(stream).ConfigureAwait(false);
-                mainResult.Overview = langResult.Overview;
-            }
-
-            return mainResult;
-        }
-
-        /// <summary>
-        /// Gets the movie db response.
-        /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        internal Task<HttpResponseMessage> GetMovieDbResponse(HttpRequestMessage message, CancellationToken cancellationToken = default)
-        {
-            message.Headers.UserAgent.ParseAdd(_appHost.ApplicationUserAgent);
-            return _httpClientFactory.CreateClient(NamedClient.Default).SendAsync(message, cancellationToken);
+            return metadataResult;
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs
deleted file mode 100644
index 36a4eef8a3..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Search;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
-{
-    public class TmdbSearch
-    {
-        private const string SearchUrl = TmdbUtils.BaseTmdbApiUrl + @"3/search/{3}?api_key={1}&query={0}&language={2}";
-        private const string SearchUrlTvWithYear = TmdbUtils.BaseTmdbApiUrl + @"3/search/tv?api_key={1}&query={0}&language={2}&first_air_date_year={3}";
-        private const string SearchUrlMovieWithYear = TmdbUtils.BaseTmdbApiUrl + @"3/search/movie?api_key={1}&query={0}&language={2}&primary_release_year={3}";
-
-        private static readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
-        private static readonly Regex _cleanEnclosed = new Regex(@"\p{Ps}.*\p{Pe}", RegexOptions.Compiled);
-        private static readonly Regex _cleanNonWord = new Regex(@"[\W_]+", RegexOptions.Compiled);
-        private static readonly Regex _cleanStopWords = new Regex(
-            @"\b( # Start at word boundary
-            19[0-9]{2}|20[0-9]{2}| # 1900-2099
-            S[0-9]{2}| # Season
-            E[0-9]{2}| # Episode
-            (2160|1080|720|576|480)[ip]?| # Resolution
-            [xh]?264| # Encoding
-            (web|dvd|bd|hdtv|hd)rip| # *Rip
-            web|hdtv|mp4|bluray|ktr|dl|single|imageset|internal|doku|dubbed|retail|xxx|flac
-            ).* # Match rest of string",
-            RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace | RegexOptions.IgnoreCase);
-
-        private readonly ILogger _logger;
-        private readonly IJsonSerializer _json;
-        private readonly ILibraryManager _libraryManager;
-
-        public TmdbSearch(ILogger logger, IJsonSerializer json, ILibraryManager libraryManager)
-        {
-            _logger = logger;
-            _json = json;
-            _libraryManager = libraryManager;
-        }
-
-        public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo idInfo, CancellationToken cancellationToken)
-        {
-            return GetSearchResults(idInfo, "tv", cancellationToken);
-        }
-
-        public Task<IEnumerable<RemoteSearchResult>> GetMovieSearchResults(ItemLookupInfo idInfo, CancellationToken cancellationToken)
-        {
-            return GetSearchResults(idInfo, "movie", cancellationToken);
-        }
-
-        public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(BoxSetInfo idInfo, CancellationToken cancellationToken)
-        {
-            return GetSearchResults(idInfo, "collection", cancellationToken);
-        }
-
-        private async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(ItemLookupInfo idInfo, string searchType, CancellationToken cancellationToken)
-        {
-            var name = idInfo.Name;
-            var year = idInfo.Year;
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return new List<RemoteSearchResult>();
-            }
-
-            var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-            // ParseName is required here.
-            // Caller provides the filename with extension stripped and NOT the parsed filename
-            var parsedName = _libraryManager.ParseName(name);
-            var yearInName = parsedName.Year;
-            name = parsedName.Name;
-            year ??= yearInName;
-
-            var language = idInfo.MetadataLanguage.ToLowerInvariant();
-
-            // Replace sequences of non-word characters with space
-            // TMDB expects a space separated list of words make sure that is the case
-            name = _cleanNonWord.Replace(name, " ").Trim();
-
-            _logger.LogInformation("TmdbSearch: Finding id for item: {0} ({1})", name, year);
-            var results = await GetSearchResults(name, searchType, year, language, tmdbImageUrl, cancellationToken).ConfigureAwait(false);
-
-            if (results.Count == 0)
-            {
-                // try in english if wasn't before
-                if (!string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
-                {
-                    results = await GetSearchResults(name, searchType, year, "en", tmdbImageUrl, cancellationToken).ConfigureAwait(false);
-                }
-            }
-
-            // TODO: retrying alternatives should be done outside the search
-            // provider so that the retry logic can be common for all search
-            // providers
-            if (results.Count == 0)
-            {
-                var name2 = parsedName.Name;
-
-                // Remove things enclosed in []{}() etc
-                name2 = _cleanEnclosed.Replace(name2, string.Empty);
-
-                // Replace sequences of non-word characters with space
-                name2 = _cleanNonWord.Replace(name2, " ");
-
-                // Clean based on common stop words / tokens
-                name2 = _cleanStopWords.Replace(name2, string.Empty);
-
-                // Trim whitespace
-                name2 = name2.Trim();
-
-                // Search again if the new name is different
-                if (!string.Equals(name2, name, StringComparison.Ordinal) && !string.IsNullOrWhiteSpace(name2))
-                {
-                    _logger.LogInformation("TmdbSearch: Finding id for item: {0} ({1})", name2, year);
-                    results = await GetSearchResults(name2, searchType, year, language, tmdbImageUrl, cancellationToken).ConfigureAwait(false);
-
-                    if (results.Count == 0 && !string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
-                    {
-                        // one more time, in english
-                        results = await GetSearchResults(name2, searchType, year, "en", tmdbImageUrl, cancellationToken).ConfigureAwait(false);
-                    }
-                }
-            }
-
-            return results.Where(i =>
-            {
-                if (year.HasValue && i.ProductionYear.HasValue)
-                {
-                    // Allow one year tolerance
-                    return Math.Abs(year.Value - i.ProductionYear.Value) <= 1;
-                }
-
-                return true;
-            });
-        }
-
-        private Task<List<RemoteSearchResult>> GetSearchResults(string name, string type, int? year, string language, string baseImageUrl, CancellationToken cancellationToken)
-        {
-            switch (type)
-            {
-                case "tv":
-                    return GetSearchResultsTv(name, year, language, baseImageUrl, cancellationToken);
-                default:
-                    return GetSearchResultsGeneric(name, type, year, language, baseImageUrl, cancellationToken);
-            }
-        }
-
-        private async Task<List<RemoteSearchResult>> GetSearchResultsGeneric(string name, string type, int? year, string language, string baseImageUrl, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw new ArgumentException("String can't be null or empty.", nameof(name));
-            }
-
-            string url3;
-            if (year != null && string.Equals(type, "movie", StringComparison.OrdinalIgnoreCase))
-            {
-                url3 = string.Format(
-                    CultureInfo.InvariantCulture,
-                    SearchUrlMovieWithYear,
-                    WebUtility.UrlEncode(name),
-                    TmdbUtils.ApiKey,
-                    language,
-                    year);
-            }
-            else
-            {
-                url3 = string.Format(
-                    CultureInfo.InvariantCulture,
-                    SearchUrl,
-                    WebUtility.UrlEncode(name),
-                    TmdbUtils.ApiKey,
-                    language,
-                    type);
-            }
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url3);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            var searchResults = await _json.DeserializeFromStreamAsync<TmdbSearchResult<MovieResult>>(stream).ConfigureAwait(false);
-
-            var results = searchResults.Results ?? new List<MovieResult>();
-
-            return results
-                .Select(i =>
-                {
-                    var remoteResult = new RemoteSearchResult
-                    {
-                        SearchProviderName = TmdbMovieProvider.Current.Name,
-                        Name = i.Title ?? i.Name ?? i.Original_Title,
-                        ImageUrl = string.IsNullOrWhiteSpace(i.Poster_Path) ? null : baseImageUrl + i.Poster_Path
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(i.Release_Date))
-                    {
-                        // These dates are always in this exact format
-                        if (DateTime.TryParseExact(i.Release_Date, "yyyy-MM-dd", _usCulture, DateTimeStyles.None, out var r))
-                        {
-                            remoteResult.PremiereDate = r.ToUniversalTime();
-                            remoteResult.ProductionYear = remoteResult.PremiereDate.Value.Year;
-                        }
-                    }
-
-                    remoteResult.SetProviderId(MetadataProvider.Tmdb, i.Id.ToString(_usCulture));
-
-                    return remoteResult;
-                })
-                .ToList();
-        }
-
-        private async Task<List<RemoteSearchResult>> GetSearchResultsTv(string name, int? year, string language, string baseImageUrl, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw new ArgumentException("String can't be null or empty.", nameof(name));
-            }
-
-            string url3;
-            if (year == null)
-            {
-                url3 = string.Format(
-                CultureInfo.InvariantCulture,
-                SearchUrl,
-                WebUtility.UrlEncode(name),
-                TmdbUtils.ApiKey,
-                language,
-                "tv");
-            }
-            else
-            {
-                url3 = string.Format(
-                    CultureInfo.InvariantCulture,
-                    SearchUrlTvWithYear,
-                    WebUtility.UrlEncode(name),
-                    TmdbUtils.ApiKey,
-                    language,
-                    year);
-            }
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url3);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            var searchResults = await _json.DeserializeFromStreamAsync<TmdbSearchResult<TvResult>>(stream).ConfigureAwait(false);
-
-            var results = searchResults.Results ?? new List<TvResult>();
-
-            return results
-                .Select(i =>
-                {
-                    var remoteResult = new RemoteSearchResult
-                    {
-                        SearchProviderName = TmdbMovieProvider.Current.Name,
-                        Name = i.Name ?? i.Original_Name,
-                        ImageUrl = string.IsNullOrWhiteSpace(i.Poster_Path) ? null : baseImageUrl + i.Poster_Path
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(i.First_Air_Date))
-                    {
-                        // These dates are always in this exact format
-                        if (DateTime.TryParseExact(i.First_Air_Date, "yyyy-MM-dd", _usCulture, DateTimeStyles.None, out var r))
-                        {
-                            remoteResult.PremiereDate = r.ToUniversalTime();
-                            remoteResult.ProductionYear = remoteResult.PremiereDate.Value.Year;
-                        }
-                    }
-
-                    remoteResult.SetProviderId(MetadataProvider.Tmdb, i.Id.ToString(_usCulture));
-
-                    return remoteResult;
-                })
-                .ToList();
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs
deleted file mode 100644
index b88ecce87f..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Music/TmdbMusicVideoProvider.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Providers;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Music
-{
-    public class TmdbMusicVideoProvider : IRemoteMetadataProvider<MusicVideo, MusicVideoInfo>
-    {
-        public string Name => TmdbMovieProvider.Current.Name;
-
-        public Task<MetadataResult<MusicVideo>> GetMetadata(MusicVideoInfo info, CancellationToken cancellationToken)
-        {
-            return TmdbMovieProvider.Current.GetItemMetadata<MusicVideo>(info, cancellationToken);
-        }
-
-        public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MusicVideoInfo searchInfo, CancellationToken cancellationToken)
-        {
-            return Task.FromResult((IEnumerable<RemoteSearchResult>)new List<RemoteSearchResult>());
-        }
-
-        public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
index f2d2c8120e..99e4176984 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -11,31 +12,25 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.People;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.People
 {
     public class TmdbPersonImageProvider : IRemoteImageProvider, IHasOrder
     {
-        private readonly IServerConfigurationManager _config;
-        private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public TmdbPersonImageProvider(IServerConfigurationManager config, IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory)
+        public TmdbPersonImageProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
-            _config = config;
-            _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
         }
 
-        public static string ProviderName => TmdbUtils.ProviderName;
-
         /// <inheritdoc />
-        public string Name => ProviderName;
+        public string Name => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public int Order => 0;
@@ -56,80 +51,39 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
             var person = (Person)item;
-            var id = person.GetProviderId(MetadataProvider.Tmdb);
+            var personTmdbId = Convert.ToInt32(person.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            if (!string.IsNullOrEmpty(id))
+            if (personTmdbId > 0)
             {
-                await TmdbPersonProvider.Current.EnsurePersonInfo(id, cancellationToken).ConfigureAwait(false);
+                var personResult = await _tmdbClientManager.GetPersonAsync(personTmdbId, cancellationToken).ConfigureAwait(false);
+                if (personResult?.Images?.Profiles == null)
+                {
+                    return Enumerable.Empty<RemoteImageInfo>();
+                }
 
-                var dataFilePath = TmdbPersonProvider.GetPersonDataFilePath(_config.ApplicationPaths, id);
+                var remoteImages = new List<RemoteImageInfo>();
+                var language = item.GetPreferredMetadataLanguage();
 
-                var result = _jsonSerializer.DeserializeFromFile<PersonResult>(dataFilePath);
+                for (var i = 0; i < personResult.Images.Profiles.Count; i++)
+                {
+                    var image = personResult.Images.Profiles[i];
+                    remoteImages.Add(new RemoteImageInfo
+                    {
+                        ProviderName = Name,
+                        Type = ImageType.Primary,
+                        Width = image.Width,
+                        Height = image.Height,
+                        Language = TmdbUtils.AdjustImageLanguage(image.Iso_639_1, language),
+                        Url = _tmdbClientManager.GetProfileUrl(image.FilePath)
+                    });
+                }
 
-                var images = result.Images ?? new PersonImages();
-
-                var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-                var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-                return GetImages(images, item.GetPreferredMetadataLanguage(), tmdbImageUrl);
+                return remoteImages.OrderByLanguageDescending(language);
             }
 
             return new List<RemoteImageInfo>();
         }
 
-        private IEnumerable<RemoteImageInfo> GetImages(PersonImages images, string preferredLanguage, string baseImageUrl)
-        {
-            var list = new List<RemoteImageInfo>();
-
-            if (images.Profiles != null)
-            {
-                list.AddRange(images.Profiles.Select(i => new RemoteImageInfo
-                {
-                    ProviderName = Name,
-                    Type = ImageType.Primary,
-                    Width = i.Width,
-                    Height = i.Height,
-                    Language = GetLanguage(i),
-                    Url = baseImageUrl + i.File_Path
-                }));
-            }
-
-            var language = preferredLanguage;
-
-            var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
-
-            return list.OrderByDescending(i =>
-            {
-                if (string.Equals(language, i.Language, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-
-                if (!isLanguageEn)
-                {
-                    if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 2;
-                    }
-                }
-
-                if (string.IsNullOrEmpty(i.Language))
-                {
-                    return isLanguageEn ? 3 : 2;
-                }
-
-                return 0;
-            })
-                .ThenByDescending(i => i.CommunityRating ?? 0)
-                .ThenByDescending(i => i.VoteCount ?? 0);
-        }
-
-        private string GetLanguage(Profile profile)
-        {
-            return profile.Iso_639_1?.ToString();
-        }
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
index 777ebce492..8c5e8590f0 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
@@ -3,198 +3,133 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.People;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Search;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.People
 {
     public class TmdbPersonProvider : IRemoteMetadataProvider<Person, PersonLookupInfo>
     {
-        private const string DataFileName = "info.json";
-
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IFileSystem _fileSystem;
-        private readonly IServerConfigurationManager _configurationManager;
         private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public TmdbPersonProvider(
-            IFileSystem fileSystem,
-            IServerConfigurationManager configurationManager,
-            IJsonSerializer jsonSerializer,
-            IHttpClientFactory httpClientFactory)
+        public TmdbPersonProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
-            _fileSystem = fileSystem;
-            _configurationManager = configurationManager;
-            _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
-            Current = this;
+            _tmdbClientManager = tmdbClientManager;
         }
 
-        internal static TmdbPersonProvider Current { get; private set; }
-
         public string Name => TmdbUtils.ProviderName;
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(PersonLookupInfo searchInfo, CancellationToken cancellationToken)
         {
-            var tmdbId = searchInfo.GetProviderId(MetadataProvider.Tmdb);
+            var personTmdbId = Convert.ToInt32(searchInfo.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-            if (!string.IsNullOrEmpty(tmdbId))
+            if (personTmdbId <= 0)
             {
-                await EnsurePersonInfo(tmdbId, cancellationToken).ConfigureAwait(false);
+                var personResult = await _tmdbClientManager.GetPersonAsync(personTmdbId, cancellationToken).ConfigureAwait(false);
 
-                var dataFilePath = GetPersonDataFilePath(_configurationManager.ApplicationPaths, tmdbId);
-                var info = _jsonSerializer.DeserializeFromFile<PersonResult>(dataFilePath);
-
-                IReadOnlyList<Profile> images = info.Images?.Profiles ?? Array.Empty<Profile>();
-
-                var result = new RemoteSearchResult
+                if (personResult != null)
                 {
-                    Name = info.Name,
+                    var result = new RemoteSearchResult
+                    {
+                        Name = personResult.Name,
+                        SearchProviderName = Name,
+                        Overview = personResult.Biography
+                    };
 
-                    SearchProviderName = Name,
+                    if (personResult.Images?.Profiles != null && personResult.Images.Profiles.Count > 0)
+                    {
+                        result.ImageUrl = _tmdbClientManager.GetProfileUrl(personResult.Images.Profiles[0].FilePath);
+                    }
 
-                    ImageUrl = images.Count == 0 ? null : (tmdbImageUrl + images[0].File_Path)
-                };
+                    result.SetProviderId(MetadataProvider.Tmdb, personResult.Id.ToString(CultureInfo.InvariantCulture));
+                    result.SetProviderId(MetadataProvider.Imdb, personResult.ExternalIds.ImdbId);
 
-                result.SetProviderId(MetadataProvider.Tmdb, info.Id.ToString(_usCulture));
-                result.SetProviderId(MetadataProvider.Imdb, info.Imdb_Id);
-
-                return new[] { result };
+                    return new[] { result };
+                }
             }
 
+            // TODO why? Because of the old rate limit?
             if (searchInfo.IsAutomated)
             {
                 // Don't hammer moviedb searching by name
-                return Array.Empty<RemoteSearchResult>();
+                return new List<RemoteSearchResult>();
             }
 
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                TmdbUtils.BaseTmdbApiUrl + @"3/search/person?api_key={1}&query={0}",
-                WebUtility.UrlEncode(searchInfo.Name),
-                TmdbUtils.ApiKey);
+            var personSearchResult = await _tmdbClientManager.SearchPersonAsync(searchInfo.Name, cancellationToken).ConfigureAwait(false);
 
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
+            var remoteSearchResults = new List<RemoteSearchResult>();
+            for (var i = 0; i < personSearchResult.Count; i++)
             {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
+                var person = personSearchResult[i];
+                var remoteSearchResult = new RemoteSearchResult
+                {
+                    SearchProviderName = Name,
+                    Name = person.Name,
+                    ImageUrl = _tmdbClientManager.GetProfileUrl(person.ProfilePath)
+                };
+
+                remoteSearchResult.SetProviderId(MetadataProvider.Tmdb, person.Id.ToString(CultureInfo.InvariantCulture));
+                remoteSearchResults.Add(remoteSearchResult);
             }
 
-            var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-
-            var result2 = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSearchResult<PersonSearchResult>>(stream).ConfigureAwait(false)
-                         ?? new TmdbSearchResult<PersonSearchResult>();
-
-            return result2.Results.Select(i => GetSearchResult(i, tmdbImageUrl));
-        }
-
-        private RemoteSearchResult GetSearchResult(PersonSearchResult i, string baseImageUrl)
-        {
-            var result = new RemoteSearchResult
-            {
-                SearchProviderName = Name,
-
-                Name = i.Name,
-
-                ImageUrl = string.IsNullOrEmpty(i.Profile_Path) ? null : baseImageUrl + i.Profile_Path
-            };
-
-            result.SetProviderId(MetadataProvider.Tmdb, i.Id.ToString(_usCulture));
-
-            return result;
+            return remoteSearchResults;
         }
 
         public async Task<MetadataResult<Person>> GetMetadata(PersonLookupInfo id, CancellationToken cancellationToken)
         {
-            var tmdbId = id.GetProviderId(MetadataProvider.Tmdb);
+            var personTmdbId = Convert.ToInt32(id.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
             // We don't already have an Id, need to fetch it
-            if (string.IsNullOrEmpty(tmdbId))
+            if (personTmdbId <= 0)
             {
-                tmdbId = await GetTmdbId(id, cancellationToken).ConfigureAwait(false);
+                var personSearchResults = await _tmdbClientManager.SearchPersonAsync(id.Name, cancellationToken).ConfigureAwait(false);
+                if (personSearchResults.Count > 0)
+                {
+                    personTmdbId = personSearchResults[0].Id;
+                }
             }
 
             var result = new MetadataResult<Person>();
 
-            if (!string.IsNullOrEmpty(tmdbId))
+            if (personTmdbId > 0)
             {
-                try
-                {
-                    await EnsurePersonInfo(tmdbId, cancellationToken).ConfigureAwait(false);
-                }
-                catch (HttpException ex)
-                {
-                    if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
-                    {
-                        return result;
-                    }
+                var person = await _tmdbClientManager.GetPersonAsync(personTmdbId, cancellationToken).ConfigureAwait(false);
 
-                    throw;
-                }
-
-                var dataFilePath = GetPersonDataFilePath(_configurationManager.ApplicationPaths, tmdbId);
-
-                var info = _jsonSerializer.DeserializeFromFile<PersonResult>(dataFilePath);
-
-                var item = new Person();
                 result.HasMetadata = true;
 
-                // Take name from incoming info, don't rename the person
-                // TODO: This should go in PersonMetadataService, not each person provider
-                item.Name = id.Name;
-
-                // item.HomePageUrl = info.homepage;
-
-                if (!string.IsNullOrWhiteSpace(info.Place_Of_Birth))
+                var item = new Person
                 {
-                    item.ProductionLocations = new string[] { info.Place_Of_Birth };
+                    // Take name from incoming info, don't rename the person
+                    // TODO: This should go in PersonMetadataService, not each person provider
+                    Name = id.Name,
+                    HomePageUrl = person.Homepage,
+                    Overview = person.Biography,
+                    PremiereDate = person.Birthday?.ToUniversalTime(),
+                    EndDate = person.Deathday?.ToUniversalTime()
+                };
+
+                if (!string.IsNullOrWhiteSpace(person.PlaceOfBirth))
+                {
+                    item.ProductionLocations = new[] { person.PlaceOfBirth };
                 }
 
-                item.Overview = info.Biography;
+                item.SetProviderId(MetadataProvider.Tmdb, person.Id.ToString(CultureInfo.InvariantCulture));
 
-                if (DateTime.TryParseExact(info.Birthday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out var date))
+                if (!string.IsNullOrEmpty(person.ImdbId))
                 {
-                    item.PremiereDate = date.ToUniversalTime();
-                }
-
-                if (DateTime.TryParseExact(info.Deathday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
-                {
-                    item.EndDate = date.ToUniversalTime();
-                }
-
-                item.SetProviderId(MetadataProvider.Tmdb, info.Id.ToString(_usCulture));
-
-                if (!string.IsNullOrEmpty(info.Imdb_Id))
-                {
-                    item.SetProviderId(MetadataProvider.Imdb, info.Imdb_Id);
+                    item.SetProviderId(MetadataProvider.Imdb, person.ImdbId);
                 }
 
                 result.HasMetadata = true;
@@ -204,65 +139,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
             return result;
         }
 
-        /// <summary>
-        /// Gets the TMDB id.
-        /// </summary>
-        /// <param name="info">The information.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{System.String}.</returns>
-        private async Task<string> GetTmdbId(PersonLookupInfo info, CancellationToken cancellationToken)
-        {
-            var results = await GetSearchResults(info, cancellationToken).ConfigureAwait(false);
-
-            return results.Select(i => i.GetProviderId(MetadataProvider.Tmdb)).FirstOrDefault();
-        }
-
-        internal async Task EnsurePersonInfo(string id, CancellationToken cancellationToken)
-        {
-            var dataFilePath = GetPersonDataFilePath(_configurationManager.ApplicationPaths, id);
-
-            var fileInfo = _fileSystem.GetFileSystemInfo(dataFilePath);
-
-            if (fileInfo.Exists && (DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
-            {
-                return;
-            }
-
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                TmdbUtils.BaseTmdbApiUrl + @"3/person/{1}?api_key={0}&append_to_response=credits,images,external_ids",
-                TmdbUtils.ApiKey,
-                id);
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-            await using var fs = new FileStream(dataFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true);
-            await response.Content.CopyToAsync(fs).ConfigureAwait(false);
-        }
-
-        private static string GetPersonDataPath(IApplicationPaths appPaths, string tmdbId)
-        {
-            var letter = tmdbId.GetMD5().ToString().AsSpan().Slice(0, 1);
-
-            return Path.Join(GetPersonsDataPath(appPaths), letter, tmdbId);
-        }
-
-        internal static string GetPersonDataFilePath(IApplicationPaths appPaths, string tmdbId)
-        {
-            return Path.Combine(GetPersonDataPath(appPaths, tmdbId), DataFileName);
-        }
-
-        private static string GetPersonsDataPath(IApplicationPaths appPaths)
-        {
-            return Path.Combine(appPaths.CachePath, "tmdb-people");
-        }
-
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
index c56774f8e7..172db129e4 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
@@ -2,40 +2,37 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
-    public class TmdbEpisodeImageProvider :
-            TmdbEpisodeProviderBase,
-            IRemoteImageProvider,
-            IHasOrder
+    public class TmdbEpisodeImageProvider : IRemoteImageProvider, IHasOrder
     {
-        public TmdbEpisodeImageProvider(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
-            : base(httpClientFactory, configurationManager, jsonSerializer, fileSystem, localization, loggerFactory)
-        {
-        }
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public string Name => TmdbUtils.ProviderName;
+        public TmdbEpisodeImageProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
+        {
+            _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
+        }
 
         // After TheTvDb
         public int Order => 1;
 
+        public string Name => TmdbUtils.ProviderName;
+
         public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
         {
             return new List<ImageType>
@@ -49,13 +46,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             var episode = (Controller.Entities.TV.Episode)item;
             var series = episode.Series;
 
-            var seriesId = series?.GetProviderId(MetadataProvider.Tmdb);
+            var seriesTmdbId = Convert.ToInt32(series?.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            var list = new List<RemoteImageInfo>();
-
-            if (string.IsNullOrEmpty(seriesId))
+            if (seriesTmdbId <= 0)
             {
-                return list;
+                return Enumerable.Empty<RemoteImageInfo>();
             }
 
             var seasonNumber = episode.ParentIndexNumber;
@@ -63,76 +58,51 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             if (!seasonNumber.HasValue || !episodeNumber.HasValue)
             {
-                return list;
+                return Enumerable.Empty<RemoteImageInfo>();
             }
 
             var language = item.GetPreferredMetadataLanguage();
 
-            var response = await GetEpisodeInfo(
-                seriesId,
-                seasonNumber.Value,
-                episodeNumber.Value,
-                language,
-                cancellationToken).ConfigureAwait(false);
+            var episodeResult = await _tmdbClientManager
+                .GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken)
+                .ConfigureAwait(false);
 
-            var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-            list.AddRange(GetPosters(response.Images).Select(i => new RemoteImageInfo
+            if (episodeResult?.Images?.Stills == null)
             {
-                Url = tmdbImageUrl + i.File_Path,
-                CommunityRating = i.Vote_Average,
-                VoteCount = i.Vote_Count,
-                Width = i.Width,
-                Height = i.Height,
-                Language = TmdbMovieProvider.AdjustImageLanguage(i.Iso_639_1, language),
-                ProviderName = Name,
-                Type = ImageType.Primary,
-                RatingType = RatingType.Score
-            }));
+                return Enumerable.Empty<RemoteImageInfo>();
+            }
 
-            var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
+            var remoteImages = new List<RemoteImageInfo>();
 
-            return list.OrderByDescending(i =>
+            for (var i = 0; i < episodeResult.Images.Stills.Count; i++)
             {
-                if (string.Equals(language, i.Language, StringComparison.OrdinalIgnoreCase))
+                var image = episodeResult.Images.Stills[i];
+                remoteImages.Add(new RemoteImageInfo
                 {
-                    return 3;
-                }
+                    Url = _tmdbClientManager.GetStillUrl(image.FilePath),
+                    CommunityRating = image.VoteAverage,
+                    VoteCount = image.VoteCount,
+                    Width = image.Width,
+                    Height = image.Height,
+                    Language = TmdbUtils.AdjustImageLanguage(image.Iso_639_1, language),
+                    ProviderName = Name,
+                    Type = ImageType.Primary,
+                    RatingType = RatingType.Score
+                });
+            }
 
-                if (!isLanguageEn)
-                {
-                    if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 2;
-                    }
-                }
-
-                if (string.IsNullOrEmpty(i.Language))
-                {
-                    return isLanguageEn ? 3 : 2;
-                }
-
-                return 0;
-            })
-                .ThenByDescending(i => i.CommunityRating ?? 0)
-                .ThenByDescending(i => i.VoteCount ?? 0);
-        }
-
-        private IEnumerable<Still> GetPosters(StillImages images)
-        {
-            return images.Stills ?? new List<Still>();
+            return remoteImages.OrderByLanguageDescending(language);
         }
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
-            return GetResponse(url, cancellationToken);
+            return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
         }
 
         public bool Supports(BaseItem item)
         {
             return item is Controller.Entities.TV.Episode;
         }
+
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
index a7e3a03fe3..b9d4a895d5 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
@@ -4,10 +4,10 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
@@ -15,21 +15,21 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
-    public class TmdbEpisodeProvider :
-            TmdbEpisodeProviderBase,
-            IRemoteMetadataProvider<Episode, EpisodeInfo>,
-            IHasOrder
+    public class TmdbEpisodeProvider : IRemoteMetadataProvider<Episode, EpisodeInfo>, IHasOrder
     {
-        public TmdbEpisodeProvider(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
-            : base(httpClientFactory, configurationManager, jsonSerializer, fileSystem, localization, loggerFactory)
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
+
+        public TmdbEpisodeProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
+            _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
         }
 
         // After TheTvDb
@@ -39,51 +39,54 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(EpisodeInfo searchInfo, CancellationToken cancellationToken)
         {
-            var list = new List<RemoteSearchResult>();
-
             // The search query must either provide an episode number or date
             if (!searchInfo.IndexNumber.HasValue || !searchInfo.ParentIndexNumber.HasValue)
             {
-                return list;
+                return Enumerable.Empty<RemoteSearchResult>();
             }
 
-            var metadataResult = await GetMetadata(searchInfo, cancellationToken).ConfigureAwait(false);
+            var metadataResult = await GetMetadata(searchInfo, cancellationToken);
 
-            if (metadataResult.HasMetadata)
+            if (!metadataResult.HasMetadata)
             {
-                var item = metadataResult.Item;
-
-                list.Add(new RemoteSearchResult
-                {
-                    IndexNumber = item.IndexNumber,
-                    Name = item.Name,
-                    ParentIndexNumber = item.ParentIndexNumber,
-                    PremiereDate = item.PremiereDate,
-                    ProductionYear = item.ProductionYear,
-                    ProviderIds = item.ProviderIds,
-                    SearchProviderName = Name,
-                    IndexNumberEnd = item.IndexNumberEnd
-                });
+                return Enumerable.Empty<RemoteSearchResult>();
             }
 
+            var list = new List<RemoteSearchResult>();
+
+            var item = metadataResult.Item;
+
+            list.Add(new RemoteSearchResult
+            {
+                IndexNumber = item.IndexNumber,
+                Name = item.Name,
+                ParentIndexNumber = item.ParentIndexNumber,
+                PremiereDate = item.PremiereDate,
+                ProductionYear = item.ProductionYear,
+                ProviderIds = item.ProviderIds,
+                SearchProviderName = Name,
+                IndexNumberEnd = item.IndexNumberEnd
+            });
+
             return list;
         }
 
         public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info, CancellationToken cancellationToken)
         {
-            var result = new MetadataResult<Episode>();
+            var metadataResult = new MetadataResult<Episode>();
 
             // Allowing this will dramatically increase scan times
             if (info.IsMissingEpisode)
             {
-                return result;
+                return metadataResult;
             }
 
-            info.SeriesProviderIds.TryGetValue(MetadataProvider.Tmdb.ToString(), out string seriesTmdbId);
+            info.SeriesProviderIds.TryGetValue(MetadataProvider.Tmdb.ToString(), out string tmdbId);
 
-            if (string.IsNullOrEmpty(seriesTmdbId))
+            var seriesTmdbId = Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture);
+            if (seriesTmdbId <= 0)
             {
-                return result;
+                return metadataResult;
             }
 
             var seasonNumber = info.ParentIndexNumber;
@@ -91,125 +94,121 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             if (!seasonNumber.HasValue || !episodeNumber.HasValue)
             {
-                return result;
+                return metadataResult;
             }
 
-            try
+            var episodeResult = await _tmdbClientManager
+                .GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                .ConfigureAwait(false);
+
+            if (episodeResult == null)
             {
-                var response = await GetEpisodeInfo(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-                result.HasMetadata = true;
-                result.QueriedById = true;
-
-                if (!string.IsNullOrEmpty(response.Overview))
-                {
-                    // if overview is non-empty, we can assume that localized data was returned
-                    result.ResultLanguage = info.MetadataLanguage;
-                }
-
-                var item = new Episode();
-                result.Item = item;
-
-                item.Name = info.Name;
-                item.IndexNumber = info.IndexNumber;
-                item.ParentIndexNumber = info.ParentIndexNumber;
-                item.IndexNumberEnd = info.IndexNumberEnd;
-
-                if (response.External_Ids != null && response.External_Ids.Tvdb_Id > 0)
-                {
-                    item.SetProviderId(MetadataProvider.Tvdb, response.External_Ids.Tvdb_Id.Value.ToString(CultureInfo.InvariantCulture));
-                }
-
-                item.PremiereDate = response.Air_Date;
-                item.ProductionYear = result.Item.PremiereDate.Value.Year;
-
-                item.Name = response.Name;
-                item.Overview = response.Overview;
-
-                item.CommunityRating = (float)response.Vote_Average;
-
-                if (response.Videos?.Results != null)
-                {
-                    foreach (var video in response.Videos.Results)
-                    {
-                        if (video.Type.Equals("trailer", System.StringComparison.OrdinalIgnoreCase)
-                            || video.Type.Equals("clip", System.StringComparison.OrdinalIgnoreCase))
-                        {
-                            if (video.Site.Equals("youtube", System.StringComparison.OrdinalIgnoreCase))
-                            {
-                                var videoUrl = string.Format(CultureInfo.InvariantCulture, "http://www.youtube.com/watch?v={0}", video.Key);
-                                item.AddTrailerUrl(videoUrl);
-                            }
-                        }
-                    }
-                }
-
-                result.ResetPeople();
-
-                var credits = response.Credits;
-                if (credits != null)
-                {
-                    // Actors, Directors, Writers - all in People
-                    // actors come from cast
-                    if (credits.Cast != null)
-                    {
-                        foreach (var actor in credits.Cast.OrderBy(a => a.Order))
-                        {
-                            result.AddPerson(new PersonInfo { Name = actor.Name.Trim(), Role = actor.Character, Type = PersonType.Actor, SortOrder = actor.Order });
-                        }
-                    }
-
-                    // guest stars
-                    if (credits.Guest_Stars != null)
-                    {
-                        foreach (var guest in credits.Guest_Stars.OrderBy(a => a.Order))
-                        {
-                            result.AddPerson(new PersonInfo { Name = guest.Name.Trim(), Role = guest.Character, Type = PersonType.GuestStar, SortOrder = guest.Order });
-                        }
-                    }
-
-                    // and the rest from crew
-                    if (credits.Crew != null)
-                    {
-                        var keepTypes = new[]
-                        {
-                            PersonType.Director,
-                            PersonType.Writer,
-                            PersonType.Producer
-                        };
-
-                        foreach (var person in credits.Crew)
-                        {
-                            // Normalize this
-                            var type = TmdbUtils.MapCrewToPersonType(person);
-
-                            if (!keepTypes.Contains(type, StringComparer.OrdinalIgnoreCase) &&
-                                !keepTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
-                            {
-                                continue;
-                            }
-
-                            result.AddPerson(new PersonInfo { Name = person.Name.Trim(), Role = person.Job, Type = type });
-                        }
-                    }
-                }
+                return metadataResult;
             }
-            catch (HttpException ex)
+
+            metadataResult.HasMetadata = true;
+            metadataResult.QueriedById = true;
+
+            if (!string.IsNullOrEmpty(episodeResult.Overview))
             {
-                if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
-                {
-                    return result;
-                }
-
-                throw;
+                // if overview is non-empty, we can assume that localized data was returned
+                metadataResult.ResultLanguage = info.MetadataLanguage;
             }
 
-            return result;
+            var item = new Episode
+            {
+                Name = info.Name,
+                IndexNumber = info.IndexNumber,
+                ParentIndexNumber = info.ParentIndexNumber,
+                IndexNumberEnd = info.IndexNumberEnd
+            };
+
+            if (!string.IsNullOrEmpty(episodeResult.ExternalIds?.TvdbId))
+            {
+                item.SetProviderId(MetadataProvider.Tvdb, episodeResult.ExternalIds.TvdbId);
+            }
+
+            item.PremiereDate = episodeResult.AirDate;
+            item.ProductionYear = episodeResult.AirDate?.Year;
+
+            item.Name = episodeResult.Name;
+            item.Overview = episodeResult.Overview;
+
+            item.CommunityRating = Convert.ToSingle(episodeResult.VoteAverage);
+
+            if (episodeResult.Videos?.Results != null)
+            {
+                foreach (var video in episodeResult.Videos.Results)
+                {
+                    if (TmdbUtils.IsTrailerType(video))
+                    {
+                        var videoUrl = string.Format(CultureInfo.InvariantCulture, "http://www.youtube.com/watch?v={0}", video.Key);
+                        item.AddTrailerUrl(videoUrl);
+                    }
+                }
+            }
+
+            var credits = episodeResult.Credits;
+
+            if (credits?.Cast != null)
+            {
+                foreach (var actor in credits.Cast.OrderBy(a => a.Order).Take(TmdbUtils.MaxCastMembers))
+                {
+                    metadataResult.AddPerson(new PersonInfo
+                    {
+                        Name = actor.Name.Trim(),
+                        Role = actor.Character,
+                        Type = PersonType.Actor,
+                        SortOrder = actor.Order
+                    });
+                }
+            }
+
+            if (credits?.GuestStars != null)
+            {
+                foreach (var guest in credits.GuestStars.OrderBy(a => a.Order).Take(TmdbUtils.MaxCastMembers))
+                {
+                    metadataResult.AddPerson(new PersonInfo
+                    {
+                        Name = guest.Name.Trim(),
+                        Role = guest.Character,
+                        Type = PersonType.GuestStar,
+                        SortOrder = guest.Order
+                    });
+                }
+            }
+
+            // and the rest from crew
+            if (credits?.Crew != null)
+            {
+                foreach (var person in credits.Crew)
+                {
+                    // Normalize this
+                    var type = TmdbUtils.MapCrewToPersonType(person);
+
+                    if (!TmdbUtils.WantedCrewTypes.Contains(type, StringComparer.OrdinalIgnoreCase)
+                        && !TmdbUtils.WantedCrewTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    metadataResult.AddPerson(new PersonInfo
+                    {
+                        Name = person.Name.Trim(),
+                        Role = person.Job,
+                        Type = type
+                    });
+                }
+            }
+
+            metadataResult.Item = item;
+
+            return metadataResult;
         }
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
-            return GetResponse(url, cancellationToken);
+            return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
deleted file mode 100644
index 34d2424a34..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.TV;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.TV
-{
-    public abstract class TmdbEpisodeProviderBase
-    {
-        private const string EpisodeUrlPattern = TmdbUtils.BaseTmdbApiUrl + @"3/tv/{0}/season/{1}/episode/{2}?api_key={3}&append_to_response=images,external_ids,credits,videos";
-
-        private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IServerConfigurationManager _configurationManager;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IFileSystem _fileSystem;
-        private readonly ILogger<TmdbEpisodeProviderBase> _logger;
-
-        protected TmdbEpisodeProviderBase(IHttpClientFactory httpClientFactory, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
-        {
-            _httpClientFactory = httpClientFactory;
-            _configurationManager = configurationManager;
-            _jsonSerializer = jsonSerializer;
-            _fileSystem = fileSystem;
-            _logger = loggerFactory.CreateLogger<TmdbEpisodeProviderBase>();
-        }
-
-        protected ILogger Logger => _logger;
-
-        protected async Task<EpisodeResult> GetEpisodeInfo(
-            string seriesTmdbId,
-            int season,
-            int episodeNumber,
-            string preferredMetadataLanguage,
-            CancellationToken cancellationToken)
-        {
-            await EnsureEpisodeInfo(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage, cancellationToken)
-                    .ConfigureAwait(false);
-
-            var dataFilePath = GetDataFilePath(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage);
-
-            return _jsonSerializer.DeserializeFromFile<EpisodeResult>(dataFilePath);
-        }
-
-        internal Task EnsureEpisodeInfo(string tmdbId, int seasonNumber, int episodeNumber, string language, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            if (string.IsNullOrEmpty(language))
-            {
-                throw new ArgumentNullException(nameof(language));
-            }
-
-            var path = GetDataFilePath(tmdbId, seasonNumber, episodeNumber, language);
-
-            var fileInfo = _fileSystem.GetFileSystemInfo(path);
-
-            if (fileInfo.Exists)
-            {
-                // If it's recent or automatic updates are enabled, don't re-download
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
-                {
-                    return Task.CompletedTask;
-                }
-            }
-
-            return DownloadEpisodeInfo(tmdbId, seasonNumber, episodeNumber, language, cancellationToken);
-        }
-
-        internal string GetDataFilePath(string tmdbId, int seasonNumber, int episodeNumber, string preferredLanguage)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            if (string.IsNullOrEmpty(preferredLanguage))
-            {
-                throw new ArgumentNullException(nameof(preferredLanguage));
-            }
-
-            var path = TmdbSeriesProvider.GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
-
-            var filename = string.Format(
-                CultureInfo.InvariantCulture,
-                "season-{0}-episode-{1}-{2}.json",
-                seasonNumber.ToString(CultureInfo.InvariantCulture),
-                episodeNumber.ToString(CultureInfo.InvariantCulture),
-                preferredLanguage);
-
-            return Path.Combine(path, filename);
-        }
-
-        internal async Task DownloadEpisodeInfo(string id, int seasonNumber, int episodeNumber, string preferredMetadataLanguage, CancellationToken cancellationToken)
-        {
-            var mainResult = await FetchMainResult(EpisodeUrlPattern, id, seasonNumber, episodeNumber, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-            var dataFilePath = GetDataFilePath(id, seasonNumber, episodeNumber, preferredMetadataLanguage);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-            _jsonSerializer.SerializeToFile(mainResult, dataFilePath);
-        }
-
-        internal async Task<EpisodeResult> FetchMainResult(string urlPattern, string id, int seasonNumber, int episodeNumber, string language, CancellationToken cancellationToken)
-        {
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                urlPattern,
-                id,
-                seasonNumber.ToString(CultureInfo.InvariantCulture),
-                episodeNumber,
-                TmdbUtils.ApiKey);
-
-            if (!string.IsNullOrEmpty(language))
-            {
-                url += string.Format(CultureInfo.InvariantCulture, "&language={0}", language);
-            }
-
-            var includeImageLanguageParam = TmdbMovieProvider.GetImageLanguagesParam(language);
-            // Get images in english and with no language
-            url += "&include_image_language=" + includeImageLanguageParam;
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            return await _jsonSerializer.DeserializeFromStreamAsync<EpisodeResult>(stream).ConfigureAwait(false);
-        }
-
-        protected Task<HttpResponseMessage> GetResponse(string url, CancellationToken cancellationToken)
-        {
-            return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
index dcc7f87002..aeb0e5d34f 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
@@ -2,7 +2,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -13,29 +13,25 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
     public class TmdbSeasonImageProvider : IRemoteImageProvider, IHasOrder
     {
-        private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public TmdbSeasonImageProvider(IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory)
+        public TmdbSeasonImageProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
-            _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
         }
 
         public int Order => 1;
 
-        public string Name => ProviderName;
-
-        public static string ProviderName => TmdbUtils.ProviderName;
+        public string Name => TmdbUtils.ProviderName;
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
@@ -45,87 +41,45 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
             var season = (Season)item;
-            var series = season.Series;
+            var series = season?.Series;
 
-            var seriesId = series?.GetProviderId(MetadataProvider.Tmdb);
+            var seriesTmdbId = Convert.ToInt32(series?.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            if (string.IsNullOrEmpty(seriesId))
-            {
-                return Enumerable.Empty<RemoteImageInfo>();
-            }
-
-            var seasonNumber = season.IndexNumber;
-
-            if (!seasonNumber.HasValue)
+            if (seriesTmdbId <= 0 || season?.IndexNumber != null)
             {
                 return Enumerable.Empty<RemoteImageInfo>();
             }
 
             var language = item.GetPreferredMetadataLanguage();
 
-            var results = await FetchImages(season, seriesId, language, cancellationToken).ConfigureAwait(false);
+            var seasonResult = await _tmdbClientManager
+                .GetSeasonAsync(seriesTmdbId, season.IndexNumber.Value, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken)
+                .ConfigureAwait(false);
 
-            var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-            var list = results.Select(i => new RemoteImageInfo
+            if (seasonResult?.Images?.Posters == null)
             {
-                Url = tmdbImageUrl + i.File_Path,
-                CommunityRating = i.Vote_Average,
-                VoteCount = i.Vote_Count,
-                Width = i.Width,
-                Height = i.Height,
-                Language = TmdbMovieProvider.AdjustImageLanguage(i.Iso_639_1, language),
-                ProviderName = Name,
-                Type = ImageType.Primary,
-                RatingType = RatingType.Score
-            });
-
-            var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
-
-            return list.OrderByDescending(i =>
-            {
-                if (string.Equals(language, i.Language, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-
-                if (!isLanguageEn)
-                {
-                    if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 2;
-                    }
-                }
-
-                if (string.IsNullOrEmpty(i.Language))
-                {
-                    return isLanguageEn ? 3 : 2;
-                }
-
-                return 0;
-            })
-                .ThenByDescending(i => i.CommunityRating ?? 0)
-                .ThenByDescending(i => i.VoteCount ?? 0);
-        }
-
-        private async Task<List<Poster>> FetchImages(Season item, string tmdbId, string language, CancellationToken cancellationToken)
-        {
-            var seasonNumber = item.IndexNumber.GetValueOrDefault();
-            await TmdbSeasonProvider.Current.EnsureSeasonInfo(tmdbId, seasonNumber, language, cancellationToken).ConfigureAwait(false);
-
-            var path = TmdbSeasonProvider.Current.GetDataFilePath(tmdbId, seasonNumber, language);
-
-            if (!string.IsNullOrEmpty(path))
-            {
-                if (File.Exists(path))
-                {
-                    return _jsonSerializer.DeserializeFromFile<Models.TV.SeasonResult>(path).Images.Posters;
-                }
+                return Enumerable.Empty<RemoteImageInfo>();
             }
 
-            return null;
+            var remoteImages = new List<RemoteImageInfo>();
+            for (var i = 0; i < seasonResult.Images.Posters.Count; i++)
+            {
+                var image = seasonResult.Images.Posters[i];
+                remoteImages.Add(new RemoteImageInfo
+                {
+                    Url = _tmdbClientManager.GetPosterUrl(image.FilePath),
+                    CommunityRating = image.VoteAverage,
+                    VoteCount = image.VoteCount,
+                    Width = image.Width,
+                    Height = image.Height,
+                    Language = TmdbUtils.AdjustImageLanguage(image.Iso_639_1, language),
+                    ProviderName = Name,
+                    Type = ImageType.Primary,
+                    RatingType = RatingType.Score
+                });
+            }
+
+            return remoteImages.OrderByLanguageDescending(language);
         }
 
         public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
index c9b257fcc2..6ca462474a 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
@@ -3,53 +3,28 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Net;
+using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.TV;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-using Microsoft.Extensions.Logging;
-using Season = MediaBrowser.Controller.Entities.TV.Season;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
     public class TmdbSeasonProvider : IRemoteMetadataProvider<Season, SeasonInfo>
     {
-        private const string GetTvInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/tv/{0}/season/{1}?api_key={2}&append_to_response=images,keywords,external_ids,credits,videos";
-
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IServerConfigurationManager _configurationManager;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IFileSystem _fileSystem;
-        private readonly ILogger<TmdbSeasonProvider> _logger;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        internal static TmdbSeasonProvider Current { get; private set; }
-
-        public TmdbSeasonProvider(
-            IHttpClientFactory httpClientFactory,
-            IServerConfigurationManager configurationManager,
-            IFileSystem fileSystem,
-            IJsonSerializer jsonSerializer,
-            ILogger<TmdbSeasonProvider> logger)
+        public TmdbSeasonProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
             _httpClientFactory = httpClientFactory;
-            _configurationManager = configurationManager;
-            _fileSystem = fileSystem;
-            _jsonSerializer = jsonSerializer;
-            _logger = logger;
-            Current = this;
+            _tmdbClientManager = tmdbClientManager;
         }
 
         public string Name => TmdbUtils.ProviderName;
@@ -62,180 +37,86 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var seasonNumber = info.IndexNumber;
 
-            if (!string.IsNullOrWhiteSpace(seriesTmdbId) && seasonNumber.HasValue)
+            if (string.IsNullOrWhiteSpace(seriesTmdbId) || !seasonNumber.HasValue)
             {
-                try
+                return result;
+            }
+
+            var seasonResult = await _tmdbClientManager
+                .GetSeasonAsync(Convert.ToInt32(seriesTmdbId, CultureInfo.InvariantCulture), seasonNumber.Value, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                .ConfigureAwait(false);
+
+            if (seasonResult == null)
+            {
+                return result;
+            }
+
+            result.HasMetadata = true;
+            result.Item = new Season
+            {
+                Name = info.Name,
+                IndexNumber = seasonNumber,
+                Overview = seasonResult?.Overview
+            };
+
+            if (!string.IsNullOrEmpty(seasonResult.ExternalIds?.TvdbId))
+            {
+                result.Item.SetProviderId(MetadataProvider.Tvdb, seasonResult.ExternalIds.TvdbId);
+            }
+
+            // TODO why was this disabled?
+            var credits = seasonResult.Credits;
+            if (credits?.Cast != null)
+            {
+                var cast = credits.Cast.OrderBy(c => c.Order).Take(TmdbUtils.MaxCastMembers).ToList();
+                for (var i = 0; i < cast.Count; i++)
                 {
-                    var seasonInfo = await GetSeasonInfo(seriesTmdbId, seasonNumber.Value, info.MetadataLanguage, cancellationToken)
-                      .ConfigureAwait(false);
-
-                    result.HasMetadata = true;
-                    result.Item = new Season();
-
-                    // Don't use moviedb season names for now until if/when we have field-level configuration
-                    // result.Item.Name = seasonInfo.name;
-
-                    result.Item.Name = info.Name;
-
-                    result.Item.IndexNumber = seasonNumber;
-
-                    result.Item.Overview = seasonInfo.Overview;
-
-                    if (seasonInfo.External_Ids != null && seasonInfo.External_Ids.Tvdb_Id > 0)
+                    result.AddPerson(new PersonInfo
                     {
-                        result.Item.SetProviderId(MetadataProvider.Tvdb, seasonInfo.External_Ids.Tvdb_Id.Value.ToString(CultureInfo.InvariantCulture));
-                    }
-
-                    var credits = seasonInfo.Credits;
-                    if (credits != null)
-                    {
-                        // Actors, Directors, Writers - all in People
-                        // actors come from cast
-                        if (credits.Cast != null)
-                        {
-                            // foreach (var actor in credits.cast.OrderBy(a => a.order)) result.Item.AddPerson(new PersonInfo { Name = actor.name.Trim(), Role = actor.character, Type = PersonType.Actor, SortOrder = actor.order });
-                        }
-
-                        // and the rest from crew
-                        if (credits.Crew != null)
-                        {
-                            // foreach (var person in credits.crew) result.Item.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = person.department });
-                        }
-                    }
-
-                    result.Item.PremiereDate = seasonInfo.Air_Date;
-                    result.Item.ProductionYear = result.Item.PremiereDate.Value.Year;
-                }
-                catch (HttpException ex)
-                {
-                    _logger.LogError(ex, "No metadata found for {0}", seasonNumber.Value);
-
-                    if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
-                    {
-                        return result;
-                    }
-
-                    throw;
+                        Name = cast[i].Name.Trim(),
+                        Role = cast[i].Character,
+                        Type = PersonType.Actor,
+                        SortOrder = cast[i].Order
+                    });
                 }
             }
 
+            if (credits?.Crew != null)
+            {
+                foreach (var person in credits.Crew)
+                {
+                    // Normalize this
+                    var type = TmdbUtils.MapCrewToPersonType(person);
+
+                    if (!TmdbUtils.WantedCrewTypes.Contains(type, StringComparer.OrdinalIgnoreCase)
+                        && !TmdbUtils.WantedCrewTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    result.AddPerson(new PersonInfo
+                    {
+                        Name = person.Name.Trim(),
+                        Role = person.Job,
+                        Type = type
+                    });
+                }
+            }
+
+            result.Item.PremiereDate = seasonResult.AirDate;
+            result.Item.ProductionYear = seasonResult.AirDate?.Year;
+
             return result;
         }
 
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeasonInfo searchInfo, CancellationToken cancellationToken)
         {
-            return Task.FromResult<IEnumerable<RemoteSearchResult>>(new List<RemoteSearchResult>());
+            return Task.FromResult(Enumerable.Empty<RemoteSearchResult>());
         }
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
         {
             return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
         }
-
-        private async Task<SeasonResult> GetSeasonInfo(
-            string seriesTmdbId,
-            int season,
-            string preferredMetadataLanguage,
-            CancellationToken cancellationToken)
-        {
-            await EnsureSeasonInfo(seriesTmdbId, season, preferredMetadataLanguage, cancellationToken)
-                    .ConfigureAwait(false);
-
-            var dataFilePath = GetDataFilePath(seriesTmdbId, season, preferredMetadataLanguage);
-
-            return _jsonSerializer.DeserializeFromFile<SeasonResult>(dataFilePath);
-        }
-
-        internal Task EnsureSeasonInfo(string tmdbId, int seasonNumber, string language, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            if (string.IsNullOrEmpty(language))
-            {
-                throw new ArgumentNullException(nameof(language));
-            }
-
-            var path = GetDataFilePath(tmdbId, seasonNumber, language);
-
-            var fileInfo = _fileSystem.GetFileSystemInfo(path);
-
-            if (fileInfo.Exists)
-            {
-                // If it's recent or automatic updates are enabled, don't re-download
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
-                {
-                    return Task.CompletedTask;
-                }
-            }
-
-            return DownloadSeasonInfo(tmdbId, seasonNumber, language, cancellationToken);
-        }
-
-        internal string GetDataFilePath(string tmdbId, int seasonNumber, string preferredLanguage)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            if (string.IsNullOrEmpty(preferredLanguage))
-            {
-                throw new ArgumentNullException(nameof(preferredLanguage));
-            }
-
-            var path = TmdbSeriesProvider.GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
-
-            var filename = string.Format(
-                CultureInfo.InvariantCulture,
-                "season-{0}-{1}.json",
-                seasonNumber.ToString(CultureInfo.InvariantCulture),
-                preferredLanguage);
-
-            return Path.Combine(path, filename);
-        }
-
-        internal async Task DownloadSeasonInfo(string id, int seasonNumber, string preferredMetadataLanguage, CancellationToken cancellationToken)
-        {
-            var mainResult = await FetchMainResult(id, seasonNumber, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-            var dataFilePath = GetDataFilePath(id, seasonNumber, preferredMetadataLanguage);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-            _jsonSerializer.SerializeToFile(mainResult, dataFilePath);
-        }
-
-        internal async Task<SeasonResult> FetchMainResult(string id, int seasonNumber, string language, CancellationToken cancellationToken)
-        {
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                GetTvInfo3,
-                id,
-                seasonNumber.ToString(CultureInfo.InvariantCulture),
-                TmdbUtils.ApiKey);
-
-            if (!string.IsNullOrEmpty(language))
-            {
-                url += string.Format(CultureInfo.InvariantCulture, "&language={0}", TmdbMovieProvider.NormalizeLanguage(language));
-            }
-
-            var includeImageLanguageParam = TmdbMovieProvider.GetImageLanguagesParam(language);
-            // Get images in english and with no language
-            url += "&include_image_language=" + includeImageLanguageParam;
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            return await _jsonSerializer.DeserializeFromStreamAsync<SeasonResult>(stream).ConfigureAwait(false);
-        }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 179ceb825d..0b477f75b6 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -2,7 +2,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -13,28 +13,23 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.TV;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
     public class TmdbSeriesImageProvider : IRemoteImageProvider, IHasOrder
     {
-        private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClientFactory _httpClientFactory;
+        private readonly TmdbClientManager _tmdbClientManager;
 
-        public TmdbSeriesImageProvider(IJsonSerializer jsonSerializer, IHttpClientFactory httpClientFactory)
+        public TmdbSeriesImageProvider(IHttpClientFactory httpClientFactory, TmdbClientManager tmdbClientManager)
         {
-            _jsonSerializer = jsonSerializer;
             _httpClientFactory = httpClientFactory;
+            _tmdbClientManager = tmdbClientManager;
         }
 
-        public string Name => ProviderName;
-
-        public static string ProviderName => TmdbUtils.ProviderName;
+        public string Name => TmdbUtils.ProviderName;
 
         // After tvdb and fanart
         public int Order => 2;
@@ -54,107 +49,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         }
 
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
-        {
-            var list = new List<RemoteImageInfo>();
-
-            var results = await FetchImages(item, null, cancellationToken).ConfigureAwait(false);
-
-            if (results == null)
-            {
-                return list;
-            }
-
-            var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-            var language = item.GetPreferredMetadataLanguage();
-
-            list.AddRange(GetPosters(results).Select(i => new RemoteImageInfo
-            {
-                Url = tmdbImageUrl + i.File_Path,
-                CommunityRating = i.Vote_Average,
-                VoteCount = i.Vote_Count,
-                Width = i.Width,
-                Height = i.Height,
-                Language = TmdbMovieProvider.AdjustImageLanguage(i.Iso_639_1, language),
-                ProviderName = Name,
-                Type = ImageType.Primary,
-                RatingType = RatingType.Score
-            }));
-
-            list.AddRange(GetBackdrops(results).Select(i => new RemoteImageInfo
-            {
-                Url = tmdbImageUrl + i.File_Path,
-                CommunityRating = i.Vote_Average,
-                VoteCount = i.Vote_Count,
-                Width = i.Width,
-                Height = i.Height,
-                ProviderName = Name,
-                Type = ImageType.Backdrop,
-                RatingType = RatingType.Score
-            }));
-
-            var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
-
-            return list.OrderByDescending(i =>
-            {
-                if (string.Equals(language, i.Language, StringComparison.OrdinalIgnoreCase))
-                {
-                    return 3;
-                }
-
-                if (!isLanguageEn)
-                {
-                    if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 2;
-                    }
-                }
-
-                if (string.IsNullOrEmpty(i.Language))
-                {
-                    return isLanguageEn ? 3 : 2;
-                }
-
-                return 0;
-            })
-                .ThenByDescending(i => i.CommunityRating ?? 0)
-                .ThenByDescending(i => i.VoteCount ?? 0);
-        }
-
-        /// <summary>
-        /// Gets the posters.
-        /// </summary>
-        /// <param name="images">The images.</param>
-        private IEnumerable<Poster> GetPosters(Images images)
-        {
-            return images.Posters ?? new List<Poster>();
-        }
-
-        /// <summary>
-        /// Gets the backdrops.
-        /// </summary>
-        /// <param name="images">The images.</param>
-        private IEnumerable<Backdrop> GetBackdrops(Images images)
-        {
-            var eligibleBackdrops = images.Backdrops ?? new List<Backdrop>();
-
-            return eligibleBackdrops.OrderByDescending(i => i.Vote_Average)
-                .ThenByDescending(i => i.Vote_Count);
-        }
-
-        /// <summary>
-        /// Fetches the images.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="language">The language.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{MovieImages}.</returns>
-        private async Task<Images> FetchImages(
-            BaseItem item,
-            string language,
-            CancellationToken cancellationToken)
         {
             var tmdbId = item.GetProviderId(MetadataProvider.Tmdb);
 
@@ -163,16 +57,53 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 return null;
             }
 
-            await TmdbSeriesProvider.Current.EnsureSeriesInfo(tmdbId, language, cancellationToken).ConfigureAwait(false);
+            var language = item.GetPreferredMetadataLanguage();
 
-            var path = TmdbSeriesProvider.Current.GetDataFilePath(tmdbId, language);
+            var series = await _tmdbClientManager
+                .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken)
+                .ConfigureAwait(false);
 
-            if (!string.IsNullOrEmpty(path) && File.Exists(path))
+            if (series?.Images == null)
             {
-                return _jsonSerializer.DeserializeFromFile<SeriesResult>(path).Images;
+                return Array.Empty<RemoteImageInfo>();
             }
 
-            return null;
+            var remoteImages = new List<RemoteImageInfo>();
+
+            for (var i = 0; i < series.Images.Posters.Count; i++)
+            {
+                var poster = series.Images.Posters[i];
+                remoteImages.Add(new RemoteImageInfo
+                {
+                    Url = _tmdbClientManager.GetPosterUrl(poster.FilePath),
+                    CommunityRating = poster.VoteAverage,
+                    VoteCount = poster.VoteCount,
+                    Width = poster.Width,
+                    Height = poster.Height,
+                    Language = TmdbUtils.AdjustImageLanguage(poster.Iso_639_1, language),
+                    ProviderName = Name,
+                    Type = ImageType.Primary,
+                    RatingType = RatingType.Score
+                });
+            }
+
+            for (var i = 0; i < series.Images.Backdrops.Count; i++)
+            {
+                var backdrop = series.Images.Backdrops[i];
+                remoteImages.Add(new RemoteImageInfo
+                {
+                    Url = _tmdbClientManager.GetBackdropUrl(backdrop.FilePath),
+                    CommunityRating = backdrop.VoteAverage,
+                    VoteCount = backdrop.VoteCount,
+                    Width = backdrop.Width,
+                    Height = backdrop.Height,
+                    ProviderName = Name,
+                    Type = ImageType.Backdrop,
+                    RatingType = RatingType.Score
+                });
+            }
+
+            return remoteImages.OrderByLanguageDescending(language);
         }
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
index 287ebca8c9..f110785df9 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
@@ -1,6 +1,7 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -9,7 +10,6 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -17,93 +17,78 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.Search;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.TV;
 using MediaBrowser.Providers.Plugins.Tmdb.Movies;
 using Microsoft.Extensions.Logging;
+using TMDbLib.Objects.Find;
+using TMDbLib.Objects.Search;
+using TMDbLib.Objects.TvShows;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
     public class TmdbSeriesProvider : IRemoteMetadataProvider<Series, SeriesInfo>, IHasOrder
     {
-        private const string GetTvInfo3 = TmdbUtils.BaseTmdbApiUrl + @"3/tv/{0}?api_key={1}&append_to_response=credits,images,keywords,external_ids,videos,content_ratings";
-
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IServerConfigurationManager _configurationManager;
-        private readonly ILogger<TmdbSeriesProvider> _logger;
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly ILibraryManager _libraryManager;
+        private readonly TmdbClientManager _tmdbClientManager;
 
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
         public TmdbSeriesProvider(
-            IJsonSerializer jsonSerializer,
-            IServerConfigurationManager configurationManager,
-            ILogger<TmdbSeriesProvider> logger,
             IHttpClientFactory httpClientFactory,
-            ILibraryManager libraryManager)
+            TmdbClientManager tmdbClientManager)
         {
-            _jsonSerializer = jsonSerializer;
-            _configurationManager = configurationManager;
-            _logger = logger;
             _httpClientFactory = httpClientFactory;
-            _libraryManager = libraryManager;
+            _tmdbClientManager = tmdbClientManager;
             Current = this;
         }
 
-        internal static TmdbSeriesProvider Current { get; private set; }
-
         public string Name => TmdbUtils.ProviderName;
 
         // After TheTVDB
         public int Order => 1;
 
+        internal static TmdbSeriesProvider Current { get; private set; }
+
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
         {
             var tmdbId = searchInfo.GetProviderId(MetadataProvider.Tmdb);
 
             if (!string.IsNullOrEmpty(tmdbId))
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                var series = await _tmdbClientManager
+                    .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), searchInfo.MetadataLanguage, searchInfo.MetadataLanguage, cancellationToken)
+                    .ConfigureAwait(false);
 
-                await EnsureSeriesInfo(tmdbId, searchInfo.MetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-                var dataFilePath = GetDataFilePath(tmdbId, searchInfo.MetadataLanguage);
-
-                var obj = _jsonSerializer.DeserializeFromFile<SeriesResult>(dataFilePath);
-
-                var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-                var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
-
-                var remoteResult = new RemoteSearchResult
+                if (series != null)
                 {
-                    Name = obj.Name,
-                    SearchProviderName = Name,
-                    ImageUrl = string.IsNullOrWhiteSpace(obj.Poster_Path) ? null : tmdbImageUrl + obj.Poster_Path
-                };
+                    var remoteResult = MapTvShowToRemoteSearchResult(series);
 
-                remoteResult.SetProviderId(MetadataProvider.Tmdb, obj.Id.ToString(_usCulture));
-                remoteResult.SetProviderId(MetadataProvider.Imdb, obj.External_Ids.Imdb_Id);
-
-                if (obj.External_Ids != null && obj.External_Ids.Tvdb_Id > 0)
-                {
-                    remoteResult.SetProviderId(MetadataProvider.Tvdb, obj.External_Ids.Tvdb_Id.Value.ToString(_usCulture));
+                    return new[] { remoteResult };
                 }
-
-                return new[] { remoteResult };
             }
 
             var imdbId = searchInfo.GetProviderId(MetadataProvider.Imdb);
 
             if (!string.IsNullOrEmpty(imdbId))
             {
-                var searchResult = await FindByExternalId(imdbId, "imdb_id", cancellationToken).ConfigureAwait(false);
+                var findResult = await _tmdbClientManager
+                    .FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, searchInfo.MetadataLanguage, cancellationToken)
+                    .ConfigureAwait(false);
 
-                if (searchResult != null)
+                if (findResult?.TvResults != null)
                 {
-                    return new[] { searchResult };
+                    var imdbIdResults = new List<RemoteSearchResult>();
+                    for (var i = 0; i < findResult.TvResults.Count; i++)
+                    {
+                        var remoteResult = MapSearchTvToRemoteSearchResult(findResult.TvResults[i]);
+                        remoteResult.SetProviderId(MetadataProvider.Imdb, imdbId);
+                        imdbIdResults.Add(remoteResult);
+                    }
+
+                    return imdbIdResults;
                 }
             }
 
@@ -111,15 +96,79 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             if (!string.IsNullOrEmpty(tvdbId))
             {
-                var searchResult = await FindByExternalId(tvdbId, "tvdb_id", cancellationToken).ConfigureAwait(false);
+                var findResult = await _tmdbClientManager
+                    .FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, searchInfo.MetadataLanguage, cancellationToken)
+                    .ConfigureAwait(false);
 
-                if (searchResult != null)
+                if (findResult?.TvResults != null)
                 {
-                    return new[] { searchResult };
+                    var tvIdResults = new List<RemoteSearchResult>();
+                    for (var i = 0; i < findResult.TvResults.Count; i++)
+                    {
+                        var remoteResult = MapSearchTvToRemoteSearchResult(findResult.TvResults[i]);
+                        remoteResult.SetProviderId(MetadataProvider.Tvdb, tvdbId);
+                        tvIdResults.Add(remoteResult);
+                    }
+
+                    return tvIdResults;
                 }
             }
 
-            return await new TmdbSearch(_logger, _jsonSerializer, _libraryManager).GetSearchResults(searchInfo, cancellationToken).ConfigureAwait(false);
+            var tvSearchResults = await _tmdbClientManager.SearchSeriesAsync(searchInfo.Name, searchInfo.MetadataLanguage, cancellationToken)
+                .ConfigureAwait(false);
+
+            var remoteResults = new List<RemoteSearchResult>();
+            for (var i = 0; i < tvSearchResults.Count; i++)
+            {
+                remoteResults.Add(MapSearchTvToRemoteSearchResult(tvSearchResults[i]));
+            }
+
+            return remoteResults;
+        }
+
+        private RemoteSearchResult MapTvShowToRemoteSearchResult(TvShow series)
+        {
+            var remoteResult = new RemoteSearchResult
+            {
+                Name = series.Name ?? series.OriginalName,
+                SearchProviderName = Name,
+                ImageUrl = _tmdbClientManager.GetPosterUrl(series.PosterPath),
+                Overview = series.Overview
+            };
+
+            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(_usCulture));
+            if (series.ExternalIds != null)
+            {
+                if (!string.IsNullOrEmpty(series.ExternalIds.ImdbId))
+                {
+                    remoteResult.SetProviderId(MetadataProvider.Imdb, series.ExternalIds.ImdbId);
+                }
+
+                if (!string.IsNullOrEmpty(series.ExternalIds.TvdbId))
+                {
+                    remoteResult.SetProviderId(MetadataProvider.Tvdb, series.ExternalIds.TvdbId);
+                }
+            }
+
+            remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
+
+            return remoteResult;
+        }
+
+        private RemoteSearchResult MapSearchTvToRemoteSearchResult(SearchTv series)
+        {
+            var remoteResult = new RemoteSearchResult
+            {
+                Name = series.Name ?? series.OriginalName,
+                SearchProviderName = Name,
+                ImageUrl = _tmdbClientManager.GetPosterUrl(series.PosterPath),
+                Overview = series.Overview
+            };
+
+            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(_usCulture));
+            remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
+
+            return remoteResult;
         }
 
         public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, CancellationToken cancellationToken)
@@ -137,11 +186,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
                 if (!string.IsNullOrEmpty(imdbId))
                 {
-                    var searchResult = await FindByExternalId(imdbId, "imdb_id", cancellationToken).ConfigureAwait(false);
+                    var searchResult = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
 
                     if (searchResult != null)
                     {
-                        tmdbId = searchResult.GetProviderId(MetadataProvider.Tmdb);
+                        tmdbId = searchResult.TvResults.FirstOrDefault()?.Id.ToString(CultureInfo.InvariantCulture);
                     }
                 }
             }
@@ -152,11 +201,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
                 if (!string.IsNullOrEmpty(tvdbId))
                 {
-                    var searchResult = await FindByExternalId(tvdbId, "tvdb_id", cancellationToken).ConfigureAwait(false);
+                    var searchResult = await _tmdbClientManager.FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
 
                     if (searchResult != null)
                     {
-                        tmdbId = searchResult.GetProviderId(MetadataProvider.Tmdb);
+                        tmdbId = searchResult.TvResults.FirstOrDefault()?.Id.ToString(CultureInfo.InvariantCulture);
                     }
                 }
             }
@@ -164,13 +213,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             if (string.IsNullOrEmpty(tmdbId))
             {
                 result.QueriedById = false;
-                var searchResults = await new TmdbSearch(_logger, _jsonSerializer, _libraryManager).GetSearchResults(info, cancellationToken).ConfigureAwait(false);
+                var searchResults = await _tmdbClientManager.SearchSeriesAsync(info.Name, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
 
-                var searchResult = searchResults.FirstOrDefault();
-
-                if (searchResult != null)
+                if (searchResults.Count > 0)
                 {
-                    tmdbId = searchResult.GetProviderId(MetadataProvider.Tmdb);
+                    tmdbId = searchResults[0].Id.ToString(CultureInfo.InvariantCulture);
                 }
             }
 
@@ -178,7 +225,20 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                result = await FetchMovieData(tmdbId, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
+                var tvShow = await _tmdbClientManager
+                    .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                    .ConfigureAwait(false);
+
+                result = new MetadataResult<Series>
+                {
+                    Item = MapTvShowToSeries(tvShow, info.MetadataCountryCode),
+                    ResultLanguage = info.MetadataLanguage ?? tvShow.OriginalLanguage
+                };
+
+                foreach (var person in GetPersons(tvShow))
+                {
+                    result.AddPerson(person);
+                }
 
                 result.HasMetadata = result.Item != null;
             }
@@ -186,99 +246,62 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             return result;
         }
 
-        private async Task<MetadataResult<Series>> FetchMovieData(string tmdbId, string language, string preferredCountryCode, CancellationToken cancellationToken)
+        private Series MapTvShowToSeries(TvShow seriesResult, string preferredCountryCode)
         {
-            SeriesResult seriesInfo = await FetchMainResult(tmdbId, language, cancellationToken).ConfigureAwait(false);
+            var series = new Series {Name = seriesResult.Name, OriginalTitle = seriesResult.OriginalName};
 
-            if (seriesInfo == null)
+            series.SetProviderId(MetadataProvider.Tmdb, seriesResult.Id.ToString(_usCulture));
+
+            series.CommunityRating = Convert.ToSingle(seriesResult.VoteAverage);
+
+            series.Overview = seriesResult.Overview;
+
+            if (seriesResult.Networks != null)
             {
-                return null;
+                series.Studios = seriesResult.Networks.Select(i => i.Name).ToArray();
             }
 
-            tmdbId = seriesInfo.Id.ToString(_usCulture);
-
-            string dataFilePath = GetDataFilePath(tmdbId, language);
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-            _jsonSerializer.SerializeToFile(seriesInfo, dataFilePath);
-
-            await EnsureSeriesInfo(tmdbId, language, cancellationToken).ConfigureAwait(false);
-
-            var result = new MetadataResult<Series>
+            if (seriesResult.Genres != null)
             {
-                Item = new Series(),
-                ResultLanguage = seriesInfo.ResultLanguage
-            };
-
-            var settings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-
-            ProcessMainInfo(result, seriesInfo, preferredCountryCode, settings);
-
-            return result;
-        }
-
-        private void ProcessMainInfo(MetadataResult<Series> seriesResult, SeriesResult seriesInfo, string preferredCountryCode, TmdbSettingsResult settings)
-        {
-            var series = seriesResult.Item;
-
-            series.Name = seriesInfo.Name;
-            series.OriginalTitle = seriesInfo.Original_Name;
-            series.SetProviderId(MetadataProvider.Tmdb, seriesInfo.Id.ToString(_usCulture));
-
-            string voteAvg = seriesInfo.Vote_Average.ToString(CultureInfo.InvariantCulture);
-
-            if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out float rating))
-            {
-                series.CommunityRating = rating;
+                series.Genres = seriesResult.Genres.Select(i => i.Name).ToArray();
             }
 
-            series.Overview = seriesInfo.Overview;
+            series.HomePageUrl = seriesResult.Homepage;
 
-            if (seriesInfo.Networks != null)
-            {
-                series.Studios = seriesInfo.Networks.Select(i => i.Name).ToArray();
-            }
+            series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
 
-            if (seriesInfo.Genres != null)
-            {
-                series.Genres = seriesInfo.Genres.Select(i => i.Name).ToArray();
-            }
-
-            series.HomePageUrl = seriesInfo.Homepage;
-
-            series.RunTimeTicks = seriesInfo.Episode_Run_Time.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
-
-            if (string.Equals(seriesInfo.Status, "Ended", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(seriesResult.Status, "Ended", StringComparison.OrdinalIgnoreCase))
             {
                 series.Status = SeriesStatus.Ended;
-                series.EndDate = seriesInfo.Last_Air_Date;
+                series.EndDate = seriesResult.LastAirDate;
             }
             else
             {
                 series.Status = SeriesStatus.Continuing;
             }
 
-            series.PremiereDate = seriesInfo.First_Air_Date;
+            series.PremiereDate = seriesResult.FirstAirDate;
 
-            var ids = seriesInfo.External_Ids;
+            var ids = seriesResult.ExternalIds;
             if (ids != null)
             {
-                if (!string.IsNullOrWhiteSpace(ids.Imdb_Id))
+                if (!string.IsNullOrWhiteSpace(ids.ImdbId))
                 {
-                    series.SetProviderId(MetadataProvider.Imdb, ids.Imdb_Id);
+                    series.SetProviderId(MetadataProvider.Imdb, ids.ImdbId);
                 }
 
-                if (ids.Tvrage_Id > 0)
+                if (!string.IsNullOrEmpty(ids.TvrageId))
                 {
-                    series.SetProviderId(MetadataProvider.TvRage, ids.Tvrage_Id.Value.ToString(_usCulture));
+                    series.SetProviderId(MetadataProvider.TvRage, ids.TvrageId);
                 }
 
-                if (ids.Tvdb_Id > 0)
+                if (!string.IsNullOrEmpty(ids.TvdbId))
                 {
-                    series.SetProviderId(MetadataProvider.Tvdb, ids.Tvdb_Id.Value.ToString(_usCulture));
+                    series.SetProviderId(MetadataProvider.Tvdb, ids.TvdbId);
                 }
             }
 
-            var contentRatings = (seriesInfo.Content_Ratings ?? new ContentRatings()).Results ?? new List<ContentRating>();
+            var contentRatings = seriesResult.ContentRatings.Results ?? new List<ContentRating>();
 
             var ourRelease = contentRatings.FirstOrDefault(c => string.Equals(c.Iso_3166_1, preferredCountryCode, StringComparison.OrdinalIgnoreCase));
             var usRelease = contentRatings.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
@@ -297,254 +320,72 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 series.OfficialRating = minimumRelease.Rating;
             }
 
-            if (seriesInfo.Videos != null && seriesInfo.Videos.Results != null)
+            if (seriesResult.Videos?.Results != null)
             {
-                foreach (var video in seriesInfo.Videos.Results)
+                foreach (var video in seriesResult.Videos.Results)
                 {
-                    if ((video.Type.Equals("trailer", StringComparison.OrdinalIgnoreCase)
-                        || video.Type.Equals("clip", StringComparison.OrdinalIgnoreCase))
-                        && video.Site.Equals("youtube", StringComparison.OrdinalIgnoreCase))
+                    if (TmdbUtils.IsTrailerType(video))
                     {
                         series.AddTrailerUrl($"http://www.youtube.com/watch?v={video.Key}");
                     }
                 }
             }
 
-            seriesResult.ResetPeople();
-            var tmdbImageUrl = settings.images.GetImageUrl("original");
+            return series;
+        }
 
-            if (seriesInfo.Credits != null)
+        private IEnumerable<PersonInfo> GetPersons(TvShow seriesResult)
+        {
+            if (seriesResult.Credits?.Cast != null)
             {
-                if (seriesInfo.Credits.Cast != null)
+                foreach (var actor in seriesResult.Credits.Cast.OrderBy(a => a.Order).Take(TmdbUtils.MaxCastMembers))
                 {
-                    foreach (var actor in seriesInfo.Credits.Cast.OrderBy(a => a.Order))
+                    var personInfo = new PersonInfo
                     {
-                        var personInfo = new PersonInfo
-                        {
-                            Name = actor.Name.Trim(),
-                            Role = actor.Character,
-                            Type = PersonType.Actor,
-                            SortOrder = actor.Order
-                        };
-
-                        if (!string.IsNullOrWhiteSpace(actor.Profile_Path))
-                        {
-                            personInfo.ImageUrl = tmdbImageUrl + actor.Profile_Path;
-                        }
-
-                        if (actor.Id > 0)
-                        {
-                            personInfo.SetProviderId(MetadataProvider.Tmdb, actor.Id.ToString(CultureInfo.InvariantCulture));
-                        }
-
-                        seriesResult.AddPerson(personInfo);
-                    }
-                }
-
-                if (seriesInfo.Credits.Crew != null)
-                {
-                    var keepTypes = new[]
-                    {
-                        PersonType.Director,
-                        PersonType.Writer,
-                        PersonType.Producer
+                        Name = actor.Name.Trim(),
+                        Role = actor.Character,
+                        Type = PersonType.Actor,
+                        SortOrder = actor.Order,
+                        ImageUrl = _tmdbClientManager.GetPosterUrl(actor.ProfilePath)
                     };
 
-                    foreach (var person in seriesInfo.Credits.Crew)
+                    if (actor.Id > 0)
                     {
-                        // Normalize this
-                        var type = TmdbUtils.MapCrewToPersonType(person);
-
-                        if (!keepTypes.Contains(type, StringComparer.OrdinalIgnoreCase)
-                            && !keepTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
-                        {
-                            continue;
-                        }
-
-                        seriesResult.AddPerson(new PersonInfo
-                        {
-                            Name = person.Name.Trim(),
-                            Role = person.Job,
-                            Type = type
-                        });
+                        personInfo.SetProviderId(MetadataProvider.Tmdb, actor.Id.ToString(CultureInfo.InvariantCulture));
                     }
-                }
-            }
-        }
 
-        internal static string GetSeriesDataPath(IApplicationPaths appPaths, string tmdbId)
-        {
-            var dataPath = GetSeriesDataPath(appPaths);
-
-            return Path.Combine(dataPath, tmdbId);
-        }
-
-        internal static string GetSeriesDataPath(IApplicationPaths appPaths)
-        {
-            var dataPath = Path.Combine(appPaths.CachePath, "tmdb-tv");
-
-            return dataPath;
-        }
-
-        internal async Task DownloadSeriesInfo(string id, string preferredMetadataLanguage, CancellationToken cancellationToken)
-        {
-            SeriesResult mainResult = await FetchMainResult(id, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
-
-            if (mainResult == null)
-            {
-                return;
-            }
-
-            var dataFilePath = GetDataFilePath(id, preferredMetadataLanguage);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(dataFilePath));
-
-            _jsonSerializer.SerializeToFile(mainResult, dataFilePath);
-        }
-
-        internal async Task<SeriesResult> FetchMainResult(string id, string language, CancellationToken cancellationToken)
-        {
-            var url = string.Format(CultureInfo.InvariantCulture, GetTvInfo3, id, TmdbUtils.ApiKey);
-
-            if (!string.IsNullOrEmpty(language))
-            {
-                url += "&language=" + TmdbMovieProvider.NormalizeLanguage(language)
-                    + "&include_image_language=" + TmdbMovieProvider.GetImageLanguagesParam(language); // Get images in english and with no language
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using var mainRequestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                mainRequestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var mainResponse = await TmdbMovieProvider.Current.GetMovieDbResponse(mainRequestMessage, cancellationToken).ConfigureAwait(false);
-            await using var mainStream = await mainResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            var mainResult = await _jsonSerializer.DeserializeFromStreamAsync<SeriesResult>(mainStream).ConfigureAwait(false);
-
-            if (!string.IsNullOrEmpty(language))
-            {
-                mainResult.ResultLanguage = language;
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            // If the language preference isn't english, then have the overview fallback to english if it's blank
-            if (mainResult != null &&
-                string.IsNullOrEmpty(mainResult.Overview) &&
-                !string.IsNullOrEmpty(language) &&
-                !string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
-            {
-                _logger.LogInformation("MovieDbSeriesProvider couldn't find meta for language {Language}. Trying English...", language);
-
-                url = string.Format(CultureInfo.InvariantCulture, GetTvInfo3, id, TmdbUtils.ApiKey) + "&language=en";
-
-                if (!string.IsNullOrEmpty(language))
-                {
-                    // Get images in english and with no language
-                    url += "&include_image_language=" + TmdbMovieProvider.GetImageLanguagesParam(language);
-                }
-
-                using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-                foreach (var header in TmdbUtils.AcceptHeaders)
-                {
-                    mainRequestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-                }
-
-                using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-                await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-                var englishResult = await _jsonSerializer.DeserializeFromStreamAsync<SeriesResult>(stream).ConfigureAwait(false);
-
-                mainResult.Overview = englishResult.Overview;
-                mainResult.ResultLanguage = "en";
-            }
-
-            return mainResult;
-        }
-
-        internal Task EnsureSeriesInfo(string tmdbId, string language, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
-            {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            var path = GetDataFilePath(tmdbId, language);
-
-            var fileInfo = new FileInfo(path);
-            if (fileInfo.Exists)
-            {
-                // If it's recent or automatic updates are enabled, don't re-download
-                if ((DateTime.UtcNow - fileInfo.LastWriteTimeUtc).TotalDays <= 2)
-                {
-                    return Task.CompletedTask;
+                    yield return personInfo;
                 }
             }
 
-            return DownloadSeriesInfo(tmdbId, language, cancellationToken);
-        }
-
-        internal string GetDataFilePath(string tmdbId, string preferredLanguage)
-        {
-            if (string.IsNullOrEmpty(tmdbId))
+            if (seriesResult.Credits?.Crew != null)
             {
-                throw new ArgumentNullException(nameof(tmdbId));
-            }
-
-            var path = GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
-
-            var filename = string.Format(CultureInfo.InvariantCulture, "series-{0}.json", preferredLanguage ?? string.Empty);
-
-            return Path.Combine(path, filename);
-        }
-
-        private async Task<RemoteSearchResult> FindByExternalId(string id, string externalSource, CancellationToken cancellationToken)
-        {
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                TmdbUtils.BaseTmdbApiUrl + @"3/find/{0}?api_key={1}&external_source={2}",
-                id,
-                TmdbUtils.ApiKey,
-                externalSource);
-
-            using var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
-            foreach (var header in TmdbUtils.AcceptHeaders)
-            {
-                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(header));
-            }
-
-            using var response = await TmdbMovieProvider.Current.GetMovieDbResponse(requestMessage, cancellationToken).ConfigureAwait(false);
-            await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-
-            var result = await _jsonSerializer.DeserializeFromStreamAsync<ExternalIdLookupResult>(stream).ConfigureAwait(false);
-
-            if (result != null && result.Tv_Results != null)
-            {
-                var tv = result.Tv_Results.FirstOrDefault();
-
-                if (tv != null)
+                var keepTypes = new[]
                 {
-                    var tmdbSettings = await TmdbMovieProvider.Current.GetTmdbSettings(cancellationToken).ConfigureAwait(false);
-                    var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
+                    PersonType.Director,
+                    PersonType.Writer,
+                    PersonType.Producer
+                };
 
-                    var remoteResult = new RemoteSearchResult
+                foreach (var person in seriesResult.Credits.Crew)
+                {
+                    // Normalize this
+                    var type = TmdbUtils.MapCrewToPersonType(person);
+
+                    if (!keepTypes.Contains(type, StringComparer.OrdinalIgnoreCase)
+                        && !keepTypes.Contains(person.Job ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                     {
-                        Name = tv.Name,
-                        SearchProviderName = Name,
-                        ImageUrl = string.IsNullOrWhiteSpace(tv.Poster_Path)
-                            ? null
-                            : tmdbImageUrl + tv.Poster_Path
+                        continue;
+                    }
+
+                    yield return new PersonInfo
+                    {
+                        Name = person.Name.Trim(),
+                        Role = person.Job,
+                        Type = type
                     };
-
-                    remoteResult.SetProviderId(MetadataProvider.Tmdb, tv.Id.ToString(_usCulture));
-
-                    return remoteResult;
                 }
             }
-
-            return null;
         }
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
new file mode 100644
index 0000000000..537082300d
--- /dev/null
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
@@ -0,0 +1,469 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+using TMDbLib.Client;
+using TMDbLib.Objects.Collections;
+using TMDbLib.Objects.Find;
+using TMDbLib.Objects.General;
+using TMDbLib.Objects.Movies;
+using TMDbLib.Objects.People;
+using TMDbLib.Objects.Search;
+using TMDbLib.Objects.TvShows;
+
+namespace MediaBrowser.Providers.Plugins.Tmdb
+{
+    /// <summary>
+    /// Manager class for abstracting the TMDb API client library.
+    /// </summary>
+    public class TmdbClientManager
+    {
+        private const int CacheDurationInHours = 1;
+
+        private readonly IMemoryCache _memoryCache;
+        private readonly TMDbClient _tmDbClient;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TmdbClientManager"/> class.
+        /// </summary>
+        /// <param name="memoryCache">An instance of <see cref="IMemoryCache"/>.</param>
+        public TmdbClientManager(IMemoryCache memoryCache)
+        {
+            _memoryCache = memoryCache;
+            _tmDbClient = new TMDbClient(TmdbUtils.ApiKey);
+            // Not really interested in NotFoundException
+            _tmDbClient.ThrowApiExceptions = false;
+        }
+
+        /// <summary>
+        /// Gets a movie from the TMDb API based on its TMDb id.
+        /// </summary>
+        /// <param name="tmdbId">The movie's TMDb id.</param>
+        /// <param name="language">The movie's language.</param>
+        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb movie or null if not found.</returns>
+        public async Task<Movie> GetMovieAsync(int tmdbId, string language, string imageLanguages, CancellationToken cancellationToken)
+        {
+            var key = $"movie-{tmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out Movie movie))
+            {
+                return movie;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            // TODO include image language
+            movie = await _tmDbClient.GetMovieAsync(
+                tmdbId,
+                TmdbUtils.NormalizeLanguage(language),
+                MovieMethods.Credits | MovieMethods.Releases | MovieMethods.Images | MovieMethods.Keywords | MovieMethods.Videos,
+                cancellationToken).ConfigureAwait(false);
+
+            if (movie != null)
+            {
+                _memoryCache.Set(key, movie, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return movie;
+        }
+
+        /// <summary>
+        /// Gets a collection from the TMDb API based on its TMDb id.
+        /// </summary>
+        /// <param name="tmdbId">The collection's TMDb id.</param>
+        /// <param name="language">The collection's language.</param>
+        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb collection or null if not found.</returns>
+        public async Task<Collection> GetCollectionAsync(int tmdbId, string language, string imageLanguages, CancellationToken cancellationToken)
+        {
+            var key = $"collection-{tmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out Collection collection))
+            {
+                return collection;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            // TODO include image language
+            collection = await _tmDbClient.GetCollectionAsync(
+                tmdbId,
+                TmdbUtils.NormalizeLanguage(language),
+                CollectionMethods.Images,
+                cancellationToken).ConfigureAwait(false);
+
+            if (collection != null)
+            {
+                _memoryCache.Set(key, collection, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return collection;
+        }
+
+        /// <summary>
+        /// Gets a tv show from the TMDb API based on its TMDb id.
+        /// </summary>
+        /// <param name="tmdbId">The tv show's TMDb id.</param>
+        /// <param name="language">The tv show's language.</param>
+        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb tv show information or null if not found.</returns>
+        public async Task<TvShow> GetSeriesAsync(int tmdbId, string language, string imageLanguages, CancellationToken cancellationToken)
+        {
+            var key = $"series-{tmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out TvShow series))
+            {
+                return series;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            // TODO include image language
+            series = await _tmDbClient.GetTvShowAsync(
+                tmdbId,
+                language: TmdbUtils.NormalizeLanguage(language),
+                extraMethods: TvShowMethods.Credits | TvShowMethods.Images | TvShowMethods.Keywords | TvShowMethods.ExternalIds | TvShowMethods.Videos | TvShowMethods.ContentRatings,
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            if (series != null)
+            {
+                _memoryCache.Set(key, series, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return series;
+        }
+
+        /// <summary>
+        /// Gets a tv season from the TMDb API based on the tv show's TMDb id.
+        /// </summary>
+        /// <param name="tvShowId">The tv season's TMDb id.</param>
+        /// <param name="seasonNumber">The season number.</param>
+        /// <param name="language">The tv season's language.</param>
+        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb tv season information or null if not found.</returns>
+        public async Task<TvSeason> GetSeasonAsync(int tvShowId, int seasonNumber, string language, string imageLanguages, CancellationToken cancellationToken)
+        {
+            var key = $"season-{tvShowId.ToString(CultureInfo.InvariantCulture)}-s{seasonNumber.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out TvSeason season))
+            {
+                return season;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            // TODO include image language
+            season = await _tmDbClient.GetTvSeasonAsync(
+                tvShowId,
+                seasonNumber,
+                language: TmdbUtils.NormalizeLanguage(language),
+                extraMethods: TvSeasonMethods.Credits | TvSeasonMethods.Images | TvSeasonMethods.ExternalIds | TvSeasonMethods.Videos,
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            if (season != null)
+            {
+                _memoryCache.Set(key, season, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return season;
+        }
+
+        /// <summary>
+        /// Gets a movie from the TMDb API based on the tv show's TMDb id.
+        /// </summary>
+        /// <param name="tvShowId">The tv show's TMDb id.</param>
+        /// <param name="seasonNumber">The season number.</param>
+        /// <param name="episodeNumber">The episode number.</param>
+        /// <param name="language">The episode's language.</param>
+        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb tv episode information or null if not found.</returns>
+        public async Task<TvEpisode> GetEpisodeAsync(int tvShowId, int seasonNumber, int episodeNumber, string language, string imageLanguages, CancellationToken cancellationToken)
+        {
+            var key = $"episode-{tvShowId.ToString(CultureInfo.InvariantCulture)}-s{seasonNumber.ToString(CultureInfo.InvariantCulture)}e{episodeNumber.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out TvEpisode episode))
+            {
+                return episode;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            // TODO include image language
+            episode = await _tmDbClient.GetTvEpisodeAsync(
+                tvShowId,
+                seasonNumber,
+                episodeNumber,
+                language: TmdbUtils.NormalizeLanguage(language),
+                extraMethods: TvEpisodeMethods.Credits | TvEpisodeMethods.Images | TvEpisodeMethods.ExternalIds | TvEpisodeMethods.Videos,
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            if (episode != null)
+            {
+                _memoryCache.Set(key, episode, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return episode;
+        }
+
+        /// <summary>
+        /// Gets a person eg. cast or crew member from the TMDb API based on its TMDb id.
+        /// </summary>
+        /// <param name="personTmdbId">The person's TMDb id.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb person information or null if not found.</returns>
+        public async Task<Person> GetPersonAsync(int personTmdbId, CancellationToken cancellationToken)
+        {
+            var key = $"person-{personTmdbId.ToString(CultureInfo.InvariantCulture)}";
+            if (_memoryCache.TryGetValue(key, out Person person))
+            {
+                return person;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            person = await _tmDbClient.GetPersonAsync(
+                personTmdbId,
+                PersonMethods.TvCredits | PersonMethods.MovieCredits | PersonMethods.Images | PersonMethods.ExternalIds,
+                cancellationToken).ConfigureAwait(false);
+
+            if (person != null)
+            {
+                _memoryCache.Set(key, person, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return person;
+        }
+
+        /// <summary>
+        /// Gets an item from the TMDb API based on its id from an external service eg. IMDb id, TvDb id.
+        /// </summary>
+        /// <param name="externalId">The item's external id.</param>
+        /// <param name="source">The source of the id eg. IMDb.</param>
+        /// <param name="language">The item's language.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb item or null if not found.</returns>
+        public async Task<FindContainer> FindByExternalIdAsync(
+            string externalId,
+            FindExternalSource source,
+            string language,
+            CancellationToken cancellationToken)
+        {
+            var key = $"find-{source.ToString()}-{externalId.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out FindContainer result))
+            {
+                return result;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            // TODO language
+            result = await _tmDbClient.FindAsync(
+                source,
+                externalId,
+                cancellationToken).ConfigureAwait(false);
+
+            if (result != null)
+            {
+                _memoryCache.Set(key, result, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Searches for a tv show using the TMDb API based on its name.
+        /// </summary>
+        /// <param name="name">The name of the tv show.</param>
+        /// <param name="language">The tv show's language.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb tv show information.</returns>
+        public async Task<IReadOnlyList<SearchTv>> SearchSeriesAsync(string name, string language, CancellationToken cancellationToken)
+        {
+            var key = $"searchseries-{name}-{language}";
+            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchTv> series))
+            {
+                return series.Results;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            var searchResults = await _tmDbClient
+                .SearchTvShowAsync(name, TmdbUtils.NormalizeLanguage(language), cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+
+            if (searchResults.Results.Count > 0)
+            {
+                _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return searchResults.Results;
+        }
+
+        /// <summary>
+        /// Searches for a person based on their name using the TMDb API.
+        /// </summary>
+        /// <param name="name">The name of the person.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb person information.</returns>
+        public async Task<IReadOnlyList<SearchPerson>> SearchPersonAsync(string name, CancellationToken cancellationToken)
+        {
+            var key = $"searchperson-{name}";
+            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchPerson> person))
+            {
+                return person.Results;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            var searchResults = await _tmDbClient
+                .SearchPersonAsync(name, cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+
+            if (searchResults.Results.Count > 0)
+            {
+                _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return searchResults.Results;
+        }
+
+        /// <summary>
+        /// Searches for a movie based on its name using the TMDb API.
+        /// </summary>
+        /// <param name="name">The name of the movie.</param>
+        /// <param name="language">The movie's language.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb movie information.</returns>
+        public Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, string language, CancellationToken cancellationToken)
+        {
+            return SearchMovieAsync(name, 0, language, cancellationToken);
+        }
+
+        /// <summary>
+        /// Searches for a movie based on its name using the TMDb API.
+        /// </summary>
+        /// <param name="name">The name of the movie.</param>
+        /// <param name="year">The release year of the movie.</param>
+        /// <param name="language">The movie's language.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb movie information.</returns>
+        public async Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, int year, string language, CancellationToken cancellationToken)
+        {
+            var key = $"moviesearch-{name}-{year.ToString(CultureInfo.InvariantCulture)}-{language}";
+            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchMovie> movies))
+            {
+                return movies.Results;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            var searchResults = await _tmDbClient
+                .SearchMovieAsync(name, TmdbUtils.NormalizeLanguage(language), year: year, cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+
+            if (searchResults.Results.Count > 0)
+            {
+                _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return searchResults.Results;
+        }
+
+        /// <summary>
+        /// Searches for a collection based on its name using the TMDb API.
+        /// </summary>
+        /// <param name="name">The name of the collection.</param>
+        /// <param name="language">The collection's language.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The TMDb collection information.</returns>
+        public async Task<IReadOnlyList<SearchCollection>> SearchCollectionAsync(string name, string language, CancellationToken cancellationToken)
+        {
+            var key = $"collectionsearch-{name}-{language}";
+            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchCollection> collections))
+            {
+                return collections.Results;
+            }
+
+            await EnsureClientConfigAsync().ConfigureAwait(false);
+
+            var searchResults = await _tmDbClient
+                .SearchCollectionAsync(name, TmdbUtils.NormalizeLanguage(language), cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+
+            if (searchResults.Results.Count > 0)
+            {
+                _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
+            }
+
+            return searchResults.Results;
+        }
+
+        /// <summary>
+        /// Gets the absolute URL of the poster.
+        /// </summary>
+        /// <param name="posterPath">The relative URL of the poster.</param>
+        /// <returns>The absolute URL.</returns>
+        public string GetPosterUrl(string posterPath)
+        {
+            if (string.IsNullOrEmpty(posterPath))
+            {
+                return null;
+            }
+
+            return _tmDbClient.GetImageUrl(_tmDbClient.Config.Images.PosterSizes[^1], posterPath).ToString();
+        }
+
+        /// <summary>
+        /// Gets the absolute URL of the backdrop image.
+        /// </summary>
+        /// <param name="posterPath">The relative URL of the backdrop image.</param>
+        /// <returns>The absolute URL.</returns>
+        public string GetBackdropUrl(string posterPath)
+        {
+            if (string.IsNullOrEmpty(posterPath))
+            {
+                return null;
+            }
+
+            return _tmDbClient.GetImageUrl(_tmDbClient.Config.Images.BackdropSizes[^1], posterPath).ToString();
+        }
+
+        /// <summary>
+        /// Gets the absolute URL of the profile image.
+        /// </summary>
+        /// <param name="actorProfilePath">The relative URL of the profile image.</param>
+        /// <returns>The absolute URL.</returns>
+        public string GetProfileUrl(string actorProfilePath)
+        {
+            if (string.IsNullOrEmpty(actorProfilePath))
+            {
+                return null;
+            }
+
+            return _tmDbClient.GetImageUrl(_tmDbClient.Config.Images.ProfileSizes[^1], actorProfilePath).ToString();
+        }
+
+        /// <summary>
+        /// Gets the absolute URL of the still image.
+        /// </summary>
+        /// <param name="filePath">The relative URL of the still image.</param>
+        /// <returns>The absolute URL.</returns>
+        public string GetStillUrl(string filePath)
+        {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                return null;
+            }
+
+            return _tmDbClient.GetImageUrl(_tmDbClient.Config.Images.StillSizes[^1], filePath).ToString();
+        }
+
+        private Task EnsureClientConfigAsync()
+        {
+            return !_tmDbClient.HasConfig ? _tmDbClient.GetConfigAsync() : Task.CompletedTask;
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
index 1415d69761..1fb85e1a36 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
@@ -1,7 +1,10 @@
+#nullable enable
+
 using System;
+using System.Collections.Generic;
 using System.Net.Mime;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
+using TMDbLib.Objects.General;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb
 {
@@ -30,11 +33,26 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// </summary>
         public const string ApiKey = "4219e299c89411838049ab0dab19ebd5";
 
+        /// <summary>
+        /// Maximum number of cast members to pull.
+        /// </summary>
+        public const int MaxCastMembers = 15;
+
         /// <summary>
         /// Value of the Accept header for requests to the provider.
         /// </summary>
         public static readonly string[] AcceptHeaders = { MediaTypeNames.Application.Json, "image/*" };
 
+        /// <summary>
+        /// The crew types to keep.
+        /// </summary>
+        public static readonly string[] WantedCrewTypes =
+        {
+            PersonType.Director,
+            PersonType.Writer,
+            PersonType.Producer
+        };
+
         /// <summary>
         /// Maps the TMDB provided roles for crew members to Jellyfin roles.
         /// </summary>
@@ -61,5 +79,75 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             return null;
         }
+
+        public static bool IsTrailerType(Video video)
+        {
+            return video.Site.Equals("youtube", StringComparison.OrdinalIgnoreCase)
+                   && (!video.Type.Equals("trailer", StringComparison.OrdinalIgnoreCase)
+                       || !video.Type.Equals("teaser", StringComparison.OrdinalIgnoreCase));
+        }
+
+        public static string GetImageLanguagesParam(string preferredLanguage)
+        {
+            var languages = new List<string>();
+
+            if (!string.IsNullOrEmpty(preferredLanguage))
+            {
+                preferredLanguage = NormalizeLanguage(preferredLanguage);
+
+                languages.Add(preferredLanguage);
+
+                if (preferredLanguage.Length == 5) // like en-US
+                {
+                    // Currenty, TMDB supports 2-letter language codes only
+                    // They are planning to change this in the future, thus we're
+                    // supplying both codes if we're having a 5-letter code.
+                    languages.Add(preferredLanguage.Substring(0, 2));
+                }
+            }
+
+            languages.Add("null");
+
+            if (!string.Equals(preferredLanguage, "en", StringComparison.OrdinalIgnoreCase))
+            {
+                languages.Add("en");
+            }
+
+            return string.Join(',', languages);
+        }
+
+        public static string NormalizeLanguage(string language)
+        {
+            if (string.IsNullOrEmpty(language))
+            {
+                return language;
+            }
+
+            // They require this to be uppercase
+            // Everything after the hyphen must be written in uppercase due to a way TMDB wrote their api.
+            // See here: https://www.themoviedb.org/talk/5119221d760ee36c642af4ad?page=3#56e372a0c3a3685a9e0019ab
+            var parts = language.Split('-');
+
+            if (parts.Length == 2)
+            {
+                language = parts[0] + "-" + parts[1].ToUpperInvariant();
+            }
+
+            return language;
+        }
+
+        public static string AdjustImageLanguage(string imageLanguage, string requestLanguage)
+        {
+            if (!string.IsNullOrEmpty(imageLanguage)
+                && !string.IsNullOrEmpty(requestLanguage)
+                && requestLanguage.Length > 2
+                && imageLanguage.Length == 2
+                && requestLanguage.StartsWith(imageLanguage, StringComparison.OrdinalIgnoreCase))
+            {
+                return requestLanguage;
+            }
+
+            return imageLanguage;
+        }
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs
deleted file mode 100644
index 613dc17e31..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Trailers/TmdbTrailerProvider.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Providers;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Trailers
-{
-    public class TmdbTrailerProvider : IHasOrder, IRemoteMetadataProvider<Trailer, TrailerInfo>
-    {
-        private readonly IHttpClientFactory _httpClientFactory;
-
-        public TmdbTrailerProvider(IHttpClientFactory httpClientFactory)
-        {
-            _httpClientFactory = httpClientFactory;
-        }
-
-        public string Name => TmdbMovieProvider.Current.Name;
-
-        public int Order => 0;
-
-        public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(TrailerInfo searchInfo, CancellationToken cancellationToken)
-        {
-            return TmdbMovieProvider.Current.GetMovieSearchResults(searchInfo, cancellationToken);
-        }
-
-        public Task<MetadataResult<Trailer>> GetMetadata(TrailerInfo info, CancellationToken cancellationToken)
-        {
-            return TmdbMovieProvider.Current.GetItemMetadata<Trailer>(info, cancellationToken);
-        }
-
-        public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            return _httpClientFactory.CreateClient(NamedClient.Default).GetAsync(url, cancellationToken);
-        }
-    }
-}

From 08e1f15add2bcc328c56191ff18c392263880bb6 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 19:56:11 +0200
Subject: [PATCH 188/247] Cleanup in TmdbMovieProvider

---
 .../Plugins/Tmdb/Movies/TmdbMovieProvider.cs  | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index 4dd29e773a..a5088dec4e 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -4,9 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
@@ -16,7 +14,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 {
@@ -26,30 +23,24 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
     public class TmdbMovieProvider : IRemoteMetadataProvider<Movie, MovieInfo>, IHasOrder
     {
         private readonly IHttpClientFactory _httpClientFactory;
-        private readonly ILogger<TmdbMovieProvider> _logger;
         private readonly ILibraryManager _libraryManager;
         private readonly TmdbClientManager _tmdbClientManager;
 
+        public TmdbMovieProvider(
+            ILibraryManager libraryManager,
+            TmdbClientManager tmdbClientManager,
+            IHttpClientFactory httpClientFactory)
+        {
+            _libraryManager = libraryManager;
+            _tmdbClientManager = tmdbClientManager;
+            _httpClientFactory = httpClientFactory;
+        }
+
         public string Name => TmdbUtils.ProviderName;
 
         /// <inheritdoc />
         public int Order => 1;
 
-        internal static TmdbMovieProvider Current { get; private set; }
-
-        public TmdbMovieProvider(
-            ILogger<TmdbMovieProvider> logger,
-            ILibraryManager libraryManager,
-            TmdbClientManager tmdbClientManager,
-            IHttpClientFactory httpClientFactory)
-        {
-            _logger = logger;
-            _libraryManager = libraryManager;
-            _tmdbClientManager = tmdbClientManager;
-            _httpClientFactory = httpClientFactory;
-            Current = this;
-        }
-
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
         {
             var tmdbId = Convert.ToInt32(searchInfo.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);

From 34d2716ce81087cc6a7315f90210e9816d0948c2 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 20:00:44 +0200
Subject: [PATCH 189/247] Remove TmdbSettingsResult which came back in the
 rebase

---
 .../Plugins/Tmdb/Movies/TmdbSettingsResult.cs            | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs
deleted file mode 100644
index c7ba974386..0000000000
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSettingsResult.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
-{
-    internal class TmdbSettingsResult
-    {
-        public TmdbImageSettings images { get; set; }
-    }
-}

From f8c4f7c63e3adb98dc1ad30aa01c3dd3d5c1e76c Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 20:18:45 +0200
Subject: [PATCH 190/247] Fix inverted boolean statement

---
 .../Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
index aeb0e5d34f..0feaa5732a 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var seriesTmdbId = Convert.ToInt32(series?.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
 
-            if (seriesTmdbId <= 0 || season?.IndexNumber != null)
+            if (seriesTmdbId <= 0 || season?.IndexNumber == null)
             {
                 return Enumerable.Empty<RemoteImageInfo>();
             }

From 3df2a95cac1e34f3392abbf239c9c7eb137e88cd Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 24 Sep 2020 20:31:57 +0200
Subject: [PATCH 191/247] Cleanup in TmdbUtils

---
 .../Plugins/Tmdb/TmdbUtils.cs                 | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
index 1fb85e1a36..b754a07953 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net.Mime;
 using MediaBrowser.Model.Entities;
 using TMDbLib.Objects.General;
 
@@ -18,11 +17,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// </summary>
         public const string BaseTmdbUrl = "https://www.themoviedb.org/";
 
-        /// <summary>
-        /// URL of the TMDB API instance to use.
-        /// </summary>
-        public const string BaseTmdbApiUrl = "https://api.themoviedb.org/";
-
         /// <summary>
         /// Name of the provider.
         /// </summary>
@@ -38,11 +32,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// </summary>
         public const int MaxCastMembers = 15;
 
-        /// <summary>
-        /// Value of the Accept header for requests to the provider.
-        /// </summary>
-        public static readonly string[] AcceptHeaders = { MediaTypeNames.Application.Json, "image/*" };
-
         /// <summary>
         /// The crew types to keep.
         /// </summary>
@@ -77,9 +66,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                 return PersonType.Writer;
             }
 
-            return null;
+            return string.Empty;
         }
 
+        /// <summary>
+        /// Determines whether a video is a trailer.
+        /// </summary>
+        /// <param name="video">The TMDb video.</param>
+        /// <returns>A boolean indicating whether the video is a trailer.</returns>
         public static bool IsTrailerType(Video video)
         {
             return video.Site.Equals("youtube", StringComparison.OrdinalIgnoreCase)
@@ -87,6 +81,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                        || !video.Type.Equals("teaser", StringComparison.OrdinalIgnoreCase));
         }
 
+        /// <summary>
+        /// Normalizes a language string for use with TMDb's include image language parameter.
+        /// </summary>
+        /// <param name="preferredLanguage">The preferred language as either a 2 letter code with or without country code.</param>
+        /// <returns>The comma separated language string.</returns>
         public static string GetImageLanguagesParam(string preferredLanguage)
         {
             var languages = new List<string>();
@@ -116,6 +115,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
             return string.Join(',', languages);
         }
 
+        /// <summary>
+        /// Normalizes a language string for use with TMDb's language parameter.
+        /// </summary>
+        /// <param name="language">The language code.</param>
+        /// <returns>The normalized language code.</returns>
         public static string NormalizeLanguage(string language)
         {
             if (string.IsNullOrEmpty(language))
@@ -136,6 +140,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
             return language;
         }
 
+        /// <summary>
+        /// Adjusts the image's language code preferring the 5 letter language code eg. en-US.
+        /// </summary>
+        /// <param name="imageLanguage">The image's actual language code.</param>
+        /// <param name="requestLanguage">The requested language code.</param>
+        /// <returns>The language code.</returns>
         public static string AdjustImageLanguage(string imageLanguage, string requestLanguage)
         {
             if (!string.IsNullOrEmpty(imageLanguage)

From f4d49eff9bc209743270b104cb20a3ebd4f95d4e Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 10 Sep 2020 11:05:46 +0200
Subject: [PATCH 192/247] Add keywords as tags

---
 .../Plugins/Tmdb/Movies/TmdbMovieProvider.cs              | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index a5088dec4e..b736dede1b 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -190,6 +190,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 movie.AddGenre(genre);
             }
 
+            if (movieResult.Keywords.Keywords != null)
+            {
+                for (var i = 0; i < movieResult.Keywords.Keywords.Count; i++)
+                {
+                    movie.AddTag(movieResult.Keywords.Keywords[i].Name);
+                }
+            }
+
             if (movieResult.Credits?.Cast != null)
             {
                 // TODO configurable

From 9adbf4e9d8e52ed42619b4413d1eaccaa752b37d Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Thu, 10 Sep 2020 11:05:46 +0200
Subject: [PATCH 193/247] Add keywords as tags to series + cleanup

---
 .../Plugins/Tmdb/Movies/TmdbMovieProvider.cs  |  2 +-
 .../Tmdb/People/TmdbPersonImageProvider.cs    |  2 --
 .../Plugins/Tmdb/People/TmdbPersonProvider.cs |  4 ---
 .../Plugins/Tmdb/TV/TmdbEpisodeProvider.cs    |  5 ----
 .../Tmdb/TV/TmdbSeriesImageProvider.cs        |  1 -
 .../Plugins/Tmdb/TV/TmdbSeriesProvider.cs     | 26 ++++++++-----------
 6 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index b736dede1b..3984e49537 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -190,7 +190,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 movie.AddGenre(genre);
             }
 
-            if (movieResult.Keywords.Keywords != null)
+            if (movieResult.Keywords?.Keywords != null)
             {
                 for (var i = 0; i < movieResult.Keywords.Keywords.Count; i++)
                 {
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
index 99e4176984..6e50662232 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
@@ -8,13 +8,11 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.People
 {
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
index 8c5e8590f0..856d985e4d 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
@@ -7,14 +7,10 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.People
 {
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
index b9d4a895d5..55f1ba7dcc 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
@@ -8,16 +8,11 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 {
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 0b477f75b6..122e1d47d4 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
index f110785df9..7944dfe27c 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
@@ -1,28 +1,18 @@
 #pragma warning disable CS1591
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Providers.Plugins.Tmdb.Movies;
-using Microsoft.Extensions.Logging;
 using TMDbLib.Objects.Find;
 using TMDbLib.Objects.Search;
 using TMDbLib.Objects.TvShows;
@@ -34,8 +24,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly TmdbClientManager _tmdbClientManager;
 
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
         public TmdbSeriesProvider(
             IHttpClientFactory httpClientFactory,
             TmdbClientManager tmdbClientManager)
@@ -136,7 +124,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 Overview = series.Overview
             };
 
-            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(_usCulture));
+            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(CultureInfo.InvariantCulture));
             if (series.ExternalIds != null)
             {
                 if (!string.IsNullOrEmpty(series.ExternalIds.ImdbId))
@@ -165,7 +153,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 Overview = series.Overview
             };
 
-            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(_usCulture));
+            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(CultureInfo.InvariantCulture));
             remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
 
             return remoteResult;
@@ -250,7 +238,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         {
             var series = new Series {Name = seriesResult.Name, OriginalTitle = seriesResult.OriginalName};
 
-            series.SetProviderId(MetadataProvider.Tmdb, seriesResult.Id.ToString(_usCulture));
+            series.SetProviderId(MetadataProvider.Tmdb, seriesResult.Id.ToString(CultureInfo.InvariantCulture));
 
             series.CommunityRating = Convert.ToSingle(seriesResult.VoteAverage);
 
@@ -266,6 +254,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 series.Genres = seriesResult.Genres.Select(i => i.Name).ToArray();
             }
 
+            if (seriesResult.Keywords?.Results != null)
+            {
+                for (var i = 0; i < seriesResult.Keywords.Results.Count; i++)
+                {
+                    series.AddTag(seriesResult.Keywords.Results[i].Name);
+                }
+            }
+
             series.HomePageUrl = seriesResult.Homepage;
 
             series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();

From c0f4c90d57ef32f00bdbdd4e5fa767322cd07905 Mon Sep 17 00:00:00 2001
From: Claus Vium <cvium@users.noreply.github.com>
Date: Sun, 27 Sep 2020 20:13:38 +0200
Subject: [PATCH 194/247] Apply suggestions from code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 .../Plugins/Tmdb/People/TmdbPersonImageProvider.cs              | 2 +-
 .../Plugins/Tmdb/People/TmdbPersonProvider.cs                   | 2 +-
 .../Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs                 | 1 -
 .../Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs                  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
index 6e50662232..3f57c4bc4c 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonImageProvider.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
                 return remoteImages.OrderByLanguageDescending(language);
             }
 
-            return new List<RemoteImageInfo>();
+            return Enumerable.Empty<RemoteImageInfo>();
         }
 
         public Task<HttpResponseMessage> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
index 856d985e4d..78ea2a382c 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
@@ -60,7 +60,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
             if (searchInfo.IsAutomated)
             {
                 // Don't hammer moviedb searching by name
-                return new List<RemoteSearchResult>();
+                return Enumerable.Empty<RemoteSearchResult>();
             }
 
             var personSearchResult = await _tmdbClientManager.SearchPersonAsync(searchInfo.Name, cancellationToken).ConfigureAwait(false);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
index 172db129e4..fe9e483c67 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
@@ -103,6 +103,5 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
         {
             return item is Controller.Entities.TV.Episode;
         }
-
     }
 }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 122e1d47d4..14ebf78be7 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             if (series?.Images == null)
             {
-                return Array.Empty<RemoteImageInfo>();
+                return Enumerable.Empty<RemoteImageInfo>();
             }
 
             var remoteImages = new List<RemoteImageInfo>();

From e0f21afa6285e6c4153ebc39d3524f8f7d19096c Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Mon, 28 Sep 2020 23:56:55 +0200
Subject: [PATCH 195/247] Fix build

---
 MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs | 1 +
 .../Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
index 78ea2a382c..4384c203e5 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 14ebf78be7..2fdec0196b 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

From d7cabb2e4ed601a09579b5e280d02115e476c902 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sat, 3 Oct 2020 19:36:28 +0200
Subject: [PATCH 196/247] Add image languages

---
 .../Plugins/Tmdb/TmdbClientManager.cs                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
index 537082300d..343c81ed88 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
@@ -55,10 +55,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
-            // TODO include image language
             movie = await _tmDbClient.GetMovieAsync(
                 tmdbId,
                 TmdbUtils.NormalizeLanguage(language),
+                imageLanguages,
                 MovieMethods.Credits | MovieMethods.Releases | MovieMethods.Images | MovieMethods.Keywords | MovieMethods.Videos,
                 cancellationToken).ConfigureAwait(false);
 
@@ -121,10 +121,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
-            // TODO include image language
             series = await _tmDbClient.GetTvShowAsync(
                 tmdbId,
                 language: TmdbUtils.NormalizeLanguage(language),
+                includeImageLanguage: imageLanguages,
                 extraMethods: TvShowMethods.Credits | TvShowMethods.Images | TvShowMethods.Keywords | TvShowMethods.ExternalIds | TvShowMethods.Videos | TvShowMethods.ContentRatings,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
 
@@ -155,11 +155,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
-            // TODO include image language
             season = await _tmDbClient.GetTvSeasonAsync(
                 tvShowId,
                 seasonNumber,
                 language: TmdbUtils.NormalizeLanguage(language),
+                includeImageLanguage: imageLanguages,
                 extraMethods: TvSeasonMethods.Credits | TvSeasonMethods.Images | TvSeasonMethods.ExternalIds | TvSeasonMethods.Videos,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
 
@@ -191,12 +191,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
-            // TODO include image language
             episode = await _tmDbClient.GetTvEpisodeAsync(
                 tvShowId,
                 seasonNumber,
                 episodeNumber,
                 language: TmdbUtils.NormalizeLanguage(language),
+                includeImageLanguage: imageLanguages,
                 extraMethods: TvEpisodeMethods.Credits | TvEpisodeMethods.Images | TvEpisodeMethods.ExternalIds | TvEpisodeMethods.Videos,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
 
@@ -259,10 +259,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
-            // TODO language
             result = await _tmDbClient.FindAsync(
                 source,
                 externalId,
+                TmdbUtils.NormalizeLanguage(language),
                 cancellationToken).ConfigureAwait(false);
 
             if (result != null)

From a0862c933d0479cf6672b8ba3b50c40f9c763663 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sat, 3 Oct 2020 19:45:16 +0200
Subject: [PATCH 197/247] Add image languages to collections

---
 MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
index 343c81ed88..2dc5cd55da 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
@@ -88,10 +88,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
 
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
-            // TODO include image language
             collection = await _tmDbClient.GetCollectionAsync(
                 tmdbId,
                 TmdbUtils.NormalizeLanguage(language),
+                imageLanguages,
                 CollectionMethods.Images,
                 cancellationToken).ConfigureAwait(false);
 

From 24dfa097fa08ab688129e94c458824ac1fc9439c Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sat, 3 Oct 2020 19:46:13 +0200
Subject: [PATCH 198/247] Update TMDbLib version

---
 MediaBrowser.Providers/MediaBrowser.Providers.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 11e30940fd..794490cc52 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="OptimizedPriorityQueue" Version="4.2.0" />
     <PackageReference Include="PlaylistsNET" Version="1.1.2" />
-    <PackageReference Include="TMDbLib" Version="1.7.1-alpha" />
+    <PackageReference Include="TMDbLib" Version="1.7.3-alpha" />
     <PackageReference Include="TvDbSharper" Version="3.2.2" />
   </ItemGroup>
 

From a839b015f948fb8dee665d37f6ecb3796675da8a Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sat, 3 Oct 2020 21:24:04 +0200
Subject: [PATCH 199/247] Disable invalid auth provider

---
 Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs b/Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs
index e38cd07f0e..5f32479e1d 100644
--- a/Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs
@@ -15,7 +15,7 @@ namespace Jellyfin.Server.Implementations.Users
         public string Name => "InvalidOrMissingAuthenticationProvider";
 
         /// <inheritdoc />
-        public bool IsEnabled => true;
+        public bool IsEnabled => false;
 
         /// <inheritdoc />
         public Task<ProviderAuthenticationResult> Authenticate(string username, string password)

From 7cec65b97390dd9fc5fe75a81eb69d61d48329c5 Mon Sep 17 00:00:00 2001
From: Matt Montgomery <33811686+ConfusedPolarBear@users.noreply.github.com>
Date: Sat, 3 Oct 2020 14:35:57 -0500
Subject: [PATCH 200/247] Update documentation

---
 Jellyfin.Api/Controllers/ImageController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Api/Controllers/ImageController.cs b/Jellyfin.Api/Controllers/ImageController.cs
index 6f925dec58..05efe23553 100644
--- a/Jellyfin.Api/Controllers/ImageController.cs
+++ b/Jellyfin.Api/Controllers/ImageController.cs
@@ -333,7 +333,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="quality">Optional. Quality setting, from 0-100. Defaults to 90 and should suffice in most cases.</param>
         /// <param name="tag">Optional. Supply the cache tag from the item object to receive strong caching headers.</param>
         /// <param name="cropWhitespace">Optional. Specify if whitespace should be cropped out of the image. True/False. If unspecified, whitespace will be cropped from logos and clear art.</param>
-        /// <param name="format">Determines the output format of the image - original,gif,jpg,png.</param>
+        /// <param name="format">Optional. The <see cref="ImageFormat"/> of the returned image.</param>
         /// <param name="addPlayedIndicator">Optional. Add a played indicator.</param>
         /// <param name="percentPlayed">Optional. Percent to render for the percent played overlay.</param>
         /// <param name="unplayedCount">Optional. Unplayed count overlay to render.</param>

From d7dc15971ec2fd3598dbc0d60faed1d3aa57d40a Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 4 Oct 2020 16:26:43 +0200
Subject: [PATCH 201/247] Add roundtrip test

---
 .../Json/JsonGuidConverterTests.cs                     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs b/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs
index aef5b3a7d7..d9e66d6774 100644
--- a/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs
+++ b/tests/Jellyfin.Common.Tests/Json/JsonGuidConverterTests.cs
@@ -18,5 +18,15 @@ namespace Jellyfin.Common.Tests.Extensions
             value = JsonSerializer.Deserialize<Guid>(@"""e9b2dcaa-529c-426e-9433-5e9981f27f2e""", options);
             Assert.Equal(new Guid("e9b2dcaa-529c-426e-9433-5e9981f27f2e"), value);
         }
+
+        [Fact]
+        public static void Roundtrip_Valid_Success()
+        {
+            var options = new JsonSerializerOptions();
+            options.Converters.Add(new JsonGuidConverter());
+            Guid guid = new Guid("a852a27afe324084ae66db579ee3ee18");
+            string value = JsonSerializer.Serialize(guid, options);
+            Assert.Equal(guid, JsonSerializer.Deserialize<Guid>(value, options));
+        }
     }
 }

From f0556c8dedf05683488aee901b7f3d57bebcdc62 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 4 Oct 2020 16:27:34 +0200
Subject: [PATCH 202/247] Improve GroupInfo class

* Fixed docs
* Remove extra dictionary lookups
* change property to constant
---
 MediaBrowser.Controller/SyncPlay/GroupInfo.cs | 52 ++++++++-----------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/MediaBrowser.Controller/SyncPlay/GroupInfo.cs b/MediaBrowser.Controller/SyncPlay/GroupInfo.cs
index e742df5179..a1cada25cc 100644
--- a/MediaBrowser.Controller/SyncPlay/GroupInfo.cs
+++ b/MediaBrowser.Controller/SyncPlay/GroupInfo.cs
@@ -14,12 +14,12 @@ namespace MediaBrowser.Controller.SyncPlay
     public class GroupInfo
     {
         /// <summary>
-        /// Gets the default ping value used for sessions.
+        /// The default ping value used for sessions.
         /// </summary>
-        public long DefaultPing { get; } = 500;
+        public const long DefaultPing = 500;
 
         /// <summary>
-        /// Gets or sets the group identifier.
+        /// Gets the group identifier.
         /// </summary>
         /// <value>The group identifier.</value>
         public Guid GroupId { get; } = Guid.NewGuid();
@@ -58,7 +58,8 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <summary>
         /// Checks if a session is in this group.
         /// </summary>
-        /// <value><c>true</c> if the session is in this group; <c>false</c> otherwise.</value>
+        /// <param name="sessionId">The session id to check.</param>
+        /// <returns><c>true</c> if the session is in this group; <c>false</c> otherwise.</returns>
         public bool ContainsSession(string sessionId)
         {
             return Participants.ContainsKey(sessionId);
@@ -70,16 +71,14 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         public void AddSession(SessionInfo session)
         {
-            if (ContainsSession(session.Id))
-            {
-                return;
-            }
-
-            var member = new GroupMember();
-            member.Session = session;
-            member.Ping = DefaultPing;
-            member.IsBuffering = false;
-            Participants[session.Id] = member;
+            Participants.TryAdd(
+                session.Id,
+                new GroupMember
+                {
+                    Session = session,
+                    Ping = DefaultPing,
+                    IsBuffering = false
+                });
         }
 
         /// <summary>
@@ -88,12 +87,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="session">The session.</param>
         public void RemoveSession(SessionInfo session)
         {
-            if (!ContainsSession(session.Id))
-            {
-                return;
-            }
-
-            Participants.Remove(session.Id, out _);
+            Participants.Remove(session.Id);
         }
 
         /// <summary>
@@ -103,18 +97,16 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="ping">The ping.</param>
         public void UpdatePing(SessionInfo session, long ping)
         {
-            if (!ContainsSession(session.Id))
+            if (Participants.TryGetValue(session.Id, out GroupMember value))
             {
-                return;
+                value.Ping = ping;
             }
-
-            Participants[session.Id].Ping = ping;
         }
 
         /// <summary>
         /// Gets the highest ping in the group.
         /// </summary>
-        /// <value name="session">The highest ping in the group.</value>
+        /// <returns>The highest ping in the group.</returns>
         public long GetHighestPing()
         {
             long max = long.MinValue;
@@ -133,18 +125,16 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <param name="isBuffering">The state.</param>
         public void SetBuffering(SessionInfo session, bool isBuffering)
         {
-            if (!ContainsSession(session.Id))
+            if (Participants.TryGetValue(session.Id, out GroupMember value))
             {
-                return;
+                value.IsBuffering = isBuffering;
             }
-
-            Participants[session.Id].IsBuffering = isBuffering;
         }
 
         /// <summary>
         /// Gets the group buffering state.
         /// </summary>
-        /// <value><c>true</c> if there is a session buffering in the group; <c>false</c> otherwise.</value>
+        /// <returns><c>true</c> if there is a session buffering in the group; <c>false</c> otherwise.</returns>
         public bool IsBuffering()
         {
             foreach (var session in Participants.Values)
@@ -161,7 +151,7 @@ namespace MediaBrowser.Controller.SyncPlay
         /// <summary>
         /// Checks if the group is empty.
         /// </summary>
-        /// <value><c>true</c> if the group is empty; <c>false</c> otherwise.</value>
+        /// <returns><c>true</c> if the group is empty; <c>false</c> otherwise.</returns>
         public bool IsEmpty()
         {
             return Participants.Count == 0;

From e96d41d5ef3b438437853e155578bf2dece4ad51 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 4 Oct 2020 16:45:00 +0200
Subject: [PATCH 203/247] Fix build

---
 .../SyncPlay/SyncPlayController.cs                        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayController.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayController.cs
index 80b977731c..5384795122 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayController.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayController.cs
@@ -301,8 +301,7 @@ namespace Emby.Server.Implementations.SyncPlay
             if (_group.IsPaused)
             {
                 // Pick a suitable time that accounts for latency
-                var delay = _group.GetHighestPing() * 2;
-                delay = delay < _group.DefaultPing ? _group.DefaultPing : delay;
+                var delay = Math.Max(_group.GetHighestPing() * 2, GroupInfo.DefaultPing);
 
                 // Unpause group and set starting point in future
                 // Clients will start playback at LastActivity (datetime) from PositionTicks (playback position)
@@ -452,8 +451,7 @@ namespace Emby.Server.Implementations.SyncPlay
                     else
                     {
                         // Client, that was buffering, resumed playback but did not update others in time
-                        delay = _group.GetHighestPing() * 2;
-                        delay = delay < _group.DefaultPing ? _group.DefaultPing : delay;
+                        delay = Math.Max(_group.GetHighestPing() * 2, GroupInfo.DefaultPing);
 
                         _group.LastActivity = currentTime.AddMilliseconds(
                             delay);
@@ -497,7 +495,7 @@ namespace Emby.Server.Implementations.SyncPlay
         private void HandlePingUpdateRequest(SessionInfo session, PlaybackRequest request)
         {
             // Collected pings are used to account for network latency when unpausing playback
-            _group.UpdatePing(session, request.Ping ?? _group.DefaultPing);
+            _group.UpdatePing(session, request.Ping ?? GroupInfo.DefaultPing);
         }
 
         /// <inheritdoc />

From 5a7dda337f4cdda0d0c61adef3d2b13772e708d0 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 11:50:00 -0400
Subject: [PATCH 204/247] Add active session tracking

Adds a flag for a maximum number of user sessions, as well as an
authentication check to ensure that the user is not above this level.
---
 .../Session/SessionManager.cs                       | 13 +++++++++++++
 Jellyfin.Data/Entities/User.cs                      |  5 +++++
 .../Users/UserManager.cs                            |  2 ++
 MediaBrowser.Model/Users/UserPolicy.cs              |  6 ++++++
 4 files changed, 26 insertions(+)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index e42d478533..5903d395a2 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1484,6 +1484,19 @@ namespace Emby.Server.Implementations.Session
                 throw new SecurityException("User is not allowed access from this device.");
             }
 
+            var sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
+            int maxActiveSessions = user.MaxActiveSessions;
+            _logger.LogDebug("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
+            if (maxActiveSessions >= 0 && sessionsCount >= maxActiveSessions)
+            {
+                throw new SecurityException(
+                    "User {User} is at their maximum number of sessions ({Sessions}/{Max}).",
+                    user.Username,
+                    sessionsCount,
+                    maxActiveSessions
+                )
+            }
+
             var token = GetAuthorizationToken(user, request.DeviceId, request.App, request.AppVersion, request.DeviceName);
 
             var session = LogSessionActivity(
diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index f7ab57a1b1..daa4de0b57 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -188,6 +188,11 @@ namespace Jellyfin.Data.Entities
         /// </summary>
         public int? LoginAttemptsBeforeLockout { get; set; }
 
+        /// <summary>
+        /// Gets or sets the maximum number of active sessions the user can have at once.
+        /// </summary>
+        public int? MaxActiveSessions { get; set; }
+
         /// <summary>
         /// Gets or sets the subtitle mode.
         /// </summary>
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 8f04baa089..43698efb75 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -379,6 +379,7 @@ namespace Jellyfin.Server.Implementations.Users
                     PasswordResetProviderId = user.PasswordResetProviderId,
                     InvalidLoginAttemptCount = user.InvalidLoginAttemptCount,
                     LoginAttemptsBeforeLockout = user.LoginAttemptsBeforeLockout ?? -1,
+                    MaxActiveSessions = user.MaxActiveSessions ?? -1,
                     IsAdministrator = user.HasPermission(PermissionKind.IsAdministrator),
                     IsHidden = user.HasPermission(PermissionKind.IsHidden),
                     IsDisabled = user.HasPermission(PermissionKind.IsDisabled),
@@ -701,6 +702,7 @@ namespace Jellyfin.Server.Implementations.Users
             user.PasswordResetProviderId = policy.PasswordResetProviderId;
             user.InvalidLoginAttemptCount = policy.InvalidLoginAttemptCount;
             user.LoginAttemptsBeforeLockout = maxLoginAttempts;
+            user.MaxActiveSessions = policy.MaxActiveSessions;
             user.SyncPlayAccess = policy.SyncPlayAccess;
             user.SetPermission(PermissionKind.IsAdministrator, policy.IsAdministrator);
             user.SetPermission(PermissionKind.IsHidden, policy.IsHidden);
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index a1f01f7e8e..53dcb6bbd8 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -92,6 +92,10 @@ namespace MediaBrowser.Model.Users
 
         public int LoginAttemptsBeforeLockout { get; set; }
 
+        public int ActiveSessionCount { get; set; }
+
+        public int MaxActiveSessions { get; set; }
+
         public bool EnablePublicSharing { get; set; }
 
         public Guid[] BlockedMediaFolders { get; set; }
@@ -144,6 +148,8 @@ namespace MediaBrowser.Model.Users
 
             LoginAttemptsBeforeLockout = -1;
 
+            MaxActiveSessions = -1;
+
             EnableAllChannels = true;
             EnabledChannels = Array.Empty<Guid>();
 

From b9d79d7635aa39052244f356e699bc125c88bc34 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:14:32 -0400
Subject: [PATCH 205/247] Add DB migration for new MaxActiveSessions field

---
 ...201004171403_MaxActiveSessions.Designer.cs | 462 ++++++++++++++++++
 .../20201004171403_MaxActiveSessions.cs       |  24 +
 .../Migrations/JellyfinDbModelSnapshot.cs     |   5 +-
 3 files changed, 490 insertions(+), 1 deletion(-)
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs

diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
new file mode 100644
index 0000000000..65a25c16de
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
@@ -0,0 +1,462 @@
+// <auto-generated />
+using System;
+using Jellyfin.Server.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    [DbContext(typeof(JellyfinDb))]
+    [Migration("20201004171403_MaxActiveSessions")]
+    partial class MaxActiveSessions
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("jellyfin")
+                .HasAnnotation("ProductVersion", "3.1.8");
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DayOfWeek")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("EndHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("StartHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccessSchedules");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ItemId")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.Property<int>("LogSeverity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(512);
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShortOverview")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityLogs");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChromecastVersion")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(32);
+
+                    b.Property<string>("DashboardTheme")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(32);
+
+                    b.Property<bool>("EnableNextVideoInfoOverlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ScrollDirection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowBackdrop")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowSidebar")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipBackwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipForwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TvHome")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(32);
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "Client")
+                        .IsUnique();
+
+                    b.ToTable("DisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DisplayPreferencesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayPreferencesId");
+
+                    b.ToTable("HomeSection");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(512);
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("ImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(32);
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RememberIndexing")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSorting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(64);
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ViewType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Permission_Permissions_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Permission_Permissions_Guid");
+
+                    b.ToTable("Permissions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Preference_Preferences_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(65535);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Preference_Preferences_Guid");
+
+                    b.ToTable("Preferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudioLanguagePreference")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("AuthenticationProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(255);
+
+                    b.Property<bool>("DisplayCollectionsView")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayMissingEpisodes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EasyPassword")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(65535);
+
+                    b.Property<bool>("EnableAutoLogin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableLocalPassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableNextEpisodeAutoPlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableUserPreferenceAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HidePlayedInLatest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("InternalId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InvalidLoginAttemptCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastActivityDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LoginAttemptsBeforeLockout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxParentalAgeRating")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("MustUpdatePassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Password")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(65535);
+
+                    b.Property<string>("PasswordResetProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(255);
+
+                    b.Property<bool>("PlayDefaultAudioTrack")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberAudioSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSubtitleSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("RemoteClientBitrateLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SubtitleLanguagePreference")
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(255);
+
+                    b.Property<int>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SyncPlayAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(255);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("AccessSchedules")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("DisplayPreferences")
+                        .HasForeignKey("Jellyfin.Data.Entities.DisplayPreferences", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
+                        .WithMany("HomeSections")
+                        .HasForeignKey("DisplayPreferencesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("ProfileImage")
+                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("ItemDisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Permissions")
+                        .HasForeignKey("Permission_Permissions_Guid");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Preferences")
+                        .HasForeignKey("Preference_Preferences_Guid");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
new file mode 100644
index 0000000000..4ce6a7bd89
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    public partial class MaxActiveSessions : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "MaxActiveSessions",
+                schema: "jellyfin",
+                table: "Users",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MaxActiveSessions",
+                schema: "jellyfin",
+                table: "Users");
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
index ccfcf96b1f..3c9e1aee4b 100644
--- a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
+++ b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
@@ -15,7 +15,7 @@ namespace Jellyfin.Server.Implementations.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("jellyfin")
-                .HasAnnotation("ProductVersion", "3.1.7");
+                .HasAnnotation("ProductVersion", "3.1.8");
 
             modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
                 {
@@ -344,6 +344,9 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Property<int?>("LoginAttemptsBeforeLockout")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int?>("MaxParentalAgeRating")
                         .HasColumnType("INTEGER");
 

From 975fca51583de23bafb6720104a2a6857ab29b18 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:19:56 -0400
Subject: [PATCH 206/247] Fix syntax error

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 5903d395a2..ac59fe3860 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1494,7 +1494,7 @@ namespace Emby.Server.Implementations.Session
                     user.Username,
                     sessionsCount,
                     maxActiveSessions
-                )
+                );
             }
 
             var token = GetAuthorizationToken(user, request.DeviceId, request.App, request.AppVersion, request.DeviceName);

From 2577595bac615fc74c8d4b21bd0ce925a1b21b7b Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:23:20 -0400
Subject: [PATCH 207/247] Remove obsolete getter

---
 MediaBrowser.Model/Users/UserPolicy.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 53dcb6bbd8..9d3a1ca4db 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -92,8 +92,6 @@ namespace MediaBrowser.Model.Users
 
         public int LoginAttemptsBeforeLockout { get; set; }
 
-        public int ActiveSessionCount { get; set; }
-
         public int MaxActiveSessions { get; set; }
 
         public bool EnablePublicSharing { get; set; }

From a9e5f6e770edec9c768bf9365fbb2dac26f0b7c1 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:25:07 -0400
Subject: [PATCH 208/247] Remove nullable from MaxActiveSessions

---
 Jellyfin.Data/Entities/User.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index daa4de0b57..6d46819143 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -191,7 +191,7 @@ namespace Jellyfin.Data.Entities
         /// <summary>
         /// Gets or sets the maximum number of active sessions the user can have at once.
         /// </summary>
-        public int? MaxActiveSessions { get; set; }
+        public int MaxActiveSessions { get; set; }
 
         /// <summary>
         /// Gets or sets the subtitle mode.

From b130af1b0c869fa6a35be4a53510e0f0fa4ad0d3 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:29:18 -0400
Subject: [PATCH 209/247] Remove variables from SecurityException

---
 Emby.Server.Implementations/Session/SessionManager.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index ac59fe3860..46fa29919a 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1489,12 +1489,7 @@ namespace Emby.Server.Implementations.Session
             _logger.LogDebug("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
             if (maxActiveSessions >= 0 && sessionsCount >= maxActiveSessions)
             {
-                throw new SecurityException(
-                    "User {User} is at their maximum number of sessions ({Sessions}/{Max}).",
-                    user.Username,
-                    sessionsCount,
-                    maxActiveSessions
-                );
+                throw new SecurityException("User is at their maximum number of sessions.");
             }
 
             var token = GetAuthorizationToken(user, request.DeviceId, request.App, request.AppVersion, request.DeviceName);

From 6e1d1eed23442976ac0d9b2a2af44b7a6804ea09 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:30:21 -0400
Subject: [PATCH 210/247] Make log entry informational

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 46fa29919a..cd40bda556 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1486,7 +1486,7 @@ namespace Emby.Server.Implementations.Session
 
             var sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
             int maxActiveSessions = user.MaxActiveSessions;
-            _logger.LogDebug("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
+            _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
             if (maxActiveSessions >= 0 && sessionsCount >= maxActiveSessions)
             {
                 throw new SecurityException("User is at their maximum number of sessions.");

From cd328a0be3a8a3e20c51eb999f1b858d5263bab1 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:34:53 -0400
Subject: [PATCH 211/247] Remove default set for MaxActiveSessions

---
 Jellyfin.Server.Implementations/Users/UserManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 43698efb75..d8ec2a3cdf 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -379,7 +379,7 @@ namespace Jellyfin.Server.Implementations.Users
                     PasswordResetProviderId = user.PasswordResetProviderId,
                     InvalidLoginAttemptCount = user.InvalidLoginAttemptCount,
                     LoginAttemptsBeforeLockout = user.LoginAttemptsBeforeLockout ?? -1,
-                    MaxActiveSessions = user.MaxActiveSessions ?? -1,
+                    MaxActiveSessions = user.MaxActiveSessions,
                     IsAdministrator = user.HasPermission(PermissionKind.IsAdministrator),
                     IsHidden = user.HasPermission(PermissionKind.IsHidden),
                     IsDisabled = user.HasPermission(PermissionKind.IsDisabled),

From 725acb528aab34df5cd5c6b6e552e5f5e54b7fea Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 13:43:20 -0400
Subject: [PATCH 212/247] Add pragma warning disabled to migrations

---
 .../Migrations/20201004171403_MaxActiveSessions.Designer.cs  | 4 +++-
 .../Migrations/20201004171403_MaxActiveSessions.cs           | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
index 65a25c16de..9eac077bda 100644
--- a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
@@ -1,4 +1,6 @@
-// <auto-generated />
+#pragma warning disable CS1591
+
+// <auto-generated />
 using System;
 using Jellyfin.Server.Implementations;
 using Microsoft.EntityFrameworkCore;
diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
index 4ce6a7bd89..f6ed3c66cd 100644
--- a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
@@ -1,4 +1,7 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+#pragma warning disable CS1591
+#pragma warning disable SA1601
+
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Jellyfin.Server.Implementations.Migrations
 {

From d0ec6872f3418a3bc6bacff6ba068526f45fc167 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 14:06:20 -0400
Subject: [PATCH 213/247] Increase count check to 1

There's another way to disable a user anyways.
---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index cd40bda556..90363e5603 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1487,7 +1487,7 @@ namespace Emby.Server.Implementations.Session
             var sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
             int maxActiveSessions = user.MaxActiveSessions;
             _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
-            if (maxActiveSessions >= 0 && sessionsCount >= maxActiveSessions)
+            if (maxActiveSessions >= 1 && sessionsCount >= maxActiveSessions)
             {
                 throw new SecurityException("User is at their maximum number of sessions.");
             }

From 8dfa2015d0e804227fe9db09caf21315da7495e4 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 14:14:42 -0400
Subject: [PATCH 214/247] Make the count an int for cleanliness

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 90363e5603..04becff49c 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1484,7 +1484,7 @@ namespace Emby.Server.Implementations.Session
                 throw new SecurityException("User is not allowed access from this device.");
             }
 
-            var sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
+            int sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
             int maxActiveSessions = user.MaxActiveSessions;
             _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
             if (maxActiveSessions >= 1 && sessionsCount >= maxActiveSessions)

From 5aa519fd399d8b09a360f6448acc992225f8c219 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 15:46:57 -0400
Subject: [PATCH 215/247] Implement better count method

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 04becff49c..d283ee8d8b 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1484,7 +1484,7 @@ namespace Emby.Server.Implementations.Session
                 throw new SecurityException("User is not allowed access from this device.");
             }
 
-            int sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
+            int sessionsCount = Sessions.Count(i => string.Equals(i.UserId, user.Id, StringComparison.OrdinalIgnoreCase));
             int maxActiveSessions = user.MaxActiveSessions;
             _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
             if (maxActiveSessions >= 1 && sessionsCount >= maxActiveSessions)

From df177b47524c0f7c5df21f32ebeaba5576d3f8a4 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 15:52:39 -0400
Subject: [PATCH 216/247] Revert "Implement better count method"

This reverts commit 5aa519fd399d8b09a360f6448acc992225f8c219.
---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index d283ee8d8b..04becff49c 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1484,7 +1484,7 @@ namespace Emby.Server.Implementations.Session
                 throw new SecurityException("User is not allowed access from this device.");
             }
 
-            int sessionsCount = Sessions.Count(i => string.Equals(i.UserId, user.Id, StringComparison.OrdinalIgnoreCase));
+            int sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
             int maxActiveSessions = user.MaxActiveSessions;
             _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
             if (maxActiveSessions >= 1 && sessionsCount >= maxActiveSessions)

From 67e89dd5255a8ae38e0f0f489595d290e718b7a1 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 16:57:48 -0400
Subject: [PATCH 217/247] Use nicer count comparitor

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 04becff49c..fa4caeb18c 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1484,7 +1484,7 @@ namespace Emby.Server.Implementations.Session
                 throw new SecurityException("User is not allowed access from this device.");
             }
 
-            int sessionsCount = Sessions.Where(i => string.Equals(i.UserId, user.Id)).ToList().Count;
+            int sessionsCount = Sessions.Count(i => i.UserId.Equals(user.Id));
             int maxActiveSessions = user.MaxActiveSessions;
             _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
             if (maxActiveSessions >= 1 && sessionsCount >= maxActiveSessions)

From fc28ffea53861ea7e8c35d71dcf863e4900f4d8f Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 19:03:39 -0400
Subject: [PATCH 218/247] Improve handling of apiclient generator

1. Replace the separate stable/unstable scripts with a single script and
handle the difference with argument parsing.
2. Unify the calls and pass the Azure arguments in on the CLI.
---
 .ci/azure-pipelines-api-client.yml            |  4 ++--
 .../templates/typescript/axios/generate.sh    | 19 +++++++++++++++++++
 .../templates/typescript/axios/stable.sh      |  9 ---------
 .../templates/typescript/axios/unstable.sh    |  9 ---------
 4 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 apiclient/templates/typescript/axios/generate.sh
 delete mode 100644 apiclient/templates/typescript/axios/stable.sh
 delete mode 100644 apiclient/templates/typescript/axios/unstable.sh

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index 7f428aec15..d120593ea8 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -34,7 +34,7 @@ jobs:
       displayName: 'Build unstable typescript axios client'
       condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
       inputs:
-        script: 'bash ./apiclient/templates/typescript/axios/unstable.sh'
+        script: "bash ./apiclient/templates/typescript/axios/generate.sh $(System.ArtifactsDirectory) $(Build.BuildNumber)"
 
     - task: Npm@1
       displayName: 'Publish unstable typescript axios client'
@@ -50,7 +50,7 @@ jobs:
       displayName: 'Build stable typescript axios client'
       condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
       inputs:
-        script: 'bash ./apiclient/templates/typescript/axios/stable.sh'
+        script: "bash ./apiclient/templates/typescript/axios/generate.sh $(System.ArtifactsDirectory)"
 
     - task: Npm@1
       displayName: 'Publish stable typescript axios client'
diff --git a/apiclient/templates/typescript/axios/generate.sh b/apiclient/templates/typescript/axios/generate.sh
new file mode 100644
index 0000000000..c514b10d5b
--- /dev/null
+++ b/apiclient/templates/typescript/axios/generate.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+artifactsDirectory="${1}"
+buildNumber="${2}"
+if [[ -n ${buildNumber} ]]; then
+    # Unstable build
+    additionalProperties=",snapshotVersion=\"-SNAPSHOT.${buildNumber}\",npmRepository=\"https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable/npm/registry/\""
+else
+    # Stable build
+    additionalProperties=""
+fi
+
+java -jar openapi-generator-cli.jar generate \
+    --input-spec ${artifactsDirectory}/openapispec/openapi.json \
+    --generator-name typescript-axios \
+    --output ./apiclient/generated/typescript/axios  \
+    --template-dir ./apiclient/templates/typescript/axios \
+    --ignore-file-override ./apiclient/.openapi-generator-ignore \
+    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios"${additionalProperties}
diff --git a/apiclient/templates/typescript/axios/stable.sh b/apiclient/templates/typescript/axios/stable.sh
deleted file mode 100644
index 118ef219fe..0000000000
--- a/apiclient/templates/typescript/axios/stable.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapispec/openapi.json \
-    --generator-name typescript-axios \
-    --output ./apiclient/generated/typescript/axios  \
-    --template-dir ./apiclient/templates/typescript/axios \
-    --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios"
diff --git a/apiclient/templates/typescript/axios/unstable.sh b/apiclient/templates/typescript/axios/unstable.sh
deleted file mode 100644
index be9f9be438..0000000000
--- a/apiclient/templates/typescript/axios/unstable.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-java -jar openapi-generator-cli.jar generate \
-    --input-spec $(System.ArtifactsDirectory)/openapispec/openapi.json \
-    --generator-name typescript-axios \
-    --output ./apiclient/generated/typescript/axios  \
-    --template-dir ./apiclient/templates/typescript/axios \
-    --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios",snapshotVersion="-SNAPSHOT.$(Build.BuildNumber)",npmRepository="https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable/npm/registry/"

From 88bc2fa3ec1dac87981bb9ab559b3e2da11cf580 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 19:50:54 -0400
Subject: [PATCH 219/247] Just make everything under libdir/jf a wildcard

I don't know if this will actually work but maybe it will.
---
 fedora/jellyfin.spec | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/fedora/jellyfin.spec b/fedora/jellyfin.spec
index bfb2b3be29..93fb9fb411 100644
--- a/fedora/jellyfin.spec
+++ b/fedora/jellyfin.spec
@@ -79,15 +79,7 @@ EOF
 
 %files server
 %attr(755,root,root) %{_bindir}/jellyfin
-%{_libdir}/jellyfin/*.json
-%{_libdir}/jellyfin/*.dll
-%{_libdir}/jellyfin/*.so
-%{_libdir}/jellyfin/*.a
-%{_libdir}/jellyfin/createdump
-%{_libdir}/jellyfin/*.xml
-%{_libdir}/jellyfin/wwwroot/api-docs/*
-%{_libdir}/jellyfin/wwwroot/api-docs/redoc/*
-%{_libdir}/jellyfin/wwwroot/api-docs/swagger/*
+%{_libdir}/jellyfin/*
 # Needs 755 else only root can run it since binary build by dotnet is 722
 %attr(755,root,root) %{_libdir}/jellyfin/jellyfin
 %{_libdir}/jellyfin/SOS_README.md

From 1bfe9713afe6abfc7845e3ab61f4a25f3c0df520 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 20:24:35 -0400
Subject: [PATCH 220/247] Make MaxSessions default 0

---
 MediaBrowser.Model/Users/UserPolicy.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 9d3a1ca4db..363b2633fd 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -146,7 +146,7 @@ namespace MediaBrowser.Model.Users
 
             LoginAttemptsBeforeLockout = -1;
 
-            MaxActiveSessions = -1;
+            MaxActiveSessions = 0;
 
             EnableAllChannels = true;
             EnabledChannels = Array.Empty<Guid>();

From 4d7e7d6331243bd339464bd6010569c6c308088b Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sat, 3 Oct 2020 21:14:25 -0400
Subject: [PATCH 221/247] Rewrite activity log backend to use a query class.

---
 .../Controllers/ActivityLogController.cs      | 20 +++++-----
 Jellyfin.Data/Queries/ActivityLogQuery.cs     | 30 +++++++++++++++
 .../Activity/ActivityManager.cs               | 37 ++++++++-----------
 .../Activity/IActivityManager.cs              |  9 +----
 4 files changed, 58 insertions(+), 38 deletions(-)
 create mode 100644 Jellyfin.Data/Queries/ActivityLogQuery.cs

diff --git a/Jellyfin.Api/Controllers/ActivityLogController.cs b/Jellyfin.Api/Controllers/ActivityLogController.cs
index a07cea9c0c..b429cebecb 100644
--- a/Jellyfin.Api/Controllers/ActivityLogController.cs
+++ b/Jellyfin.Api/Controllers/ActivityLogController.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Linq;
+using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
-using Jellyfin.Data.Entities;
+using Jellyfin.Data.Queries;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Authorization;
@@ -39,19 +39,19 @@ namespace Jellyfin.Api.Controllers
         /// <returns>A <see cref="QueryResult{ActivityLogEntry}"/> containing the log entries.</returns>
         [HttpGet("Entries")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<QueryResult<ActivityLogEntry>> GetLogEntries(
+        public async Task<ActionResult<QueryResult<ActivityLogEntry>>> GetLogEntries(
             [FromQuery] int? startIndex,
             [FromQuery] int? limit,
             [FromQuery] DateTime? minDate,
             [FromQuery] bool? hasUserId)
         {
-            var filterFunc = new Func<IQueryable<ActivityLog>, IQueryable<ActivityLog>>(
-                entries => entries.Where(entry => entry.DateCreated >= minDate
-                                                  && (!hasUserId.HasValue || (hasUserId.Value
-                                                      ? entry.UserId != Guid.Empty
-                                                      : entry.UserId == Guid.Empty))));
-
-            return _activityManager.GetPagedResult(filterFunc, startIndex, limit);
+            return await _activityManager.GetPagedResultAsync(new ActivityLogQuery
+            {
+                StartIndex = startIndex,
+                Limit = limit,
+                MinDate = minDate,
+                HasUserId = hasUserId
+            }).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Data/Queries/ActivityLogQuery.cs b/Jellyfin.Data/Queries/ActivityLogQuery.cs
new file mode 100644
index 0000000000..92919d3a51
--- /dev/null
+++ b/Jellyfin.Data/Queries/ActivityLogQuery.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Jellyfin.Data.Queries
+{
+    /// <summary>
+    /// A class representing a query to the activity logs.
+    /// </summary>
+    public class ActivityLogQuery
+    {
+        /// <summary>
+        /// Gets or sets the index to start at.
+        /// </summary>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum number of items to include.
+        /// </summary>
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to take entries with a user id.
+        /// </summary>
+        public bool? HasUserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum date to query for.
+        /// </summary>
+        public DateTime? MinDate { get; set; }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
index abdd290d45..695e2fbd84 100644
--- a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
+++ b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
@@ -3,8 +3,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Events;
+using Jellyfin.Data.Queries;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
+using Microsoft.EntityFrameworkCore;
 
 namespace Jellyfin.Server.Implementations.Activity
 {
@@ -39,41 +41,34 @@ namespace Jellyfin.Server.Implementations.Activity
         }
 
         /// <inheritdoc/>
-        public QueryResult<ActivityLogEntry> GetPagedResult(
-            Func<IQueryable<ActivityLog>, IQueryable<ActivityLog>> func,
-            int? startIndex,
-            int? limit)
+        public async Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query)
         {
-            using var dbContext = _provider.CreateContext();
+            await using var dbContext = _provider.CreateContext();
 
-            var query = func(dbContext.ActivityLogs.OrderByDescending(entry => entry.DateCreated));
+            IQueryable<ActivityLog> entries = dbContext.ActivityLogs.OrderByDescending(entry => entry.DateCreated);
 
-            if (startIndex.HasValue)
+            if (query.MinDate.HasValue)
             {
-                query = query.Skip(startIndex.Value);
+                entries = entries.Where(entry => entry.DateCreated >= query.MinDate);
             }
 
-            if (limit.HasValue)
+            if (query.HasUserId.HasValue)
             {
-                query = query.Take(limit.Value);
+                entries = entries.Where(entry => entry.UserId != Guid.Empty == query.HasUserId.Value );
             }
 
-            // This converts the objects from the new database model to the old for compatibility with the existing API.
-            var list = query.Select(ConvertToOldModel).ToList();
-
             return new QueryResult<ActivityLogEntry>
             {
-                Items = list,
-                TotalRecordCount = func(dbContext.ActivityLogs).Count()
+                Items = await entries.Skip(query.StartIndex ?? 0)
+                    .Take(query.Limit ?? 100)
+                    .Select(ConvertToOldModel)
+                    .AsQueryable()
+                    .ToListAsync()
+                    .ConfigureAwait(false),
+                TotalRecordCount = await entries.CountAsync().ConfigureAwait(false)
             };
         }
 
-        /// <inheritdoc/>
-        public QueryResult<ActivityLogEntry> GetPagedResult(int? startIndex, int? limit)
-        {
-            return GetPagedResult(logs => logs, startIndex, limit);
-        }
-
         private static ActivityLogEntry ConvertToOldModel(ActivityLog entry)
         {
             return new ActivityLogEntry
diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index d5344494e8..3e4ea208ed 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,10 +1,10 @@
 #pragma warning disable CS1591
 
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Events;
+using Jellyfin.Data.Queries;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
@@ -15,11 +15,6 @@ namespace MediaBrowser.Model.Activity
 
         Task CreateAsync(ActivityLog entry);
 
-        QueryResult<ActivityLogEntry> GetPagedResult(int? startIndex, int? limit);
-
-        QueryResult<ActivityLogEntry> GetPagedResult(
-            Func<IQueryable<ActivityLog>, IQueryable<ActivityLog>> func,
-            int? startIndex,
-            int? limit);
+        Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query);
     }
 }

From f2763a71e06c087c940f267313e24fb15dc13d37 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 4 Oct 2020 20:31:24 -0400
Subject: [PATCH 222/247] Rename migrations to match others

---
 ...ner.cs => 20201004171403_AddMaxActiveSessions.Designer.cs} | 4 ++--
 ...tiveSessions.cs => 20201004171403_AddMaxActiveSessions.cs} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename Jellyfin.Server.Implementations/Migrations/{20201004171403_MaxActiveSessions.Designer.cs => 20201004171403_AddMaxActiveSessions.Designer.cs} (99%)
 rename Jellyfin.Server.Implementations/Migrations/{20201004171403_MaxActiveSessions.cs => 20201004171403_AddMaxActiveSessions.cs} (92%)

diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs
similarity index 99%
rename from Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
rename to Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs
index 9eac077bda..e5c326a326 100644
--- a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.Designer.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.Designer.cs
@@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Jellyfin.Server.Implementations.Migrations
 {
     [DbContext(typeof(JellyfinDb))]
-    [Migration("20201004171403_MaxActiveSessions")]
-    partial class MaxActiveSessions
+    [Migration("20201004171403_AddMaxActiveSessions")]
+    partial class AddMaxActiveSessions
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
similarity index 92%
rename from Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
rename to Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
index f6ed3c66cd..8fded7d0a1 100644
--- a/Jellyfin.Server.Implementations/Migrations/20201004171403_MaxActiveSessions.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Jellyfin.Server.Implementations.Migrations
 {
-    public partial class MaxActiveSessions : Migration
+    public partial class AddMaxActiveSessions : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

From e77040a4fba93c0ca65650ce02998e9a35f28c40 Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthony@lavado.ca>
Date: Mon, 5 Oct 2020 00:15:25 -0400
Subject: [PATCH 223/247] Fix Transcode Cleanup Schedule

Sets the default time to midnight, and confirms to the same task
scheduling commands that other tasks use.
---
 .../ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
index 6914081673..dc6efcaf5f 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
@@ -41,7 +41,13 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// Creates the triggers that define when the task will run.
         /// </summary>
         /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers() => new List<TaskTriggerInfo>();
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        {
+            return new[]
+            {
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerDaily, TimeOfDayTicks = TimeSpan.FromHours(0).Ticks}
+            };
+        }
 
         /// <summary>
         /// Returns the task to be executed.

From 375f849b3e84a6f92e1928f7adcdb6a8a4115d25 Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthonylavado@me.com>
Date: Mon, 5 Oct 2020 02:14:43 -0400
Subject: [PATCH 224/247] Simply trigger

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
---
 .../ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
index dc6efcaf5f..2a40f8b1e8 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
@@ -45,7 +45,11 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         {
             return new[]
             {
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerDaily, TimeOfDayTicks = TimeSpan.FromHours(0).Ticks}
+                new TaskTriggerInfo
+                {
+                    Type = TaskTriggerInfo.TriggerDaily,
+                    TimeOfDayTicks = 0
+                }
             };
         }
 

From 959d906c859a4a7c611907d500498a53ba92dc15 Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthony@lavado.ca>
Date: Mon, 5 Oct 2020 02:25:09 -0400
Subject: [PATCH 225/247] Just enable instead

---
 .../Tasks/DeleteTranscodeFileTask.cs               | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
index 2a40f8b1e8..26ef193542 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
@@ -41,17 +41,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// Creates the triggers that define when the task will run.
         /// </summary>
         /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            return new[]
-            {
-                new TaskTriggerInfo
-                {
-                    Type = TaskTriggerInfo.TriggerDaily,
-                    TimeOfDayTicks = 0
-                }
-            };
-        }
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers() => new List<TaskTriggerInfo>();
 
         /// <summary>
         /// Returns the task to be executed.
@@ -158,7 +148,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         public bool IsHidden => false;
 
         /// <inheritdoc />
-        public bool IsEnabled => false;
+        public bool IsEnabled => true;
 
         /// <inheritdoc />
         public bool IsLogged => true;

From df75c1cd9c8fdcec8302a848c05d3ee36b0f7a58 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Mon, 5 Oct 2020 08:28:37 +0200
Subject: [PATCH 226/247] SecurityException should return 403

---
 Jellyfin.Server/Middleware/ExceptionMiddleware.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Server/Middleware/ExceptionMiddleware.cs b/Jellyfin.Server/Middleware/ExceptionMiddleware.cs
index fb1ee3b2bb..f6c76e4d9e 100644
--- a/Jellyfin.Server/Middleware/ExceptionMiddleware.cs
+++ b/Jellyfin.Server/Middleware/ExceptionMiddleware.cs
@@ -125,8 +125,8 @@ namespace Jellyfin.Server.Middleware
             switch (ex)
             {
                 case ArgumentException _: return StatusCodes.Status400BadRequest;
-                case AuthenticationException _:
-                case SecurityException _: return StatusCodes.Status401Unauthorized;
+                case AuthenticationException _: return StatusCodes.Status401Unauthorized;
+                case SecurityException _: return StatusCodes.Status403Forbidden;
                 case DirectoryNotFoundException _:
                 case FileNotFoundException _:
                 case ResourceNotFoundException _: return StatusCodes.Status404NotFound;

From 72cd6ab0712a0a532e0dda2b26afe793ad34111b Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Fri, 18 Sep 2020 15:24:56 +0200
Subject: [PATCH 227/247] Remove dummy season and missing episode provider in a
 futile attempt to remove cruft

---
 .../Configuration/LibraryOptions.cs           |   2 -
 .../Plugins/TheTvdb/TvdbClientManager.cs      |  26 --
 .../TV/DummySeasonProvider.cs                 | 229 ----------
 .../TV/MissingEpisodeProvider.cs              | 404 ------------------
 .../TV/SeriesMetadataService.cs               |  41 +-
 5 files changed, 1 insertion(+), 701 deletions(-)
 delete mode 100644 MediaBrowser.Providers/TV/DummySeasonProvider.cs
 delete mode 100644 MediaBrowser.Providers/TV/MissingEpisodeProvider.cs

diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 890469d361..54ef49ea62 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -25,8 +25,6 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableInternetProviders { get; set; }
 
-        public bool ImportMissingEpisodes { get; set; }
-
         public bool EnableAutomaticSeriesGrouping { get; set; }
 
         public bool EnableEmbeddedTitles { get; set; }
diff --git a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbClientManager.cs b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbClientManager.cs
index f22d484abc..5e9a4a2252 100644
--- a/MediaBrowser.Providers/Plugins/TheTvdb/TvdbClientManager.cs
+++ b/MediaBrowser.Providers/Plugins/TheTvdb/TvdbClientManager.cs
@@ -80,32 +80,6 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
             return TryGetValue(cacheKey, language, () => TvDbClient.Episodes.GetAsync(episodeTvdbId, cancellationToken));
         }
 
-        public async Task<List<EpisodeRecord>> GetAllEpisodesAsync(int tvdbId, string language,
-            CancellationToken cancellationToken)
-        {
-            // Traverse all episode pages and join them together
-            var episodes = new List<EpisodeRecord>();
-            var episodePage = await GetEpisodesPageAsync(tvdbId, new EpisodeQuery(), language, cancellationToken)
-                .ConfigureAwait(false);
-            episodes.AddRange(episodePage.Data);
-            if (!episodePage.Links.Next.HasValue || !episodePage.Links.Last.HasValue)
-            {
-                return episodes;
-            }
-
-            int next = episodePage.Links.Next.Value;
-            int last = episodePage.Links.Last.Value;
-
-            for (var page = next; page <= last; ++page)
-            {
-                episodePage = await GetEpisodesPageAsync(tvdbId, page, new EpisodeQuery(), language, cancellationToken)
-                    .ConfigureAwait(false);
-                episodes.AddRange(episodePage.Data);
-            }
-
-            return episodes;
-        }
-
         public Task<TvDbResponse<SeriesSearchResult[]>> GetSeriesByImdbIdAsync(
             string imdbId,
             string language,
diff --git a/MediaBrowser.Providers/TV/DummySeasonProvider.cs b/MediaBrowser.Providers/TV/DummySeasonProvider.cs
deleted file mode 100644
index 905cbefd32..0000000000
--- a/MediaBrowser.Providers/TV/DummySeasonProvider.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.TV
-{
-    public class DummySeasonProvider
-    {
-        private readonly ILogger _logger;
-        private readonly ILocalizationManager _localization;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IFileSystem _fileSystem;
-
-        public DummySeasonProvider(
-            ILogger logger,
-            ILocalizationManager localization,
-            ILibraryManager libraryManager,
-            IFileSystem fileSystem)
-        {
-            _logger = logger;
-            _localization = localization;
-            _libraryManager = libraryManager;
-            _fileSystem = fileSystem;
-        }
-
-        public async Task<bool> Run(Series series, CancellationToken cancellationToken)
-        {
-            var seasonsRemoved = RemoveObsoleteSeasons(series);
-
-            var hasNewSeasons = await AddDummySeasonFolders(series, cancellationToken).ConfigureAwait(false);
-
-            if (hasNewSeasons)
-            {
-                // var directoryService = new DirectoryService(_fileSystem);
-
-                // await series.RefreshMetadata(new MetadataRefreshOptions(directoryService), cancellationToken).ConfigureAwait(false);
-
-                // await series.ValidateChildren(new SimpleProgress<double>(), cancellationToken, new MetadataRefreshOptions(directoryService))
-                //    .ConfigureAwait(false);
-            }
-
-            return seasonsRemoved || hasNewSeasons;
-        }
-
-        private async Task<bool> AddDummySeasonFolders(Series series, CancellationToken cancellationToken)
-        {
-            var episodesInSeriesFolder = series.GetRecursiveChildren(i => i is Episode)
-                .Cast<Episode>()
-                .Where(i => !i.IsInSeasonFolder)
-                .ToList();
-
-            var hasChanges = false;
-
-            List<Season> seasons = null;
-
-            // Loop through the unique season numbers
-            foreach (var seasonNumber in episodesInSeriesFolder.Select(i => i.ParentIndexNumber ?? -1)
-                .Where(i => i >= 0)
-                .Distinct()
-                .ToList())
-            {
-                if (seasons == null)
-                {
-                    seasons = series.Children.OfType<Season>().ToList();
-                }
-
-                var existingSeason = seasons
-                    .FirstOrDefault(i => i.IndexNumber.HasValue && i.IndexNumber.Value == seasonNumber);
-
-                if (existingSeason == null)
-                {
-                    await AddSeason(series, seasonNumber, false, cancellationToken).ConfigureAwait(false);
-                    hasChanges = true;
-                    seasons = null;
-                }
-                else if (existingSeason.IsVirtualItem)
-                {
-                    existingSeason.IsVirtualItem = false;
-                    await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
-                    seasons = null;
-                }
-            }
-
-            // Unknown season - create a dummy season to put these under
-            if (episodesInSeriesFolder.Any(i => !i.ParentIndexNumber.HasValue))
-            {
-                if (seasons == null)
-                {
-                    seasons = series.Children.OfType<Season>().ToList();
-                }
-
-                var existingSeason = seasons
-                    .FirstOrDefault(i => !i.IndexNumber.HasValue);
-
-                if (existingSeason == null)
-                {
-                    await AddSeason(series, null, false, cancellationToken).ConfigureAwait(false);
-
-                    hasChanges = true;
-                    seasons = null;
-                }
-                else if (existingSeason.IsVirtualItem)
-                {
-                    existingSeason.IsVirtualItem = false;
-                    await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
-                    seasons = null;
-                }
-            }
-
-            return hasChanges;
-        }
-
-        /// <summary>
-        /// Adds the season.
-        /// </summary>
-        public async Task<Season> AddSeason(
-            Series series,
-            int? seasonNumber,
-            bool isVirtualItem,
-            CancellationToken cancellationToken)
-        {
-            string seasonName;
-            if (seasonNumber == null)
-            {
-                seasonName = _localization.GetLocalizedString("NameSeasonUnknown");
-            }
-            else if (seasonNumber == 0)
-            {
-                seasonName = _libraryManager.GetLibraryOptions(series).SeasonZeroDisplayName;
-            }
-            else
-            {
-                seasonName = string.Format(
-                    CultureInfo.InvariantCulture,
-                    _localization.GetLocalizedString("NameSeasonNumber"),
-                    seasonNumber.Value);
-            }
-
-            _logger.LogInformation("Creating Season {0} entry for {1}", seasonName, series.Name);
-
-            var season = new Season
-            {
-                Name = seasonName,
-                IndexNumber = seasonNumber,
-                Id = _libraryManager.GetNewItemId(
-                    series.Id + (seasonNumber ?? -1).ToString(CultureInfo.InvariantCulture) + seasonName,
-                    typeof(Season)),
-                IsVirtualItem = isVirtualItem,
-                SeriesId = series.Id,
-                SeriesName = series.Name
-            };
-
-            season.SetParent(series);
-
-            series.AddChild(season, cancellationToken);
-
-            await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_fileSystem)), cancellationToken).ConfigureAwait(false);
-
-            return season;
-        }
-
-        private bool RemoveObsoleteSeasons(Series series)
-        {
-            var existingSeasons = series.Children.OfType<Season>().ToList();
-
-            var physicalSeasons = existingSeasons
-                .Where(i => i.LocationType != LocationType.Virtual)
-                .ToList();
-
-            var virtualSeasons = existingSeasons
-                .Where(i => i.LocationType == LocationType.Virtual)
-                .ToList();
-
-            var seasonsToRemove = virtualSeasons
-                .Where(i =>
-                {
-                    if (i.IndexNumber.HasValue)
-                    {
-                        var seasonNumber = i.IndexNumber.Value;
-
-                        // If there's a physical season with the same number, delete it
-                        if (physicalSeasons.Any(p => p.IndexNumber.HasValue && (p.IndexNumber.Value == seasonNumber)))
-                        {
-                            return true;
-                        }
-                    }
-
-                    // If there are no episodes with this season number, delete it
-                    if (!i.GetEpisodes().Any())
-                    {
-                        return true;
-                    }
-
-                    return false;
-                })
-                .ToList();
-
-            var hasChanges = false;
-
-            foreach (var seasonToRemove in seasonsToRemove)
-            {
-                _logger.LogInformation("Removing virtual season {0} {1}", series.Name, seasonToRemove.IndexNumber);
-
-                _libraryManager.DeleteItem(
-                    seasonToRemove,
-                    new DeleteOptions
-                    {
-                        DeleteFileLocation = true
-                    },
-                    false);
-
-                hasChanges = true;
-            }
-
-            return hasChanges;
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
deleted file mode 100644
index c833b12271..0000000000
--- a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Providers.Plugins.TheTvdb;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Providers.TV
-{
-    public class MissingEpisodeProvider
-    {
-        private const double UnairedEpisodeThresholdDays = 2;
-
-        private readonly IServerConfigurationManager _config;
-        private readonly ILogger _logger;
-        private readonly ILibraryManager _libraryManager;
-        private readonly ILocalizationManager _localization;
-        private readonly IFileSystem _fileSystem;
-        private readonly TvdbClientManager _tvdbClientManager;
-
-        public MissingEpisodeProvider(
-            ILogger logger,
-            IServerConfigurationManager config,
-            ILibraryManager libraryManager,
-            ILocalizationManager localization,
-            IFileSystem fileSystem,
-            TvdbClientManager tvdbClientManager)
-        {
-            _logger = logger;
-            _config = config;
-            _libraryManager = libraryManager;
-            _localization = localization;
-            _fileSystem = fileSystem;
-            _tvdbClientManager = tvdbClientManager;
-        }
-
-        public async Task<bool> Run(Series series, bool addNewItems, CancellationToken cancellationToken)
-        {
-            var tvdbIdString = series.GetProviderId(MetadataProvider.Tvdb);
-            if (string.IsNullOrEmpty(tvdbIdString))
-            {
-                return false;
-            }
-
-            var episodes = await _tvdbClientManager.GetAllEpisodesAsync(
-                int.Parse(tvdbIdString, CultureInfo.InvariantCulture),
-                series.GetPreferredMetadataLanguage(),
-                cancellationToken).ConfigureAwait(false);
-
-            var episodeLookup = episodes
-                .Select(i =>
-                {
-                    if (!DateTime.TryParse(i.FirstAired, out var firstAired))
-                    {
-                        firstAired = default;
-                    }
-
-                    var seasonNumber = i.AiredSeason.GetValueOrDefault(-1);
-                    var episodeNumber = i.AiredEpisodeNumber.GetValueOrDefault(-1);
-                    return (seasonNumber, episodeNumber, firstAired);
-                })
-                .Where(i => i.seasonNumber != -1 && i.episodeNumber != -1)
-                .OrderBy(i => i.seasonNumber)
-                .ThenBy(i => i.episodeNumber)
-                .ToList();
-
-            var allRecursiveChildren = series.GetRecursiveChildren();
-
-            var hasBadData = HasInvalidContent(allRecursiveChildren);
-
-            // Be conservative here to avoid creating missing episodes for ones they already have
-            var addMissingEpisodes = !hasBadData && _libraryManager.GetLibraryOptions(series).ImportMissingEpisodes;
-
-            var anySeasonsRemoved = RemoveObsoleteOrMissingSeasons(allRecursiveChildren, episodeLookup);
-
-            if (anySeasonsRemoved)
-            {
-                // refresh this
-                allRecursiveChildren = series.GetRecursiveChildren();
-            }
-
-            var anyEpisodesRemoved = RemoveObsoleteOrMissingEpisodes(allRecursiveChildren, episodeLookup, addMissingEpisodes);
-
-            if (anyEpisodesRemoved)
-            {
-                // refresh this
-                allRecursiveChildren = series.GetRecursiveChildren();
-            }
-
-            var hasNewEpisodes = false;
-
-            if (addNewItems && series.IsMetadataFetcherEnabled(_libraryManager.GetLibraryOptions(series), TvdbSeriesProvider.Current.Name))
-            {
-                hasNewEpisodes = await AddMissingEpisodes(series, allRecursiveChildren, addMissingEpisodes, episodeLookup, cancellationToken)
-                    .ConfigureAwait(false);
-            }
-
-            if (hasNewEpisodes || anySeasonsRemoved || anyEpisodesRemoved)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Returns true if a series has any seasons or episodes without season or episode numbers
-        /// If this data is missing no virtual items will be added in order to prevent possible duplicates.
-        /// </summary>
-        private bool HasInvalidContent(IList<BaseItem> allItems)
-        {
-            return allItems.OfType<Season>().Any(i => !i.IndexNumber.HasValue) ||
-                   allItems.OfType<Episode>().Any(i =>
-                   {
-                       if (!i.ParentIndexNumber.HasValue)
-                       {
-                           return true;
-                       }
-
-                       // You could have episodes under season 0 with no number
-                       return false;
-                   });
-        }
-
-        private async Task<bool> AddMissingEpisodes(
-            Series series,
-            IEnumerable<BaseItem> allItems,
-            bool addMissingEpisodes,
-            IReadOnlyCollection<(int seasonNumber, int episodenumber, DateTime firstAired)> episodeLookup,
-            CancellationToken cancellationToken)
-        {
-            var existingEpisodes = allItems.OfType<Episode>().ToList();
-
-            var seasonCounts = episodeLookup.GroupBy(e => e.seasonNumber).ToDictionary(g => g.Key, g => g.Count());
-
-            var hasChanges = false;
-
-            foreach (var tuple in episodeLookup)
-            {
-                if (tuple.seasonNumber <= 0 || tuple.episodenumber <= 0)
-                {
-                    // Ignore episode/season zeros
-                    continue;
-                }
-
-                var existingEpisode = GetExistingEpisode(existingEpisodes, seasonCounts, tuple);
-
-                if (existingEpisode != null)
-                {
-                    continue;
-                }
-
-                var airDate = tuple.firstAired;
-
-                var now = DateTime.UtcNow.AddDays(-UnairedEpisodeThresholdDays);
-
-                if ((airDate < now && addMissingEpisodes) || airDate > now)
-                {
-                    // tvdb has a lot of nearly blank episodes
-                    _logger.LogInformation("Creating virtual missing/unaired episode {0} {1}x{2}", series.Name, tuple.seasonNumber, tuple.episodenumber);
-                    await AddEpisode(series, tuple.seasonNumber, tuple.episodenumber, cancellationToken).ConfigureAwait(false);
-
-                    hasChanges = true;
-                }
-            }
-
-            return hasChanges;
-        }
-
-        /// <summary>
-        /// Removes the virtual entry after a corresponding physical version has been added.
-        /// </summary>
-        private bool RemoveObsoleteOrMissingEpisodes(
-            IEnumerable<BaseItem> allRecursiveChildren,
-            IEnumerable<(int seasonNumber, int episodeNumber, DateTime firstAired)> episodeLookup,
-            bool allowMissingEpisodes)
-        {
-            var existingEpisodes = allRecursiveChildren.OfType<Episode>();
-
-            var physicalEpisodes = new List<Episode>();
-            var virtualEpisodes = new List<Episode>();
-            foreach (var episode in existingEpisodes)
-            {
-                if (episode.LocationType == LocationType.Virtual)
-                {
-                    virtualEpisodes.Add(episode);
-                }
-                else
-                {
-                    physicalEpisodes.Add(episode);
-                }
-            }
-
-            var episodesToRemove = virtualEpisodes
-                .Where(i =>
-                {
-                    if (!i.IndexNumber.HasValue || !i.ParentIndexNumber.HasValue)
-                    {
-                        return true;
-                    }
-
-                    var seasonNumber = i.ParentIndexNumber.Value;
-                    var episodeNumber = i.IndexNumber.Value;
-
-                    // If there's a physical episode with the same season and episode number, delete it
-                    if (physicalEpisodes.Any(p =>
-                        p.ParentIndexNumber.HasValue && p.ParentIndexNumber.Value == seasonNumber &&
-                        p.ContainsEpisodeNumber(episodeNumber)))
-                    {
-                        return true;
-                    }
-
-                    // If the episode no longer exists in the remote lookup, delete it
-                    if (!episodeLookup.Any(e => e.seasonNumber == seasonNumber && e.episodeNumber == episodeNumber))
-                    {
-                        return true;
-                    }
-
-                    // If it's missing, but not unaired, remove it
-                    return !allowMissingEpisodes && i.IsMissingEpisode &&
-                           (!i.PremiereDate.HasValue ||
-                            i.PremiereDate.Value.ToLocalTime().Date.AddDays(UnairedEpisodeThresholdDays) <
-                            DateTime.Now.Date);
-                });
-
-            var hasChanges = false;
-
-            foreach (var episodeToRemove in episodesToRemove)
-            {
-                _libraryManager.DeleteItem(
-                    episodeToRemove,
-                    new DeleteOptions
-                    {
-                        DeleteFileLocation = true
-                    },
-                    false);
-
-                hasChanges = true;
-            }
-
-            return hasChanges;
-        }
-
-        /// <summary>
-        /// Removes the obsolete or missing seasons.
-        /// </summary>
-        /// <param name="allRecursiveChildren">All recursive children.</param>
-        /// <param name="episodeLookup">The episode lookup.</param>
-        /// <returns><see cref="bool" />.</returns>
-        private bool RemoveObsoleteOrMissingSeasons(
-            IList<BaseItem> allRecursiveChildren,
-            IEnumerable<(int seasonNumber, int episodeNumber, DateTime firstAired)> episodeLookup)
-        {
-            var existingSeasons = allRecursiveChildren.OfType<Season>().ToList();
-
-            var physicalSeasons = new List<Season>();
-            var virtualSeasons = new List<Season>();
-            foreach (var season in existingSeasons)
-            {
-                if (season.LocationType == LocationType.Virtual)
-                {
-                    virtualSeasons.Add(season);
-                }
-                else
-                {
-                    physicalSeasons.Add(season);
-                }
-            }
-
-            var allEpisodes = allRecursiveChildren.OfType<Episode>().ToList();
-
-            var seasonsToRemove = virtualSeasons
-                .Where(i =>
-                {
-                    if (i.IndexNumber.HasValue)
-                    {
-                        var seasonNumber = i.IndexNumber.Value;
-
-                        // If there's a physical season with the same number, delete it
-                        if (physicalSeasons.Any(p => p.IndexNumber.HasValue && p.IndexNumber.Value == seasonNumber && string.Equals(p.Series.PresentationUniqueKey, i.Series.PresentationUniqueKey, StringComparison.Ordinal)))
-                        {
-                            return true;
-                        }
-
-                        // If the season no longer exists in the remote lookup, delete it, but only if an existing episode doesn't require it
-                        return episodeLookup.All(e => e.seasonNumber != seasonNumber) && allEpisodes.All(s => s.ParentIndexNumber != seasonNumber || s.IsInSeasonFolder);
-                    }
-
-                    // Season does not have a number
-                    // Remove if there are no episodes directly in series without a season number
-                    return allEpisodes.All(s => s.ParentIndexNumber.HasValue || s.IsInSeasonFolder);
-                });
-
-            var hasChanges = false;
-
-            foreach (var seasonToRemove in seasonsToRemove)
-            {
-                _libraryManager.DeleteItem(
-                    seasonToRemove,
-                    new DeleteOptions
-                    {
-                        DeleteFileLocation = true
-                    },
-                    false);
-
-                hasChanges = true;
-            }
-
-            return hasChanges;
-        }
-
-        /// <summary>
-        /// Adds the episode.
-        /// </summary>
-        /// <param name="series">The series.</param>
-        /// <param name="seasonNumber">The season number.</param>
-        /// <param name="episodeNumber">The episode number.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        private async Task AddEpisode(Series series, int seasonNumber, int episodeNumber, CancellationToken cancellationToken)
-        {
-            var season = series.Children.OfType<Season>()
-                .FirstOrDefault(i => i.IndexNumber.HasValue && i.IndexNumber.Value == seasonNumber);
-
-            if (season == null)
-            {
-                var provider = new DummySeasonProvider(_logger, _localization, _libraryManager, _fileSystem);
-                season = await provider.AddSeason(series, seasonNumber, true, cancellationToken).ConfigureAwait(false);
-            }
-
-            var name = "Episode " + episodeNumber.ToString(CultureInfo.InvariantCulture);
-
-            var episode = new Episode
-            {
-                Name = name,
-                IndexNumber = episodeNumber,
-                ParentIndexNumber = seasonNumber,
-                Id = _libraryManager.GetNewItemId(
-                    series.Id + seasonNumber.ToString(CultureInfo.InvariantCulture) + name,
-                    typeof(Episode)),
-                IsVirtualItem = true,
-                SeasonId = season?.Id ?? Guid.Empty,
-                SeriesId = series.Id
-            };
-
-            season.AddChild(episode, cancellationToken);
-
-            await episode.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_fileSystem)), cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Gets the existing episode.
-        /// </summary>
-        /// <param name="existingEpisodes">The existing episodes.</param>
-        /// <param name="seasonCounts"></param>
-        /// <param name="episodeTuple"></param>
-        /// <returns>Episode.</returns>
-        private Episode GetExistingEpisode(
-            IEnumerable<Episode> existingEpisodes,
-            IReadOnlyDictionary<int, int> seasonCounts,
-            (int seasonNumber, int episodeNumber, DateTime firstAired) episodeTuple)
-        {
-            var seasonNumber = episodeTuple.seasonNumber;
-            var episodeNumber = episodeTuple.episodeNumber;
-
-            while (true)
-            {
-                var episode = GetExistingEpisode(existingEpisodes, seasonNumber, episodeNumber);
-                if (episode != null)
-                {
-                    return episode;
-                }
-
-                seasonNumber--;
-
-                if (seasonCounts.ContainsKey(seasonNumber))
-                {
-                    episodeNumber += seasonCounts[seasonNumber];
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            return null;
-        }
-
-        private Episode GetExistingEpisode(IEnumerable<Episode> existingEpisodes, int season, int episode)
-            => existingEpisodes.FirstOrDefault(i => i.ParentIndexNumber == season && i.ContainsEpisodeNumber(episode));
-    }
-}
diff --git a/MediaBrowser.Providers/TV/SeriesMetadataService.cs b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
index a2c0e62c19..c8fc568a22 100644
--- a/MediaBrowser.Providers/TV/SeriesMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
@@ -1,65 +1,26 @@
 #pragma warning disable CS1591
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
-using MediaBrowser.Providers.Plugins.TheTvdb;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.TV
 {
     public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
     {
-        private readonly ILocalizationManager _localization;
-        private readonly TvdbClientManager _tvdbClientManager;
-
         public SeriesMetadataService(
             IServerConfigurationManager serverConfigurationManager,
             ILogger<SeriesMetadataService> logger,
             IProviderManager providerManager,
             IFileSystem fileSystem,
-            ILibraryManager libraryManager,
-            ILocalizationManager localization,
-            TvdbClientManager tvdbClientManager)
+            ILibraryManager libraryManager)
             : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager)
         {
-            _localization = localization;
-            _tvdbClientManager = tvdbClientManager;
-        }
-
-        /// <inheritdoc />
-        protected override async Task AfterMetadataRefresh(Series item, MetadataRefreshOptions refreshOptions, CancellationToken cancellationToken)
-        {
-            await base.AfterMetadataRefresh(item, refreshOptions, cancellationToken).ConfigureAwait(false);
-
-            var seasonProvider = new DummySeasonProvider(Logger, _localization, LibraryManager, FileSystem);
-            await seasonProvider.Run(item, cancellationToken).ConfigureAwait(false);
-
-            // TODO why does it not register this itself omg
-            var provider = new MissingEpisodeProvider(
-                Logger,
-                ServerConfigurationManager,
-                LibraryManager,
-                _localization,
-                FileSystem,
-                _tvdbClientManager);
-
-            try
-            {
-                await provider.Run(item, true, CancellationToken.None).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error in DummySeasonProvider for {ItemPath}", item.Path);
-            }
         }
 
         /// <inheritdoc />

From dba4df197753a2c61f80a0c01a3a57683a378a25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Oct 2020 12:00:58 +0000
Subject: [PATCH 228/247] Bump Moq from 4.14.5 to 4.14.6

Bumps [Moq](https://github.com/moq/moq4) from 4.14.5 to 4.14.6.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.5...v4.14.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj              | 2 +-
 .../Jellyfin.Server.Implementations.Tests.csproj                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
index e3a7a54286..8a559b7b62 100644
--- a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
+++ b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="coverlet.collector" Version="1.3.0" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Moq" Version="4.14.6" />
   </ItemGroup>
 
   <!-- Code Analyzers -->
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
index d1679c2796..75b67f460f 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
+++ b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="AutoFixture" Version="4.13.0" />
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Moq" Version="4.14.6" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="coverlet.collector" Version="1.3.0" />

From 7e7eb3a2f90a96b1fa3a907de4e36049d111e347 Mon Sep 17 00:00:00 2001
From: Cameron <cclarkjh@gmail.com>
Date: Mon, 5 Oct 2020 14:30:35 +0100
Subject: [PATCH 229/247] Add missing properties to typescript-axios gen

---
 apiclient/templates/typescript/axios/generate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiclient/templates/typescript/axios/generate.sh b/apiclient/templates/typescript/axios/generate.sh
index c514b10d5b..111b71b82e 100644
--- a/apiclient/templates/typescript/axios/generate.sh
+++ b/apiclient/templates/typescript/axios/generate.sh
@@ -16,4 +16,4 @@ java -jar openapi-generator-cli.jar generate \
     --output ./apiclient/generated/typescript/axios  \
     --template-dir ./apiclient/templates/typescript/axios \
     --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",npmName="axios"${additionalProperties}
+    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",modelPackage="models",apiPackage="api",npmName="axios"${additionalProperties}

From 49c363751a5bb54ee52e7764f223cd6263200c7c Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 5 Oct 2020 13:33:22 -0400
Subject: [PATCH 230/247] Make MaxActiveSessions not nullable

Fixes a bad assumption with the previous migration.
---
 .../Migrations/20201004171403_AddMaxActiveSessions.cs           | 2 +-
 .../Migrations/JellyfinDbModelSnapshot.cs                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
index 8fded7d0a1..e6bf4192b3 100644
--- a/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
@@ -13,7 +13,7 @@ namespace Jellyfin.Server.Implementations.Migrations
                 name: "MaxActiveSessions",
                 schema: "jellyfin",
                 table: "Users",
-                nullable: true);
+                nullable: false);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
diff --git a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
index 3c9e1aee4b..16d62f4826 100644
--- a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
+++ b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
@@ -344,7 +344,7 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Property<int?>("LoginAttemptsBeforeLockout")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int?>("MaxActiveSessions")
+                    b.Property<int>("MaxActiveSessions")
                         .HasColumnType("INTEGER");
 
                     b.Property<int?>("MaxParentalAgeRating")

From 8bf560c41e6b1c47400a62e35485e08defe7b008 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Mon, 5 Oct 2020 13:00:07 -0600
Subject: [PATCH 231/247] fix registry name and link

---
 .ci/azure-pipelines-api-client.yml               | 2 +-
 apiclient/templates/typescript/axios/generate.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index d120593ea8..1321014445 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -42,7 +42,7 @@ jobs:
       inputs:
         command: publish
         publishRegistry: useFeed
-        publishFeed: unstable
+        publishFeed: 'unstable@Local'
         workingDir: ./apiclient/generated/typescript/axios
 
 # Stable
diff --git a/apiclient/templates/typescript/axios/generate.sh b/apiclient/templates/typescript/axios/generate.sh
index 111b71b82e..360fe9f33b 100644
--- a/apiclient/templates/typescript/axios/generate.sh
+++ b/apiclient/templates/typescript/axios/generate.sh
@@ -4,7 +4,7 @@ artifactsDirectory="${1}"
 buildNumber="${2}"
 if [[ -n ${buildNumber} ]]; then
     # Unstable build
-    additionalProperties=",snapshotVersion=\"-SNAPSHOT.${buildNumber}\",npmRepository=\"https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable/npm/registry/\""
+    additionalProperties=",snapshotVersion=-SNAPSHOT.${buildNumber},npmRepository=https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable%40Local/npm/registry/"
 else
     # Stable build
     additionalProperties=""

From b3249e849c68c3474e18f999fc085d41bff75adc Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 5 Oct 2020 16:54:51 -0400
Subject: [PATCH 232/247] Add default value of 0

---
 .../Migrations/20201004171403_AddMaxActiveSessions.cs          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
index e6bf4192b3..10acb4defb 100644
--- a/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20201004171403_AddMaxActiveSessions.cs
@@ -13,7 +13,8 @@ namespace Jellyfin.Server.Implementations.Migrations
                 name: "MaxActiveSessions",
                 schema: "jellyfin",
                 table: "Users",
-                nullable: false);
+                nullable: false,
+                defaultValue: 0);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)

From d4a492ef93f6b663fd4a4f7710613f06863f401f Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Mon, 5 Oct 2020 22:51:52 -0400
Subject: [PATCH 233/247] Fix activity log query.

---
 .../Activity/ActivityManager.cs                       |  9 ++++++---
 .../Jellyfin.Server.Implementations.csproj            |  1 +
 .../Users/DisplayPreferencesManager.cs                |  1 +
 Jellyfin.Server.Implementations/Users/UserManager.cs  | 11 ++++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
index 695e2fbd84..5926abfe0d 100644
--- a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
+++ b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
@@ -45,7 +45,9 @@ namespace Jellyfin.Server.Implementations.Activity
         {
             await using var dbContext = _provider.CreateContext();
 
-            IQueryable<ActivityLog> entries = dbContext.ActivityLogs.OrderByDescending(entry => entry.DateCreated);
+            IQueryable<ActivityLog> entries = dbContext.ActivityLogs
+                .AsQueryable()
+                .OrderByDescending(entry => entry.DateCreated);
 
             if (query.MinDate.HasValue)
             {
@@ -59,10 +61,11 @@ namespace Jellyfin.Server.Implementations.Activity
 
             return new QueryResult<ActivityLogEntry>
             {
-                Items = await entries.Skip(query.StartIndex ?? 0)
+                Items = await entries
+                    .Skip(query.StartIndex ?? 0)
                     .Take(query.Limit ?? 100)
+                    .AsAsyncEnumerable()
                     .Select(ConvertToOldModel)
-                    .AsQueryable()
                     .ToListAsync()
                     .ConfigureAwait(false),
                 TotalRecordCount = await entries.CountAsync().ConfigureAwait(false)
diff --git a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
index 4e79dd8d6c..17ba092588 100644
--- a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
+++ b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
index 46f1c618f2..76f9433854 100644
--- a/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
+++ b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
@@ -61,6 +61,7 @@ namespace Jellyfin.Server.Implementations.Users
         public IList<ItemDisplayPreferences> ListItemDisplayPreferences(Guid userId, string client)
         {
             return _dbContext.ItemDisplayPreferences
+                .AsQueryable()
                 .Where(prefs => prefs.UserId == userId && prefs.ItemId != Guid.Empty && string.Equals(prefs.Client, client))
                 .ToList();
         }
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 8f04baa089..8f6a0496ab 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -108,6 +108,7 @@ namespace Jellyfin.Server.Implementations.Users
             {
                 using var dbContext = _dbProvider.CreateContext();
                 return dbContext.Users
+                    .AsQueryable()
                     .Select(user => user.Id)
                     .ToList();
             }
@@ -200,8 +201,8 @@ namespace Jellyfin.Server.Implementations.Users
         internal async Task<User> CreateUserInternalAsync(string name, JellyfinDb dbContext)
         {
             // TODO: Remove after user item data is migrated.
-            var max = await dbContext.Users.AnyAsync().ConfigureAwait(false)
-                ? await dbContext.Users.Select(u => u.InternalId).MaxAsync().ConfigureAwait(false)
+            var max = await dbContext.Users.AsQueryable().AnyAsync().ConfigureAwait(false)
+                ? await dbContext.Users.AsQueryable().Select(u => u.InternalId).MaxAsync().ConfigureAwait(false)
                 : 0;
 
             return new User(
@@ -221,7 +222,7 @@ namespace Jellyfin.Server.Implementations.Users
                 throw new ArgumentException("Usernames can contain unicode symbols, numbers (0-9), dashes (-), underscores (_), apostrophes ('), and periods (.)");
             }
 
-            using var dbContext = _dbProvider.CreateContext();
+            await using var dbContext = _dbProvider.CreateContext();
 
             var newUser = await CreateUserInternalAsync(name, dbContext).ConfigureAwait(false);
 
@@ -587,9 +588,9 @@ namespace Jellyfin.Server.Implementations.Users
         public async Task InitializeAsync()
         {
             // TODO: Refactor the startup wizard so that it doesn't require a user to already exist.
-            using var dbContext = _dbProvider.CreateContext();
+            await using var dbContext = _dbProvider.CreateContext();
 
-            if (await dbContext.Users.AnyAsync().ConfigureAwait(false))
+            if (await dbContext.Users.AsQueryable().AnyAsync().ConfigureAwait(false))
             {
                 return;
             }

From 3d69bcd19090a3e467594375db3ee25f39e3def9 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Tue, 6 Oct 2020 08:14:56 +0200
Subject: [PATCH 234/247] Fix playbackstart not triggering in the new
 eventmanager

---
 Emby.Server.Implementations/Session/SessionManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index b1ab20da22..607b322f2e 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -666,7 +666,7 @@ namespace Emby.Server.Implementations.Session
                 }
             }
 
-            var eventArgs = new PlaybackProgressEventArgs
+            var eventArgs = new PlaybackStartEventArgs
             {
                 Item = libraryItem,
                 Users = users,

From 6def4b06a8916c831ec2bd38bb066aeac7f75594 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Tue, 6 Oct 2020 14:54:17 +0200
Subject: [PATCH 235/247] Minor improvements to tmdb code

---
 .../Tmdb/TV/TmdbEpisodeImageProvider.cs       | 14 ++++----
 .../Plugins/Tmdb/TV/TmdbEpisodeProvider.cs    | 32 ++++++++---------
 .../Tmdb/TV/TmdbSeasonImageProvider.cs        | 13 +++----
 .../Tmdb/TV/TmdbSeriesImageProvider.cs        | 19 ++++++-----
 .../Plugins/Tmdb/TV/TmdbSeriesProvider.cs     | 34 +++++++++++--------
 5 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
index fe9e483c67..3b7a0b254e 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
@@ -67,17 +67,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 .GetEpisodeAsync(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken)
                 .ConfigureAwait(false);
 
-            if (episodeResult?.Images?.Stills == null)
+            var stills = episodeResult?.Images?.Stills;
+            if (stills == null)
             {
                 return Enumerable.Empty<RemoteImageInfo>();
             }
 
-            var remoteImages = new List<RemoteImageInfo>();
-
-            for (var i = 0; i < episodeResult.Images.Stills.Count; i++)
+            var remoteImages = new RemoteImageInfo[stills.Count];
+            for (var i = 0; i < stills.Count; i++)
             {
-                var image = episodeResult.Images.Stills[i];
-                remoteImages.Add(new RemoteImageInfo
+                var image = stills[i];
+                remoteImages[i] = new RemoteImageInfo
                 {
                     Url = _tmdbClientManager.GetStillUrl(image.FilePath),
                     CommunityRating = image.VoteAverage,
@@ -88,7 +88,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                     ProviderName = Name,
                     Type = ImageType.Primary,
                     RatingType = RatingType.Score
-                });
+                };
             }
 
             return remoteImages.OrderByLanguageDescending(language);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
index 55f1ba7dcc..93998a1102 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
@@ -40,30 +40,29 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 return Enumerable.Empty<RemoteSearchResult>();
             }
 
-            var metadataResult = await GetMetadata(searchInfo, cancellationToken);
+            var metadataResult = await GetMetadata(searchInfo, cancellationToken).ConfigureAwait(false);
 
             if (!metadataResult.HasMetadata)
             {
                 return Enumerable.Empty<RemoteSearchResult>();
             }
 
-            var list = new List<RemoteSearchResult>();
-
             var item = metadataResult.Item;
 
-            list.Add(new RemoteSearchResult
+            return new[]
             {
-                IndexNumber = item.IndexNumber,
-                Name = item.Name,
-                ParentIndexNumber = item.ParentIndexNumber,
-                PremiereDate = item.PremiereDate,
-                ProductionYear = item.ProductionYear,
-                ProviderIds = item.ProviderIds,
-                SearchProviderName = Name,
-                IndexNumberEnd = item.IndexNumberEnd
-            });
-
-            return list;
+                new RemoteSearchResult
+                {
+                    IndexNumber = item.IndexNumber,
+                    Name = item.Name,
+                    ParentIndexNumber = item.ParentIndexNumber,
+                    PremiereDate = item.PremiereDate,
+                    ProductionYear = item.ProductionYear,
+                    ProviderIds = item.ProviderIds,
+                    SearchProviderName = Name,
+                    IndexNumberEnd = item.IndexNumberEnd
+                }
+            };
         }
 
         public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info, CancellationToken cancellationToken)
@@ -137,8 +136,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 {
                     if (TmdbUtils.IsTrailerType(video))
                     {
-                        var videoUrl = string.Format(CultureInfo.InvariantCulture, "http://www.youtube.com/watch?v={0}", video.Key);
-                        item.AddTrailerUrl(videoUrl);
+                        item.AddTrailerUrl("https://www.youtube.com/watch?v=" + video.Key);
                     }
                 }
             }
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
index 0feaa5732a..f4ed480aef 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonImageProvider.cs
@@ -56,16 +56,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 .GetSeasonAsync(seriesTmdbId, season.IndexNumber.Value, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken)
                 .ConfigureAwait(false);
 
-            if (seasonResult?.Images?.Posters == null)
+            var posters = seasonResult?.Images?.Posters;
+            if (posters == null)
             {
                 return Enumerable.Empty<RemoteImageInfo>();
             }
 
-            var remoteImages = new List<RemoteImageInfo>();
-            for (var i = 0; i < seasonResult.Images.Posters.Count; i++)
+            var remoteImages = new RemoteImageInfo[posters.Count];
+            for (var i = 0; i < posters.Count; i++)
             {
-                var image = seasonResult.Images.Posters[i];
-                remoteImages.Add(new RemoteImageInfo
+                var image = posters[i];
+                remoteImages[i] = new RemoteImageInfo
                 {
                     Url = _tmdbClientManager.GetPosterUrl(image.FilePath),
                     CommunityRating = image.VoteAverage,
@@ -76,7 +77,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                     ProviderName = Name,
                     Type = ImageType.Primary,
                     RatingType = RatingType.Score
-                });
+                };
             }
 
             return remoteImages.OrderByLanguageDescending(language);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
index 2fdec0196b..d0c6b8b886 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
@@ -68,12 +68,15 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 return Enumerable.Empty<RemoteImageInfo>();
             }
 
-            var remoteImages = new List<RemoteImageInfo>();
+            var posters = series.Images.Posters;
+            var backdrops = series.Images.Backdrops;
 
-            for (var i = 0; i < series.Images.Posters.Count; i++)
+            var remoteImages = new RemoteImageInfo[posters.Count + backdrops.Count];
+
+            for (var i = 0; i < posters.Count; i++)
             {
-                var poster = series.Images.Posters[i];
-                remoteImages.Add(new RemoteImageInfo
+                var poster = posters[i];
+                remoteImages[i] = new RemoteImageInfo
                 {
                     Url = _tmdbClientManager.GetPosterUrl(poster.FilePath),
                     CommunityRating = poster.VoteAverage,
@@ -84,13 +87,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                     ProviderName = Name,
                     Type = ImageType.Primary,
                     RatingType = RatingType.Score
-                });
+                };
             }
 
-            for (var i = 0; i < series.Images.Backdrops.Count; i++)
+            for (var i = 0; i < backdrops.Count; i++)
             {
                 var backdrop = series.Images.Backdrops[i];
-                remoteImages.Add(new RemoteImageInfo
+                remoteImages[posters.Count + i] = new RemoteImageInfo
                 {
                     Url = _tmdbClientManager.GetBackdropUrl(backdrop.FilePath),
                     CommunityRating = backdrop.VoteAverage,
@@ -100,7 +103,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                     ProviderName = Name,
                     Type = ImageType.Backdrop,
                     RatingType = RatingType.Score
-                });
+                };
             }
 
             return remoteImages.OrderByLanguageDescending(language);
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
index 7944dfe27c..942c85b90d 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
@@ -66,14 +66,15 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                     .FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, searchInfo.MetadataLanguage, cancellationToken)
                     .ConfigureAwait(false);
 
-                if (findResult?.TvResults != null)
+                var tvResults = findResult?.TvResults;
+                if (tvResults != null)
                 {
-                    var imdbIdResults = new List<RemoteSearchResult>();
-                    for (var i = 0; i < findResult.TvResults.Count; i++)
+                    var imdbIdResults = new RemoteSearchResult[tvResults.Count];
+                    for (var i = 0; i < tvResults.Count; i++)
                     {
-                        var remoteResult = MapSearchTvToRemoteSearchResult(findResult.TvResults[i]);
+                        var remoteResult = MapSearchTvToRemoteSearchResult(tvResults[i]);
                         remoteResult.SetProviderId(MetadataProvider.Imdb, imdbId);
-                        imdbIdResults.Add(remoteResult);
+                        imdbIdResults[i] = remoteResult;
                     }
 
                     return imdbIdResults;
@@ -88,14 +89,15 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                     .FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, searchInfo.MetadataLanguage, cancellationToken)
                     .ConfigureAwait(false);
 
-                if (findResult?.TvResults != null)
+                var tvResults = findResult?.TvResults;
+                if (tvResults != null)
                 {
-                    var tvIdResults = new List<RemoteSearchResult>();
-                    for (var i = 0; i < findResult.TvResults.Count; i++)
+                    var tvIdResults = new RemoteSearchResult[tvResults.Count];
+                    for (var i = 0; i < tvResults.Count; i++)
                     {
-                        var remoteResult = MapSearchTvToRemoteSearchResult(findResult.TvResults[i]);
+                        var remoteResult = MapSearchTvToRemoteSearchResult(tvResults[i]);
                         remoteResult.SetProviderId(MetadataProvider.Tvdb, tvdbId);
-                        tvIdResults.Add(remoteResult);
+                        tvIdResults[i] = remoteResult;
                     }
 
                     return tvIdResults;
@@ -105,10 +107,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             var tvSearchResults = await _tmdbClientManager.SearchSeriesAsync(searchInfo.Name, searchInfo.MetadataLanguage, cancellationToken)
                 .ConfigureAwait(false);
 
-            var remoteResults = new List<RemoteSearchResult>();
+            var remoteResults = new RemoteSearchResult[tvSearchResults.Count];
             for (var i = 0; i < tvSearchResults.Count; i++)
             {
-                remoteResults.Add(MapSearchTvToRemoteSearchResult(tvSearchResults[i]));
+                remoteResults[i] = MapSearchTvToRemoteSearchResult(tvSearchResults[i]);
             }
 
             return remoteResults;
@@ -236,7 +238,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
         private Series MapTvShowToSeries(TvShow seriesResult, string preferredCountryCode)
         {
-            var series = new Series {Name = seriesResult.Name, OriginalTitle = seriesResult.OriginalName};
+            var series = new Series
+            {
+                Name = seriesResult.Name,
+                OriginalTitle = seriesResult.OriginalName
+            };
 
             series.SetProviderId(MetadataProvider.Tmdb, seriesResult.Id.ToString(CultureInfo.InvariantCulture));
 
@@ -322,7 +328,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 {
                     if (TmdbUtils.IsTrailerType(video))
                     {
-                        series.AddTrailerUrl($"http://www.youtube.com/watch?v={video.Key}");
+                        series.AddTrailerUrl("https://www.youtube.com/watch?v=" + video.Key);
                     }
                 }
             }

From 508b7c0a4e24d52fa8c10a29f6fb5c1cf77a65d2 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Wed, 7 Oct 2020 17:16:03 -0600
Subject: [PATCH 236/247] Add missing general commands

---
 MediaBrowser.Model/Session/GeneralCommandType.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index 5a9042d5f9..dce33210bb 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -43,6 +43,9 @@ namespace MediaBrowser.Model.Session
         Guide = 32,
         ToggleStats = 33,
         PlayMediaSource = 34,
-        PlayTrailers = 35
+        PlayTrailers = 35,
+        SetShuffleQueue = 36,
+        Playstate = 37,
+        PlayNext = 38
     }
 }

From e9f17f3cab621929eacb6680a48246a4033d727d Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Wed, 7 Oct 2020 17:26:02 -0600
Subject: [PATCH 237/247] Add missing general commands for Kodi

---
 MediaBrowser.Model/Session/GeneralCommandType.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index dce33210bb..62fa436b5e 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -46,6 +46,8 @@ namespace MediaBrowser.Model.Session
         PlayTrailers = 35,
         SetShuffleQueue = 36,
         Playstate = 37,
-        PlayNext = 38
+        PlayNext = 38,
+        ToggleOsdMenu = 39,
+        Play = 40
     }
 }

From fe49ae7cb558fe86f23cb11f6f564db59828509f Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Thu, 8 Oct 2020 07:21:55 -0600
Subject: [PATCH 238/247] fix casing

---
 MediaBrowser.Model/Session/GeneralCommandType.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index 62fa436b5e..c58fa9a6b9 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Model.Session
         PlayMediaSource = 34,
         PlayTrailers = 35,
         SetShuffleQueue = 36,
-        Playstate = 37,
+        PlayState = 37,
         PlayNext = 38,
         ToggleOsdMenu = 39,
         Play = 40

From 2a6ea45ee1106a46c9947995d3b4e314ce68c495 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 08:43:59 -0600
Subject: [PATCH 239/247] Run npm install task

---
 .ci/azure-pipelines-api-client.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index 1321014445..8b03b233fb 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -28,6 +28,12 @@ jobs:
       inputs:
         script: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar"
 
+    - task: Npm@1
+      displayName: 'Install npm dependencies'
+      inputs:
+        command: install
+        workingDir: ./apiclient/generated/typescript/axios
+
 # Generate npm api client
 # Unstable
     - task: CmdLine@2

From 60c0cc1d1cd1b6ebd58b47021652782ceddf232e Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 08:51:22 -0600
Subject: [PATCH 240/247] Fix feed name and url

---
 .ci/azure-pipelines-api-client.yml               | 2 +-
 apiclient/templates/typescript/axios/generate.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index 8b03b233fb..35a494cd6b 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -48,7 +48,7 @@ jobs:
       inputs:
         command: publish
         publishRegistry: useFeed
-        publishFeed: 'unstable@Local'
+        publishFeed: 'jellyfin/unstable'
         workingDir: ./apiclient/generated/typescript/axios
 
 # Stable
diff --git a/apiclient/templates/typescript/axios/generate.sh b/apiclient/templates/typescript/axios/generate.sh
index 360fe9f33b..8c4d742825 100644
--- a/apiclient/templates/typescript/axios/generate.sh
+++ b/apiclient/templates/typescript/axios/generate.sh
@@ -4,7 +4,7 @@ artifactsDirectory="${1}"
 buildNumber="${2}"
 if [[ -n ${buildNumber} ]]; then
     # Unstable build
-    additionalProperties=",snapshotVersion=-SNAPSHOT.${buildNumber},npmRepository=https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable%40Local/npm/registry/"
+    additionalProperties=",snapshotVersion=-SNAPSHOT.${buildNumber},npmRepository=https://pkgs.dev.azure.com/jellyfin-project/jellyfin/_packaging/unstable/npm/registry/"
 else
     # Stable build
     additionalProperties=""

From 5109d558d927a3aa5ebc12ab4c961f0213946197 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 09:52:05 -0600
Subject: [PATCH 241/247] fix npm install order

---
 .ci/azure-pipelines-api-client.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.ci/azure-pipelines-api-client.yml b/.ci/azure-pipelines-api-client.yml
index 35a494cd6b..fc89b90d4e 100644
--- a/.ci/azure-pipelines-api-client.yml
+++ b/.ci/azure-pipelines-api-client.yml
@@ -28,13 +28,7 @@ jobs:
       inputs:
         script: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar"
 
-    - task: Npm@1
-      displayName: 'Install npm dependencies'
-      inputs:
-        command: install
-        workingDir: ./apiclient/generated/typescript/axios
-
-# Generate npm api client
+## Generate npm api client
 # Unstable
     - task: CmdLine@2
       displayName: 'Build unstable typescript axios client'
@@ -42,6 +36,22 @@ jobs:
       inputs:
         script: "bash ./apiclient/templates/typescript/axios/generate.sh $(System.ArtifactsDirectory) $(Build.BuildNumber)"
 
+# Stable
+    - task: CmdLine@2
+      displayName: 'Build stable typescript axios client'
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
+      inputs:
+        script: "bash ./apiclient/templates/typescript/axios/generate.sh $(System.ArtifactsDirectory)"
+
+## Run npm install
+    - task: Npm@1
+      displayName: 'Install npm dependencies'
+      inputs:
+        command: install
+        workingDir: ./apiclient/generated/typescript/axios
+
+## Publish npm packages
+# Unstable
     - task: Npm@1
       displayName: 'Publish unstable typescript axios client'
       condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
@@ -52,12 +62,6 @@ jobs:
         workingDir: ./apiclient/generated/typescript/axios
 
 # Stable
-    - task: CmdLine@2
-      displayName: 'Build stable typescript axios client'
-      condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
-      inputs:
-        script: "bash ./apiclient/templates/typescript/axios/generate.sh $(System.ArtifactsDirectory)"
-
     - task: Npm@1
       displayName: 'Publish stable typescript axios client'
       condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')

From 17b20aa0c03b17cf41494983115127abc6f7ede1 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 17:03:45 -0600
Subject: [PATCH 242/247] Fix comma delimited array model binder

---
 Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
index 13469194a0..208566dc8e 100644
--- a/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
+++ b/Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs
@@ -18,11 +18,6 @@ namespace Jellyfin.Api.ModelBinders
             var elementType = bindingContext.ModelType.GetElementType();
             var converter = TypeDescriptor.GetConverter(elementType);
 
-            if (valueProviderResult == ValueProviderResult.None)
-            {
-                return Task.CompletedTask;
-            }
-
             if (valueProviderResult.Length > 1)
             {
                 var result = Array.CreateInstance(elementType, valueProviderResult.Length);

From 6a3a193dbbe856a22662f495af04aca729495d1f Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 17:10:06 -0600
Subject: [PATCH 243/247] Fix and clean tests

---
 .../CommaDelimitedArrayModelBinderTests.cs    | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs b/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
index c801b4a523..89c7d62f79 100644
--- a/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
+++ b/tests/Jellyfin.Api.Tests/ModelBinders/CommaDelimitedArrayModelBinderTests.cs
@@ -1,17 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Globalization;
-using System.Text;
 using System.Threading.Tasks;
 using Jellyfin.Api.ModelBinders;
-using MediaBrowser.Controller.Entities;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Primitives;
 using Moq;
 using Xunit;
-using Xunit.Sdk;
 
 namespace Jellyfin.Api.Tests.ModelBinders
 {
@@ -21,14 +17,14 @@ namespace Jellyfin.Api.Tests.ModelBinders
         public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedStringArrayQuery()
         {
             var queryParamName = "test";
-            var queryParamValues = new string[] { "lol", "xd" };
+            var queryParamValues = new[] { "lol", "xd" };
             var queryParamString = "lol,xd";
             var queryParamType = typeof(string[]);
 
             var modelBinder = new CommaDelimitedArrayModelBinder();
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    new QueryCollection(new Dictionary<string, StringValues> { { queryParamName, new StringValues(queryParamString) } }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();
             bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
@@ -46,14 +42,14 @@ namespace Jellyfin.Api.Tests.ModelBinders
         public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedIntArrayQuery()
         {
             var queryParamName = "test";
-            var queryParamValues = new int[] { 42, 0 };
+            var queryParamValues = new[] { 42, 0 };
             var queryParamString = "42,0";
             var queryParamType = typeof(int[]);
 
             var modelBinder = new CommaDelimitedArrayModelBinder();
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    new QueryCollection(new Dictionary<string, StringValues> { { queryParamName, new StringValues(queryParamString) } }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();
             bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
@@ -71,14 +67,14 @@ namespace Jellyfin.Api.Tests.ModelBinders
         public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedEnumArrayQuery()
         {
             var queryParamName = "test";
-            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamValues = new[] { TestType.How, TestType.Much };
             var queryParamString = "How,Much";
             var queryParamType = typeof(TestType[]);
 
             var modelBinder = new CommaDelimitedArrayModelBinder();
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    new QueryCollection(new Dictionary<string, StringValues> { { queryParamName, new StringValues(queryParamString) } }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();
             bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
@@ -96,14 +92,14 @@ namespace Jellyfin.Api.Tests.ModelBinders
         public async Task BindModelAsync_CorrectlyBindsValidCommaDelimitedEnumArrayQueryWithDoubleCommas()
         {
             var queryParamName = "test";
-            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamValues = new[] { TestType.How, TestType.Much };
             var queryParamString = "How,,Much";
             var queryParamType = typeof(TestType[]);
 
             var modelBinder = new CommaDelimitedArrayModelBinder();
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    new QueryCollection(new Dictionary<string, StringValues> { { queryParamName, new StringValues(queryParamString) } }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();
             bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
@@ -121,7 +117,7 @@ namespace Jellyfin.Api.Tests.ModelBinders
         public async Task BindModelAsync_CorrectlyBindsValidEnumArrayQuery()
         {
             var queryParamName = "test";
-            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
+            var queryParamValues = new[] { TestType.How, TestType.Much };
             var queryParamString1 = "How";
             var queryParamString2 = "Much";
             var queryParamType = typeof(TestType[]);
@@ -130,9 +126,9 @@ namespace Jellyfin.Api.Tests.ModelBinders
 
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>()
+                    new QueryCollection(new Dictionary<string, StringValues>
                     {
-                        { queryParamName, new StringValues(new string[] { queryParamString1, queryParamString2 }) },
+                        { queryParamName, new StringValues(new[] { queryParamString1, queryParamString2 }) },
                     }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();
@@ -158,7 +154,7 @@ namespace Jellyfin.Api.Tests.ModelBinders
 
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>()
+                    new QueryCollection(new Dictionary<string, StringValues>
                     {
                         { queryParamName, new StringValues(value: null) },
                     }),
@@ -171,7 +167,8 @@ namespace Jellyfin.Api.Tests.ModelBinders
 
             await modelBinder.BindModelAsync(bindingContextMock.Object);
 
-            Assert.False(bindingContextMock.Object.Result.IsModelSet);
+            Assert.True(bindingContextMock.Object.Result.IsModelSet);
+            Assert.Equal((TestType[])bindingContextMock.Object.Result.Model, queryParamValues);
         }
 
         [Fact]
@@ -184,7 +181,7 @@ namespace Jellyfin.Api.Tests.ModelBinders
             var modelBinder = new CommaDelimitedArrayModelBinder();
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>() { { queryParamName, new StringValues(queryParamString) } }),
+                    new QueryCollection(new Dictionary<string, StringValues> { { queryParamName, new StringValues(queryParamString) } }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();
             bindingContextMock.Setup(b => b.ValueProvider).Returns(valueProvider);
@@ -201,7 +198,6 @@ namespace Jellyfin.Api.Tests.ModelBinders
         public async Task BindModelAsync_ThrowsIfCommaDelimitedEnumArrayQueryIsInvalid2()
         {
             var queryParamName = "test";
-            var queryParamValues = new TestType[] { TestType.How, TestType.Much };
             var queryParamString1 = "How";
             var queryParamString2 = "😱";
             var queryParamType = typeof(TestType[]);
@@ -210,9 +206,9 @@ namespace Jellyfin.Api.Tests.ModelBinders
 
             var valueProvider = new QueryStringValueProvider(
                     new BindingSource(string.Empty, string.Empty, false, false),
-                    new QueryCollection(new Dictionary<string, StringValues>()
+                    new QueryCollection(new Dictionary<string, StringValues>
                     {
-                        { queryParamName, new StringValues(new string[] { queryParamString1, queryParamString2 }) },
+                        { queryParamName, new StringValues(new[] { queryParamString1, queryParamString2 }) },
                     }),
                     CultureInfo.InvariantCulture);
             var bindingContextMock = new Mock<ModelBindingContext>();

From 67722a2034d9ab4b3d6df82f11c2c12a5bfedf38 Mon Sep 17 00:00:00 2001
From: shakesac <miguel@drivewide.pt>
Date: Fri, 9 Oct 2020 23:05:24 +0000
Subject: [PATCH 244/247] Translated using Weblate (Portuguese (Portugal))
 Translation: Jellyfin/Jellyfin Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/pt_PT/

---
 Emby.Server.Implementations/Localization/Core/pt-PT.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Localization/Core/pt-PT.json b/Emby.Server.Implementations/Localization/Core/pt-PT.json
index c1fb65743d..a7c17ecb63 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -26,7 +26,7 @@
     "HeaderLiveTV": "TV em Direto",
     "HeaderNextUp": "A Seguir",
     "HeaderRecordingGroups": "Grupos de Gravação",
-    "HomeVideos": "Videos caseiros",
+    "HomeVideos": "Vídeos Caseiros",
     "Inherit": "Herdar",
     "ItemAddedWithName": "{0} foi adicionado à biblioteca",
     "ItemRemovedWithName": "{0} foi removido da biblioteca",

From 549f2284ad87e78bcf43cc9baec2ce7977769dc4 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 17:41:17 -0600
Subject: [PATCH 245/247] Convert filters string to enum.

---
 Jellyfin.Api/Controllers/ArtistsController.cs     | 12 ++++++------
 Jellyfin.Api/Controllers/ChannelsController.cs    | 12 ++++++------
 Jellyfin.Api/Controllers/GenresController.cs      |  6 +++---
 Jellyfin.Api/Controllers/ItemsController.cs       |  4 ++--
 Jellyfin.Api/Controllers/MusicGenresController.cs |  6 +++---
 Jellyfin.Api/Controllers/PersonsController.cs     |  4 ++--
 Jellyfin.Api/Controllers/StudiosController.cs     |  6 +++---
 Jellyfin.Api/Controllers/TrailersController.cs    |  2 +-
 Jellyfin.Api/Helpers/RequestHelpers.cs            | 12 ------------
 9 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/Jellyfin.Api/Controllers/ArtistsController.cs b/Jellyfin.Api/Controllers/ArtistsController.cs
index d38214116c..784ecaeb32 100644
--- a/Jellyfin.Api/Controllers/ArtistsController.cs
+++ b/Jellyfin.Api/Controllers/ArtistsController.cs
@@ -54,7 +54,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
         /// <param name="includeItemTypes">Optional. If specified, results will be filtered based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
         /// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
         /// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
@@ -89,7 +89,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? genres,
@@ -188,7 +188,7 @@ namespace Jellyfin.Api.Controllers
                 }).Where(i => i != null).Select(i => i!.Id).ToArray();
             }
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
@@ -263,7 +263,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
         /// <param name="includeItemTypes">Optional. If specified, results will be filtered based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
         /// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
         /// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
@@ -298,7 +298,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? genres,
@@ -397,7 +397,7 @@ namespace Jellyfin.Api.Controllers
                 }).Where(i => i != null).Select(i => i!.Id).ToArray();
             }
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
diff --git a/Jellyfin.Api/Controllers/ChannelsController.cs b/Jellyfin.Api/Controllers/ChannelsController.cs
index 33a969f859..fda00b8d46 100644
--- a/Jellyfin.Api/Controllers/ChannelsController.cs
+++ b/Jellyfin.Api/Controllers/ChannelsController.cs
@@ -105,7 +105,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
         /// <param name="limit">Optional. The maximum number of records to return.</param>
         /// <param name="sortOrder">Optional. Sort Order - Ascending,Descending.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="sortBy">Optional. Specify one or more sort orders, comma delimited. Options: Album, AlbumArtist, Artist, Budget, CommunityRating, CriticRating, DateCreated, DatePlayed, PlayCount, PremiereDate, ProductionYear, SortName, Random, Revenue, Runtime.</param>
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <response code="200">Channel items returned.</response>
@@ -121,7 +121,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] int? startIndex,
             [FromQuery] int? limit,
             [FromQuery] string? sortOrder,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] string? sortBy,
             [FromQuery] string? fields)
         {
@@ -140,7 +140,7 @@ namespace Jellyfin.Api.Controllers
                     .AddItemFields(fields)
             };
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
@@ -183,7 +183,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="userId">Optional. User Id.</param>
         /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
         /// <param name="limit">Optional. The maximum number of records to return.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <param name="channelIds">Optional. Specify one or more channel id's, comma delimited.</param>
         /// <response code="200">Latest channel items returned.</response>
@@ -196,7 +196,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] Guid? userId,
             [FromQuery] int? startIndex,
             [FromQuery] int? limit,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] string? fields,
             [FromQuery] string? channelIds)
         {
@@ -217,7 +217,7 @@ namespace Jellyfin.Api.Controllers
                     .AddItemFields(fields)
             };
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
diff --git a/Jellyfin.Api/Controllers/GenresController.cs b/Jellyfin.Api/Controllers/GenresController.cs
index de6aa86c94..f4b69b312e 100644
--- a/Jellyfin.Api/Controllers/GenresController.cs
+++ b/Jellyfin.Api/Controllers/GenresController.cs
@@ -55,7 +55,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
         /// <param name="includeItemTypes">Optional. If specified, results will be filtered in based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
         /// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
         /// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
@@ -90,7 +90,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? genres,
@@ -188,7 +188,7 @@ namespace Jellyfin.Api.Controllers
                     .ToArray();
             }
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 652c4689d0..1f73bd8582 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -182,7 +182,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? imageTypes,
@@ -365,7 +365,7 @@ namespace Jellyfin.Api.Controllers
                     query.CollapseBoxSetItems = false;
                 }
 
-                foreach (var filter in RequestHelpers.GetFilters(filters!))
+                foreach (var filter in filters)
                 {
                     switch (filter)
                     {
diff --git a/Jellyfin.Api/Controllers/MusicGenresController.cs b/Jellyfin.Api/Controllers/MusicGenresController.cs
index 570ae8fdc7..d216b7f728 100644
--- a/Jellyfin.Api/Controllers/MusicGenresController.cs
+++ b/Jellyfin.Api/Controllers/MusicGenresController.cs
@@ -55,7 +55,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
         /// <param name="includeItemTypes">Optional. If specified, results will be filtered in based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
         /// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
         /// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
@@ -89,7 +89,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? genres,
@@ -187,7 +187,7 @@ namespace Jellyfin.Api.Controllers
                     .ToArray();
             }
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
diff --git a/Jellyfin.Api/Controllers/PersonsController.cs b/Jellyfin.Api/Controllers/PersonsController.cs
index 8bd610dad9..bbef1ff9a1 100644
--- a/Jellyfin.Api/Controllers/PersonsController.cs
+++ b/Jellyfin.Api/Controllers/PersonsController.cs
@@ -89,7 +89,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? genres,
@@ -187,7 +187,7 @@ namespace Jellyfin.Api.Controllers
                     .ToArray();
             }
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
diff --git a/Jellyfin.Api/Controllers/StudiosController.cs b/Jellyfin.Api/Controllers/StudiosController.cs
index cdd5f958e9..3a8ac1b243 100644
--- a/Jellyfin.Api/Controllers/StudiosController.cs
+++ b/Jellyfin.Api/Controllers/StudiosController.cs
@@ -53,7 +53,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="fields">Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</param>
         /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
         /// <param name="includeItemTypes">Optional. If specified, results will be filtered based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
+        /// <param name="filters">Optional. Specify additional filters to apply.</param>
         /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
         /// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
         /// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
@@ -88,7 +88,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
             [FromQuery] string? includeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? genres,
@@ -188,7 +188,7 @@ namespace Jellyfin.Api.Controllers
                     .ToArray();
             }
 
-            foreach (var filter in RequestHelpers.GetFilters(filters))
+            foreach (var filter in filters)
             {
                 switch (filter)
                 {
diff --git a/Jellyfin.Api/Controllers/TrailersController.cs b/Jellyfin.Api/Controllers/TrailersController.cs
index 5157b08ae5..08d9f78fc5 100644
--- a/Jellyfin.Api/Controllers/TrailersController.cs
+++ b/Jellyfin.Api/Controllers/TrailersController.cs
@@ -146,7 +146,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] string? parentId,
             [FromQuery] string? fields,
             [FromQuery] string? excludeItemTypes,
-            [FromQuery] string? filters,
+            [FromQuery] ItemFilter[] filters,
             [FromQuery] bool? isFavorite,
             [FromQuery] string? mediaTypes,
             [FromQuery] string? imageTypes,
diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index 8dcf08af56..fb5c283f59 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -56,18 +56,6 @@ namespace Jellyfin.Api.Helpers
             return result;
         }
 
-        /// <summary>
-        /// Get parsed filters.
-        /// </summary>
-        /// <param name="filters">The filters.</param>
-        /// <returns>Item filters.</returns>
-        public static IEnumerable<ItemFilter> GetFilters(string? filters)
-        {
-            return string.IsNullOrEmpty(filters)
-                ? Array.Empty<ItemFilter>()
-                : filters.Split(',').Select(v => Enum.Parse<ItemFilter>(v, true));
-        }
-
         /// <summary>
         /// Splits a string at a separating character into an array of substrings.
         /// </summary>

From ed4b470397c41ba1c86b2f4161874ef741e275c5 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 17:46:39 -0600
Subject: [PATCH 246/247] Convert exclude location type string to enum.

---
 Jellyfin.Api/Controllers/ItemsController.cs    | 9 +++------
 Jellyfin.Api/Controllers/TrailersController.cs | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 652c4689d0..fd7187cd4f 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -159,7 +159,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] bool? isHd,
             [FromQuery] bool? is4K,
             [FromQuery] string? locationTypes,
-            [FromQuery] string? excludeLocationTypes,
+            [FromQuery] LocationType[] excludeLocationTypes,
             [FromQuery] bool? isMissing,
             [FromQuery] bool? isUnaired,
             [FromQuery] double? minCommunityRating,
@@ -406,12 +406,9 @@ namespace Jellyfin.Api.Controllers
                 }
 
                 // ExcludeLocationTypes
-                if (!string.IsNullOrEmpty(excludeLocationTypes))
+                if (excludeLocationTypes.Any(t => t == LocationType.Virtual))
                 {
-                    if (excludeLocationTypes.Split(',').Select(d => (LocationType)Enum.Parse(typeof(LocationType), d, true)).ToArray().Contains(LocationType.Virtual))
-                    {
-                        query.IsVirtualItem = false;
-                    }
+                    query.IsVirtualItem = false;
                 }
 
                 if (!string.IsNullOrEmpty(locationTypes))
diff --git a/Jellyfin.Api/Controllers/TrailersController.cs b/Jellyfin.Api/Controllers/TrailersController.cs
index 5157b08ae5..bf2dfcc395 100644
--- a/Jellyfin.Api/Controllers/TrailersController.cs
+++ b/Jellyfin.Api/Controllers/TrailersController.cs
@@ -1,6 +1,7 @@
 using System;
 using Jellyfin.Api.Constants;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -124,7 +125,7 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] bool? isHd,
             [FromQuery] bool? is4K,
             [FromQuery] string? locationTypes,
-            [FromQuery] string? excludeLocationTypes,
+            [FromQuery] LocationType[] excludeLocationTypes,
             [FromQuery] bool? isMissing,
             [FromQuery] bool? isUnaired,
             [FromQuery] double? minCommunityRating,

From 1bbd8df92b1a5ef1661693810f089d9884e416d3 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 9 Oct 2020 18:02:53 -0600
Subject: [PATCH 247/247] Remove references to legacy scripts

---
 deployment/build.windows.amd64 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deployment/build.windows.amd64 b/deployment/build.windows.amd64
index afe4905769..a9daa6a239 100755
--- a/deployment/build.windows.amd64
+++ b/deployment/build.windows.amd64
@@ -35,10 +35,6 @@ unzip ${addin_build_dir}/jellyfin-ffmpeg.zip -d ${addin_build_dir}/jellyfin-ffmp
 cp ${addin_build_dir}/jellyfin-ffmpeg/* ${output_dir}
 rm -rf ${addin_build_dir}
 
-# Prepare scripts
-cp ${SOURCE_DIR}/windows/legacy/install-jellyfin.ps1 ${output_dir}/install-jellyfin.ps1
-cp ${SOURCE_DIR}/windows/legacy/install.bat ${output_dir}/install.bat
-
 # Create zip package
 pushd dist
 zip -qr jellyfin-server_${version}.portable.zip jellyfin-server_${version}