Add back taglib-sharp submodule

This fixes v10.1.0 build

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "ThirdParty/taglib-sharp"]
+	path = ThirdParty/taglib-sharp
+	url = https://github.com/mono/taglib-sharp
 [submodule "MediaBrowser.WebDashboard/jellyfin-web"]
 	path = MediaBrowser.WebDashboard/jellyfin-web
 	url = https://github.com/jellyfin/jellyfin-web.git

CONTRIBUTORS.md

@@ -15,7 +15,6 @@
  - [cvium](https://github.com/cvium)
  - [wtayl0r](https://github.com/wtayl0r)
  - [TtheCreator](https://github.com/Tthecreator)
- - [LogicalPhallacy](https://github.com/LogicalPhallacy/)
 
 # Emby Contributors
 

Emby.Dlna/Didl/DidlBuilder.cs

@@ -932,7 +932,13 @@ namespace Emby.Dlna.Didl
 
         private void AddCover(BaseItem item, BaseItem context, StubType? stubType, XmlWriter writer)
         {
-            ImageDownloadInfo imageInfo = GetImageInfo(item);;
+            ImageDownloadInfo imageInfo = null;
+
+            // Finally, just use the image from the item
+            if (imageInfo == null)
+            {
+                imageInfo = GetImageInfo(item);
+            }
 
             if (imageInfo == null)
             {

Emby.Drawing/SkiaEncoder.cs

@@ -270,10 +270,17 @@ namespace Emby.Drawing
                     // create the bitmap
                     var bitmap = new SKBitmap(codec.Info.Width, codec.Info.Height, !requiresTransparencyHack);
 
-                    // decode
-                    codec.GetPixels(bitmap.Info, bitmap.GetPixels());
+                    if (bitmap != null)
+                    {
+                        // decode
+                        codec.GetPixels(bitmap.Info, bitmap.GetPixels());
 
-                    origin = codec.EncodedOrigin;
+                        origin = codec.EncodedOrigin;
+                    }
+                    else
+                    {
+                        origin = GetSKEncodedOrigin(orientation);
+                    }
 
                     return bitmap;
                 }

Emby.Naming/AudioBook/AudioBookResolver.cs

@@ -30,11 +30,8 @@ namespace Emby.Naming.AudioBook
             {
                 throw new ArgumentNullException(nameof(path));
             }
-
-            if (IsDirectory) // TODO
-            {
+            if (IsDirectory)
                 return null;
-            }
 
             var extension = Path.GetExtension(path) ?? string.Empty;
             // Check supported extensions

Emby.Photos/Emby.Photos.csproj

@@ -3,16 +3,13 @@
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TagLibSharp" Version="2.2.0-beta" />
-  </ItemGroup>
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Updates;
@@ -93,18 +92,18 @@ namespace Emby.Server.Implementations.Activity
             _appHost.ApplicationUpdated += _appHost_ApplicationUpdated;
         }
 
-        async void _deviceManager_CameraImageUploaded(object sender, GenericEventArgs<CameraImageUploadInfo> e)
+        void _deviceManager_CameraImageUploaded(object sender, GenericEventArgs<CameraImageUploadInfo> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("CameraImageUploadedFrom"), e.Argument.Device.Name),
                 Type = NotificationType.CameraImageUploaded.ToString()
             });
         }
 
-        async void _userManager_UserLockedOut(object sender, GenericEventArgs<User> e)
+        void _userManager_UserLockedOut(object sender, GenericEventArgs<User> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserLockedOutWithName"), e.Argument.Name),
                 Type = NotificationType.UserLockedOut.ToString(),
@@ -112,9 +111,9 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _subManager_SubtitleDownloadFailure(object sender, SubtitleDownloadFailureEventArgs e)
+        void _subManager_SubtitleDownloadFailure(object sender, SubtitleDownloadFailureEventArgs e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("SubtitleDownloadFailureFromForItem"), e.Provider, Notifications.Notifications.GetItemName(e.Item)),
                 Type = "SubtitleDownloadFailure",
@@ -123,7 +122,7 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)
+        void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)
         {
             var item = e.MediaInfo;
 
@@ -146,7 +145,7 @@ namespace Emby.Server.Implementations.Activity
 
             var user = e.Users.First();
 
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), user.Name, GetItemName(item), e.DeviceName),
                 Type = GetPlaybackStoppedNotificationType(item.MediaType),
@@ -154,7 +153,7 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
+        void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
         {
             var item = e.MediaInfo;
 
@@ -177,7 +176,7 @@ namespace Emby.Server.Implementations.Activity
 
             var user = e.Users.First();
 
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), user.Name, GetItemName(item), e.DeviceName),
                 Type = GetPlaybackNotificationType(item.MediaType),
@@ -238,7 +237,7 @@ namespace Emby.Server.Implementations.Activity
             return null;
         }
 
-        async void _sessionManager_SessionEnded(object sender, SessionEventArgs e)
+        void _sessionManager_SessionEnded(object sender, SessionEventArgs e)
         {
             string name;
             var session = e.SessionInfo;
@@ -255,7 +254,7 @@ namespace Emby.Server.Implementations.Activity
                 name = string.Format(_localization.GetLocalizedString("UserOfflineFromDevice"), session.UserName, session.DeviceName);
             }
 
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = name,
                 Type = "SessionEnded",
@@ -264,11 +263,11 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _sessionManager_AuthenticationSucceeded(object sender, GenericEventArgs<AuthenticationResult> e)
+        void _sessionManager_AuthenticationSucceeded(object sender, GenericEventArgs<AuthenticationResult> e)
         {
             var user = e.Argument.User;
 
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("AuthenticationSucceededWithUserName"), user.Name),
                 Type = "AuthenticationSucceeded",
@@ -277,9 +276,9 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _sessionManager_AuthenticationFailed(object sender, GenericEventArgs<AuthenticationRequest> e)
+        void _sessionManager_AuthenticationFailed(object sender, GenericEventArgs<AuthenticationRequest> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("FailedLoginAttemptWithUserName"), e.Argument.Username),
                 Type = "AuthenticationFailed",
@@ -288,9 +287,9 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _appHost_ApplicationUpdated(object sender, GenericEventArgs<PackageVersionInfo> e)
+        void _appHost_ApplicationUpdated(object sender, GenericEventArgs<PackageVersionInfo> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("MessageApplicationUpdatedTo"), e.Argument.versionStr),
                 Type = NotificationType.ApplicationUpdateInstalled.ToString(),
@@ -298,27 +297,27 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
+        void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("MessageNamedServerConfigurationUpdatedWithValue"), e.Key),
                 Type = "NamedConfigurationUpdated"
             });
         }
 
-        async void _config_ConfigurationUpdated(object sender, EventArgs e)
+        void _config_ConfigurationUpdated(object sender, EventArgs e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = _localization.GetLocalizedString("MessageServerConfigurationUpdated"),
                 Type = "ServerConfigurationUpdated"
             });
         }
 
-        async void _userManager_UserPolicyUpdated(object sender, GenericEventArgs<User> e)
+        void _userManager_UserPolicyUpdated(object sender, GenericEventArgs<User> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserPolicyUpdatedWithName"), e.Argument.Name),
                 Type = "UserPolicyUpdated",
@@ -326,18 +325,18 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _userManager_UserDeleted(object sender, GenericEventArgs<User> e)
+        void _userManager_UserDeleted(object sender, GenericEventArgs<User> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserDeletedWithName"), e.Argument.Name),
                 Type = "UserDeleted"
             });
         }
 
-        async void _userManager_UserPasswordChanged(object sender, GenericEventArgs<User> e)
+        void _userManager_UserPasswordChanged(object sender, GenericEventArgs<User> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserPasswordChangedWithName"), e.Argument.Name),
                 Type = "UserPasswordChanged",
@@ -345,9 +344,9 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _userManager_UserCreated(object sender, GenericEventArgs<User> e)
+        void _userManager_UserCreated(object sender, GenericEventArgs<User> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserCreatedWithName"), e.Argument.Name),
                 Type = "UserCreated",
@@ -355,9 +354,9 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _subManager_SubtitlesDownloaded(object sender, SubtitleDownloadEventArgs e)
+        void _subManager_SubtitlesDownloaded(object sender, SubtitleDownloadEventArgs e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("SubtitlesDownloadedForItem"), Notifications.Notifications.GetItemName(e.Item)),
                 Type = "SubtitlesDownloaded",
@@ -366,7 +365,7 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _sessionManager_SessionStarted(object sender, SessionEventArgs e)
+        void _sessionManager_SessionStarted(object sender, SessionEventArgs e)
         {
             string name;
             var session = e.SessionInfo;
@@ -383,7 +382,7 @@ namespace Emby.Server.Implementations.Activity
                 name = string.Format(_localization.GetLocalizedString("UserOnlineFromDevice"), session.UserName, session.DeviceName);
             }
 
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = name,
                 Type = "SessionStarted",
@@ -392,9 +391,9 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _installationManager_PluginUpdated(object sender, GenericEventArgs<Tuple<IPlugin, PackageVersionInfo>> e)
+        void _installationManager_PluginUpdated(object sender, GenericEventArgs<Tuple<IPlugin, PackageVersionInfo>> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("PluginUpdatedWithName"), e.Argument.Item1.Name),
                 Type = NotificationType.PluginUpdateInstalled.ToString(),
@@ -403,18 +402,18 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _installationManager_PluginUninstalled(object sender, GenericEventArgs<IPlugin> e)
+        void _installationManager_PluginUninstalled(object sender, GenericEventArgs<IPlugin> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("PluginUninstalledWithName"), e.Argument.Name),
                 Type = NotificationType.PluginUninstalled.ToString()
             });
         }
 
-        async void _installationManager_PluginInstalled(object sender, GenericEventArgs<PackageVersionInfo> e)
+        void _installationManager_PluginInstalled(object sender, GenericEventArgs<PackageVersionInfo> e)
         {
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("PluginInstalledWithName"), e.Argument.name),
                 Type = NotificationType.PluginInstalled.ToString(),
@@ -422,11 +421,11 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _installationManager_PackageInstallationFailed(object sender, InstallationFailedEventArgs e)
+        void _installationManager_PackageInstallationFailed(object sender, InstallationFailedEventArgs e)
         {
             var installationInfo = e.InstallationInfo;
 
-            await CreateLogEntry(new ActivityLogEntry
+            CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("NameInstallFailed"), installationInfo.Name),
                 Type = NotificationType.InstallationFailed.ToString(),
@@ -435,7 +434,7 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        async void _taskManager_TaskCompleted(object sender, TaskCompletionEventArgs e)
+        void _taskManager_TaskCompleted(object sender, TaskCompletionEventArgs e)
         {
             var result = e.Result;
             var task = e.Task;
@@ -462,7 +461,7 @@ namespace Emby.Server.Implementations.Activity
                     vals.Add(e.Result.LongErrorMessage);
                 }
 
-                await CreateLogEntry(new ActivityLogEntry
+                CreateLogEntry(new ActivityLogEntry
                 {
                     Name = string.Format(_localization.GetLocalizedString("ScheduledTaskFailedWithName"), task.Name),
                     Type = NotificationType.TaskFailed.ToString(),
@@ -473,11 +472,11 @@ namespace Emby.Server.Implementations.Activity
             }
         }
 
-        private async Task CreateLogEntry(ActivityLogEntry entry)
+        private void CreateLogEntry(ActivityLogEntry entry)
         {
             try
             {
-                await _activityManager.CreateAsync(entry);
+                _activityManager.Create(entry);
             }
             catch
             {

Emby.Server.Implementations/Activity/ActivityManager.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Querying;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Activity
@@ -27,38 +26,20 @@ namespace Emby.Server.Implementations.Activity
             _userManager = userManager;
         }
 
-        public async Task CreateAsync(ActivityLogEntry entry)
+        public void Create(ActivityLogEntry entry)
         {
             entry.Date = DateTime.UtcNow;
 
-            await _repo.CreateAsync(entry);
+            _repo.Create(entry);
 
             EntryCreated?.Invoke(this, new GenericEventArgs<ActivityLogEntry>(entry));
         }
 
-        public IEnumerable<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
         {
-            var result = _repo.GetActivityLogEntries();
+            var result = _repo.GetActivityLogEntries(minDate, hasUserId, startIndex, limit);
 
-            if (minDate.HasValue)
-            {
-                result = result.Where(x => x.Date >= minDate.Value);
-            }
-            if (hasUserId.HasValue)
-            {
-                result = result.Where(x => x.UserId != null && x.UserId != Guid.Empty);
-            }
-            if (startIndex.HasValue)
-            {
-                result = result.Where(x => x.Id >= startIndex.Value);
-            }
-            if (limit.HasValue)
-            {
-                result = result.Take(limit.Value);
-            }
-
-            // Add images for each user
-            foreach (var item in result)
+            foreach (var item in result.Items.Where(i => !i.UserId.Equals(Guid.Empty)))
             {
                 var user = _userManager.GetUserById(item.UserId);
 
@@ -69,7 +50,12 @@ namespace Emby.Server.Implementations.Activity
                 }
             }
 
-            return result.AsEnumerable();
+            return result;
+        }
+
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
+        {
+            return GetActivityLogEntries(minDate, null, startIndex, limit);
         }
     }
 }

Emby.Server.Implementations/Activity/ActivityRepository.cs

@@ -1,37 +1,310 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
+using Emby.Server.Implementations.Data;
+using MediaBrowser.Controller;
 using MediaBrowser.Model.Activity;
-using Microsoft.EntityFrameworkCore;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Querying;
+using Microsoft.Extensions.Logging;
+using SQLitePCL.pretty;
 
 namespace Emby.Server.Implementations.Activity
 {
-    public class ActivityRepository : DbContext, IActivityRepository
+    public class ActivityRepository : BaseSqliteRepository, IActivityRepository
     {
-        protected string _dataDirPath;
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+        protected IFileSystem FileSystem { get; private set; }
 
-        public DbSet<ActivityLogEntry> ActivityLogs { get; set; }
-
-        public ActivityRepository(string dataDirPath)
+        public ActivityRepository(ILoggerFactory loggerFactory, IServerApplicationPaths appPaths, IFileSystem fileSystem)
+            : base(loggerFactory.CreateLogger(nameof(ActivityRepository)))
         {
-            _dataDirPath = dataDirPath;
+            DbFilePath = Path.Combine(appPaths.DataPath, "activitylog.db");
+            FileSystem = fileSystem;
         }
 
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        public void Initialize()
         {
-            // Ensure the dir exists
-            Directory.CreateDirectory(_dataDirPath);
+            try
+            {
+                InitializeInternal();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Error loading database file. Will reset and retry.");
 
-            optionsBuilder.UseSqlite($"Filename={Path.Combine(_dataDirPath, "activitylog.sqlite.db")}");
+                FileSystem.DeleteFile(DbFilePath);
+
+                InitializeInternal();
+            }
         }
 
-        public async Task CreateAsync(ActivityLogEntry entry)
+        private void InitializeInternal()
         {
-            await ActivityLogs.AddAsync(entry);
-            await SaveChangesAsync();
+            using (var connection = CreateConnection())
+            {
+                RunDefaultInitialization(connection);
+
+                connection.RunQueries(new[]
+                {
+                    "create table if not exists ActivityLog (Id INTEGER PRIMARY KEY, Name TEXT NOT NULL, Overview TEXT, ShortOverview TEXT, Type TEXT NOT NULL, ItemId TEXT, UserId TEXT, DateCreated DATETIME NOT NULL, LogSeverity TEXT NOT NULL)",
+                    "drop index if exists idx_ActivityLogEntries"
+                });
+
+                TryMigrate(connection);
+            }
         }
 
-        public IQueryable<ActivityLogEntry> GetActivityLogEntries()
-            => ActivityLogs;
+        private void TryMigrate(ManagedConnection connection)
+        {
+            try
+            {
+                if (TableExists(connection, "ActivityLogEntries"))
+                {
+                    connection.RunQueries(new[]
+                    {
+                        "INSERT INTO ActivityLog (Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) SELECT Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity FROM ActivityLogEntries",
+                        "drop table if exists ActivityLogEntries"
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Error migrating activity log database");
+            }
+        }
+
+        private const string BaseActivitySelectText = "select Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity from ActivityLog";
+
+        public void Create(ActivityLogEntry entry)
+        {
+            if (entry == null)
+            {
+                throw new ArgumentNullException(nameof(entry));
+            }
+
+            using (WriteLock.Write())
+            using (var connection = CreateConnection())
+            {
+                connection.RunInTransaction(db =>
+                {
+                    using (var statement = db.PrepareStatement("insert into ActivityLog (Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)"))
+                    {
+                        statement.TryBind("@Name", entry.Name);
+
+                        statement.TryBind("@Overview", entry.Overview);
+                        statement.TryBind("@ShortOverview", entry.ShortOverview);
+                        statement.TryBind("@Type", entry.Type);
+                        statement.TryBind("@ItemId", entry.ItemId);
+
+                        if (entry.UserId.Equals(Guid.Empty))
+                        {
+                            statement.TryBindNull("@UserId");
+                        }
+                        else
+                        {
+                            statement.TryBind("@UserId", entry.UserId.ToString("N"));
+                        }
+
+                        statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue());
+                        statement.TryBind("@LogSeverity", entry.Severity.ToString());
+
+                        statement.MoveNext();
+                    }
+                }, TransactionMode);
+            }
+        }
+
+        public void Update(ActivityLogEntry entry)
+        {
+            if (entry == null)
+            {
+                throw new ArgumentNullException(nameof(entry));
+            }
+
+            using (WriteLock.Write())
+            using (var connection = CreateConnection())
+            {
+                connection.RunInTransaction(db =>
+                {
+                    using (var statement = db.PrepareStatement("Update ActivityLog set Name=@Name,Overview=@Overview,ShortOverview=@ShortOverview,Type=@Type,ItemId=@ItemId,UserId=@UserId,DateCreated=@DateCreated,LogSeverity=@LogSeverity where Id=@Id"))
+                    {
+                        statement.TryBind("@Id", entry.Id);
+
+                        statement.TryBind("@Name", entry.Name);
+                        statement.TryBind("@Overview", entry.Overview);
+                        statement.TryBind("@ShortOverview", entry.ShortOverview);
+                        statement.TryBind("@Type", entry.Type);
+                        statement.TryBind("@ItemId", entry.ItemId);
+
+                        if (entry.UserId.Equals(Guid.Empty))
+                        {
+                            statement.TryBindNull("@UserId");
+                        }
+                        else
+                        {
+                            statement.TryBind("@UserId", entry.UserId.ToString("N"));
+                        }
+
+                        statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue());
+                        statement.TryBind("@LogSeverity", entry.Severity.ToString());
+
+                        statement.MoveNext();
+                    }
+                }, TransactionMode);
+            }
+        }
+
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
+        {
+            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
+            {
+                var commandText = BaseActivitySelectText;
+                var whereClauses = new List<string>();
+
+                if (minDate.HasValue)
+                {
+                    whereClauses.Add("DateCreated>=@DateCreated");
+                }
+                if (hasUserId.HasValue)
+                {
+                    if (hasUserId.Value)
+                    {
+                        whereClauses.Add("UserId not null");
+                    }
+                    else
+                    {
+                        whereClauses.Add("UserId is null");
+                    }
+                }
+
+                var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                  string.Empty :
+                  " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                if (startIndex.HasValue && startIndex.Value > 0)
+                {
+                    var pagingWhereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLog {0} ORDER BY DateCreated DESC LIMIT {1})",
+                        pagingWhereText,
+                        startIndex.Value.ToString(_usCulture)));
+                }
+
+                var whereText = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                commandText += whereText;
+
+                commandText += " ORDER BY DateCreated DESC";
+
+                if (limit.HasValue)
+                {
+                    commandText += " LIMIT " + limit.Value.ToString(_usCulture);
+                }
+
+                var statementTexts = new List<string>();
+                statementTexts.Add(commandText);
+                statementTexts.Add("select count (Id) from ActivityLog" + whereTextWithoutPaging);
+
+                return connection.RunInTransaction(db =>
+                {
+                    var list = new List<ActivityLogEntry>();
+                    var result = new QueryResult<ActivityLogEntry>();
+
+                    var statements = PrepareAllSafe(db, statementTexts).ToList();
+
+                    using (var statement = statements[0])
+                    {
+                        if (minDate.HasValue)
+                        {
+                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
+                        }
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(GetEntry(row));
+                        }
+                    }
+
+                    using (var statement = statements[1])
+                    {
+                        if (minDate.HasValue)
+                        {
+                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
+                        }
+
+                        result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                    }
+
+                    result.Items = list.ToArray();
+                    return result;
+
+                }, ReadTransactionMode);
+            }
+        }
+
+        private static ActivityLogEntry GetEntry(IReadOnlyList<IResultSetValue> reader)
+        {
+            var index = 0;
+
+            var info = new ActivityLogEntry
+            {
+                Id = reader[index].ToInt64()
+            };
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.Name = reader[index].ToString();
+            }
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.Overview = reader[index].ToString();
+            }
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.ShortOverview = reader[index].ToString();
+            }
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.Type = reader[index].ToString();
+            }
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.ItemId = reader[index].ToString();
+            }
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.UserId = new Guid(reader[index].ToString());
+            }
+
+            index++;
+            info.Date = reader[index].ReadDateTime();
+
+            index++;
+            if (reader[index].SQLiteType != SQLiteType.Null)
+            {
+                info.Severity = (LogLevel)Enum.Parse(typeof(LogLevel), reader[index].ToString(), true);
+            }
+
+            return info;
+        }
     }
 }

Emby.Server.Implementations/ApplicationHost.cs

@@ -709,7 +709,7 @@ namespace Emby.Server.Implementations
             }
         }
 
-        public async Task InitAsync()
+        public void Init()
         {
             HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;
             HttpsPort = ServerConfigurationManager.Configuration.HttpsPortNumber;
@@ -739,7 +739,7 @@ namespace Emby.Server.Implementations
 
             SetHttpLimit();
 
-            await RegisterResourcesAsync();
+            RegisterResources();
 
             FindParts();
         }
@@ -754,7 +754,7 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Registers resources that classes will depend on
         /// </summary>
-        protected async Task RegisterResourcesAsync()
+        protected void RegisterResources()
         {
             RegisterSingleInstance(ConfigurationManager);
             RegisterSingleInstance<IApplicationHost>(this);
@@ -931,7 +931,7 @@ namespace Emby.Server.Implementations
             EncodingManager = new MediaEncoder.EncodingManager(FileSystemManager, LoggerFactory, MediaEncoder, ChapterManager, LibraryManager);
             RegisterSingleInstance(EncodingManager);
 
-            var activityLogRepo = await GetActivityLogRepositoryAsync();
+            var activityLogRepo = GetActivityLogRepository();
             RegisterSingleInstance(activityLogRepo);
             RegisterSingleInstance<IActivityManager>(new ActivityManager(LoggerFactory, activityLogRepo, UserManager));
 
@@ -1146,11 +1146,11 @@ namespace Emby.Server.Implementations
             return repo;
         }
 
-        private async Task<IActivityRepository> GetActivityLogRepositoryAsync()
+        private IActivityRepository GetActivityLogRepository()
         {
-            var repo = new ActivityRepository(ServerConfigurationManager.ApplicationPaths.DataPath);
+            var repo = new ActivityRepository(LoggerFactory, ServerConfigurationManager.ApplicationPaths, FileSystemManager);
 
-            await repo.Database.EnsureCreatedAsync();
+            repo.Initialize();
 
             return repo;
         }

Emby.Server.Implementations/Channels/ChannelManager.cs

@@ -681,17 +681,22 @@ namespace Emby.Server.Implementations.Channels
             // Find the corresponding channel provider plugin
             var channelProvider = GetChannelProvider(channel);
 
-            var parentItem = query.ParentId == Guid.Empty ? channel : _libraryManager.GetItemById(query.ParentId);
+            var user = query.User;
+
+            ChannelItemSortField? sortField = null;
+            var sortDescending = false;
+
+            var parentItem = !query.ParentId.Equals(Guid.Empty) ? _libraryManager.GetItemById(query.ParentId) : channel;
 
             var itemsResult = await GetChannelItems(channelProvider,
-                query.User,
+                user,
                 parentItem is Channel ? null : parentItem.ExternalId,
-                null,
-                false,
+                sortField,
+                sortDescending,
                 cancellationToken)
                 .ConfigureAwait(false);
 
-            if (query.ParentId == Guid.Empty)
+            if (query.ParentId.Equals(Guid.Empty))
             {
                 query.Parent = channel;
             }

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -4712,21 +4712,9 @@ namespace Emby.Server.Implementations.Data
                         continue;
                     }
 
-                    // TODO this seems to be an idea for a better schema where ProviderIds are their own table
-                    //      buut this is not implemented
-                    //hasProviderIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")");
-
-                    // TODO this is a really BAD way to do it since the pair:
-                    //      Tmdb, 1234 matches Tmdb=1234 but also Tmdb=1234567
-                    //      and maybe even NotTmdb=1234.
-
-                    // this is a placeholder for this specific pair to correlate it in the bigger query
                     var paramName = "@HasAnyProviderId" + index;
-
-                    // this is a search for the placeholder
+                    //hasProviderIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")");
                     hasProviderIds.Add("ProviderIds like " + paramName + "");
-
-                    // this replaces the placeholder with a value, here: %key=val%
                     if (statement != null)
                     {
                         statement.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%");

Emby.Server.Implementations/Diagnostics/CommonProcess.cs

@@ -105,22 +105,26 @@ namespace Emby.Server.Implementations.Diagnostics
         {
             return _process.WaitForExit(timeMs);
         }
-        
+
         public Task<bool> WaitForExitAsync(int timeMs)
         {
-            //Note: For this function to work correctly, the option EnableRisingEvents needs to be set to true.
-
-            if (HasExited)
-            {
-                return Task.FromResult(true);
-            }
+            //if (_process.WaitForExit(100))
+            //{
+            //    return Task.FromResult(true);
+            //}
 
+            //timeMs -= 100;
             timeMs = Math.Max(0, timeMs);
 
             var tcs = new TaskCompletionSource<bool>();
 
             var cancellationToken = new CancellationTokenSource(timeMs).Token;
 
+            if (HasExited)
+            {
+                return Task.FromResult(true);
+            }
+
             _process.Exited += (sender, args) => tcs.TrySetResult(true);
 
             cancellationToken.Register(() => tcs.TrySetResult(HasExited));

Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -22,7 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
     <PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
     <PackageReference Include="sharpcompress" Version="0.22.0" />
     <PackageReference Include="SimpleInjector" Version="4.4.2" />

Emby.Server.Implementations/HttpServer/FileWriter.cs

@@ -21,7 +21,7 @@ namespace Emby.Server.Implementations.HttpServer
         private long RangeStart { get; set; }
         private long RangeEnd { get; set; }
         private long RangeLength { get; set; }
-        public long TotalContentLength { get; set; }
+        private long TotalContentLength { get; set; }
 
         public Action OnComplete { get; set; }
         public Action OnError { get; set; }

Emby.Server.Implementations/HttpServer/HttpResultFactory.cs

@@ -5,7 +5,6 @@ using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Runtime.Serialization;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
@@ -424,11 +423,13 @@ namespace Emby.Server.Implementations.HttpServer
         /// </summary>
         private object GetCachedResult(IRequest requestContext, IDictionary<string, string> responseHeaders, Guid cacheKey, string cacheKeyString, DateTime? lastDateModified, TimeSpan? cacheDuration, string contentType)
         {
+            responseHeaders["ETag"] = string.Format("\"{0}\"", cacheKeyString);
+
             bool noCache = (requestContext.Headers.Get("Cache-Control") ?? string.Empty).IndexOf("no-cache", StringComparison.OrdinalIgnoreCase) != -1;
 
             if (!noCache)
             {
-                if (IsNotModified(requestContext, cacheKey))
+                if (IsNotModified(requestContext, cacheKey, lastDateModified, cacheDuration))
                 {
                     AddAgeHeader(responseHeaders, lastDateModified);
                     AddExpiresHeader(responseHeaders, cacheKeyString, cacheDuration);
@@ -441,7 +442,7 @@ namespace Emby.Server.Implementations.HttpServer
                 }
             }
 
-            AddCachingHeaders(responseHeaders, cacheKeyString, cacheDuration);
+            AddCachingHeaders(responseHeaders, cacheKeyString, lastDateModified, cacheDuration);
 
             return null;
         }
@@ -531,11 +532,10 @@ namespace Emby.Server.Implementations.HttpServer
 
         public async Task<object> GetStaticResult(IRequest requestContext, StaticResultOptions options)
         {
+            var cacheKey = options.CacheKey;
             options.ResponseHeaders = options.ResponseHeaders ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
             var contentType = options.ContentType;
-            var etag = requestContext.Headers.Get("If-None-Match");
-            var cacheKey = etag != null ? new Guid(etag.Trim('\"')) : Guid.Empty;
+
             if (!cacheKey.Equals(Guid.Empty))
             {
                 var key = cacheKey.ToString("N");
@@ -554,6 +554,8 @@ namespace Emby.Server.Implementations.HttpServer
             var factoryFn = options.ContentFactory;
             var responseHeaders = options.ResponseHeaders;
 
+            //var requestedCompressionType = GetCompressionType(requestContext);
+
             var rangeHeader = requestContext.Headers.Get("Range");
 
             if (!isHeadRequest && !string.IsNullOrEmpty(options.Path))
@@ -566,21 +568,10 @@ namespace Emby.Server.Implementations.HttpServer
                 };
 
                 AddResponseHeaders(hasHeaders, options.ResponseHeaders);
-                // Generate an ETag based on identifying information - TODO read contents from filesystem instead?
-                var responseId = $"{hasHeaders.ContentType}{options.Path}{hasHeaders.TotalContentLength}";
-                var hashedId = MD5.Create().ComputeHash(Encoding.Default.GetBytes(responseId));
-                hasHeaders.Headers["ETag"] = new Guid(hashedId).ToString("N");
-
                 return hasHeaders;
             }
 
             var stream = await factoryFn().ConfigureAwait(false);
-            // Generate an etag based on stream content
-            var streamHash = MD5.Create().ComputeHash(stream);
-            var newEtag = new Guid(streamHash).ToString("N");
-
-            // reset position so the response can re-use it -- TODO is this ok?
-            stream.Position = 0;
 
             var totalContentLength = options.ContentLength;
             if (!totalContentLength.HasValue)
@@ -603,7 +594,6 @@ namespace Emby.Server.Implementations.HttpServer
                 };
 
                 AddResponseHeaders(hasHeaders, options.ResponseHeaders);
-                hasHeaders.Headers["ETag"] = newEtag;
                 return hasHeaders;
             }
             else
@@ -628,7 +618,6 @@ namespace Emby.Server.Implementations.HttpServer
                 };
 
                 AddResponseHeaders(hasHeaders, options.ResponseHeaders);
-                hasHeaders.Headers["ETag"] = newEtag;
                 return hasHeaders;
             }
         }
@@ -641,8 +630,16 @@ namespace Emby.Server.Implementations.HttpServer
         /// <summary>
         /// Adds the caching responseHeaders.
         /// </summary>
-        private void AddCachingHeaders(IDictionary<string, string> responseHeaders, string cacheKey, TimeSpan? cacheDuration)
+        private void AddCachingHeaders(IDictionary<string, string> responseHeaders, string cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
         {
+            // Don't specify both last modified and Etag, unless caching unconditionally. They are redundant
+            // https://developers.google.com/speed/docs/best-practices/caching#LeverageBrowserCaching
+            if (lastDateModified.HasValue && (string.IsNullOrEmpty(cacheKey) || cacheDuration.HasValue))
+            {
+                AddAgeHeader(responseHeaders, lastDateModified);
+                responseHeaders["Last-Modified"] = lastDateModified.Value.ToString("r");
+            }
+
             if (cacheDuration.HasValue)
             {
                 responseHeaders["Cache-Control"] = "public, max-age=" + Convert.ToInt32(cacheDuration.Value.TotalSeconds);
@@ -695,15 +692,28 @@ namespace Emby.Server.Implementations.HttpServer
         /// <param name="lastDateModified">The last date modified.</param>
         /// <param name="cacheDuration">Duration of the cache.</param>
         /// <returns><c>true</c> if [is not modified] [the specified cache key]; otherwise, <c>false</c>.</returns>
-        private bool IsNotModified(IRequest requestContext, Guid cacheKey)
+        private bool IsNotModified(IRequest requestContext, Guid cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
         {
+            //var isNotModified = true;
+
+            var ifModifiedSinceHeader = requestContext.Headers.Get("If-Modified-Since");
+
+            if (!string.IsNullOrEmpty(ifModifiedSinceHeader)
+                && DateTime.TryParse(ifModifiedSinceHeader, out DateTime ifModifiedSince)
+                && IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified))
+            {
+                return true;
+            }
+
             var ifNoneMatchHeader = requestContext.Headers.Get("If-None-Match");
 
             bool hasCacheKey = !cacheKey.Equals(Guid.Empty);
 
             // Validate If-None-Match
-            if (hasCacheKey && !string.IsNullOrEmpty(ifNoneMatchHeader))
+            if ((hasCacheKey && !string.IsNullOrEmpty(ifNoneMatchHeader)))
             {
+                ifNoneMatchHeader = (ifNoneMatchHeader ?? string.Empty).Trim('\"');
+
                 if (Guid.TryParse(ifNoneMatchHeader, out var ifNoneMatch)
                     && cacheKey.Equals(ifNoneMatch))
                 {

Emby.Server.Implementations/Library/MediaSourceManager.cs

@@ -469,7 +469,7 @@ namespace Emby.Server.Implementations.Library
             }
 
             // TODO: Don't hardcode this
-            const bool isAudio = false;
+            var isAudio = false;
 
             try
             {
@@ -480,11 +480,9 @@ namespace Emby.Server.Implementations.Library
                 else
                 {
                     // hack - these two values were taken from LiveTVMediaSourceProvider
-                    string cacheKey = request.OpenToken;
+                    var cacheKey = request.OpenToken;
 
-                    await new LiveStreamHelper(_mediaEncoder(), _logger, _jsonSerializer, _appPaths)
-                        .AddMediaInfoWithProbe(mediaSource, isAudio, cacheKey, true, cancellationToken)
-                        .ConfigureAwait(false);
+                    await new LiveStreamHelper(_mediaEncoder(), _logger, _jsonSerializer, _appPaths).AddMediaInfoWithProbe(mediaSource, isAudio, cacheKey, true, cancellationToken).ConfigureAwait(false);
                 }
             }
             catch (Exception ex)
@@ -493,7 +491,6 @@ namespace Emby.Server.Implementations.Library
                 AddMediaInfo(mediaSource, isAudio);
             }
 
-            // TODO: @bond Fix
             var json = _jsonSerializer.SerializeToString(mediaSource);
             _logger.LogInformation("Live stream opened: " + json);
             var clone = _jsonSerializer.DeserializeFromString<MediaSourceInfo>(json);

Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs

@@ -86,7 +86,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                     .Where(i => !LibraryManager.IgnoreFile(i, args.Parent))
                     .ToList();
 
-                return FindAudio<AudioBook>(args, args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
+                if (isBooksCollectionType)
+                {
+                    return FindAudio<AudioBook>(args, args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
+                }
+
+                return null;
             }
 
             if (LibraryManager.IsAudioFile(args.Path, libraryOptions))
@@ -140,19 +145,36 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         private T FindAudio<T>(ItemResolveArgs args, string path, Folder parent, List<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool parseName)
             where T : MediaBrowser.Controller.Entities.Audio.Audio, new()
         {
+            var multiDiscFolders = new List<FileSystemMetadata>();
+
+            var libraryOptions = args.GetLibraryOptions();
+            var filesFromOtherItems = new List<FileSystemMetadata>();
+
             // TODO: Allow GetMultiDiscMovie in here
-            const bool supportsMultiVersion = false;
+            var supportsMultiVersion = false;
 
             var result = ResolveMultipleAudio<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
                 new MultiItemResolverResult();
 
             if (result.Items.Count == 1)
             {
+                var videoPath = result.Items[0].Path;
+
                 // If we were supporting this we'd be checking filesFromOtherItems
-                var item = (T)result.Items[0];
-                item.IsInMixedFolder = false;
-                item.Name = Path.GetFileName(item.ContainingFolderPath);
-                return item;
+                var hasOtherItems = false;
+
+                if (!hasOtherItems)
+                {
+                    var item = (T)result.Items[0];
+                    item.IsInMixedFolder = false;
+                    item.Name = Path.GetFileName(item.ContainingFolderPath);
+                    return item;
+                }
+            }
+
+            if (result.Items.Count == 0 && multiDiscFolders.Count > 0)
+            {
+                //return GetMultiDiscAudio<T>(multiDiscFolders, directoryService);
             }
 
             return null;
@@ -172,7 +194,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 {
                     leftOver.Add(child);
                 }
-                else if (!IsIgnored(child.Name))
+                else if (IsIgnored(child.Name))
+                {
+
+                }
+                else
                 {
                     files.Add(child);
                 }

Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs

@@ -410,7 +410,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             // TODO: Allow GetMultiDiscMovie in here
-            const bool supportsMultiVersion = true;
+            var supportsMultiVersion = true;
 
             var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
                 new MultiItemResolverResult();

Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs

@@ -153,8 +153,16 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                         var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
 
                         var episodeResolver = new Naming.TV.EpisodeResolver(namingOptions);
+                        bool? isNamed = null;
+                        bool? isOptimistic = null;
 
-                        var episodeInfo = episodeResolver.Resolve(fullName, false, true, false, fillExtendedInfo: false);
+                        if (!isTvContentType)
+                        {
+                            isNamed = true;
+                            isOptimistic = false;
+                        }
+
+                        var episodeInfo = episodeResolver.Resolve(fullName, false, isNamed, isOptimistic, fillExtendedInfo: false);
                         if (episodeInfo != null && episodeInfo.EpisodeNumber.HasValue)
                         {
                             return true;

Emby.Server.Implementations/Library/UserManager.cs

@@ -322,14 +322,17 @@ namespace Emby.Server.Implementations.Library
                 throw new SecurityException(string.Format("The {0} account is currently disabled. Please consult with your administrator.", user.Name));
             }
 
-            if (!user.Policy.EnableRemoteAccess && !_networkManager.IsInLocalNetwork(remoteEndPoint))
+            if (user != null)
             {
-                throw new SecurityException("Forbidden.");
-            }
+                if (!user.Policy.EnableRemoteAccess && !_networkManager.IsInLocalNetwork(remoteEndPoint))
+                {
+                    throw new SecurityException("Forbidden.");
+                }
 
-            if (!user.IsParentalScheduleAllowed())
-            {
-                throw new SecurityException("User is not allowed access at this time.");
+                if (!user.IsParentalScheduleAllowed())
+                {
+                    throw new SecurityException("User is not allowed access at this time.");
+                }
             }
 
             // Update LastActivityDate and LastLoginDate, then save
@@ -460,26 +463,26 @@ namespace Emby.Server.Implementations.Library
             {
                 user.Policy.InvalidLoginAttemptCount = newValue;
 
-                var maxCount = user.Policy.IsAdministrator ? 3 : 5;
+                var maxCount = user.Policy.IsAdministrator ?
+                    3 :
+                    5;
 
-                // TODO: Fix
-                /*
                 var fireLockout = false;
 
                 if (newValue >= maxCount)
                 {
-                    _logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
-                    user.Policy.IsDisabled = true;
+                    //_logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
+                    //user.Policy.IsDisabled = true;
 
-                    fireLockout = true;
-                }*/
+                    //fireLockout = true;
+                }
 
                 UpdateUserPolicy(user, user.Policy, false);
 
-                /* if (fireLockout)
+                if (fireLockout)
                 {
                     UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
-                }*/
+                }
             }
         }
 

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -1133,8 +1133,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 IgnoreIndex = true
             };
 
-            await new LiveStreamHelper(_mediaEncoder, _logger, _jsonSerializer, _config.CommonApplicationPaths)
-                .AddMediaInfoWithProbe(stream, false, false, cancellationToken).ConfigureAwait(false);
+            var isAudio = false;
+            await new LiveStreamHelper(_mediaEncoder, _logger, _jsonSerializer, _config.CommonApplicationPaths).AddMediaInfoWithProbe(stream, isAudio, false, cancellationToken).ConfigureAwait(false);
 
             return new List<MediaSourceInfo>
             {
@@ -1149,12 +1149,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public Task RecordLiveStream(string id, CancellationToken cancellationToken)
         {
-            return Task.CompletedTask;
+            return Task.FromResult(0);
         }
 
         public Task ResetTuner(string id, CancellationToken cancellationToken)
         {
-            return Task.CompletedTask;
+            return Task.FromResult(0);
         }
 
         async void _timerProvider_TimerFired(object sender, GenericEventArgs<TimerInfo> e)

Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs

@@ -175,6 +175,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
 
             var videoStream = mediaSource.VideoStream;
+            string videoDecoder = null;
+
+            if (!string.IsNullOrEmpty(videoDecoder))
+            {
+                inputModifier += " " + videoDecoder;
+            }
 
             if (mediaSource.ReadAtNativeFramerate)
             {

Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

@@ -354,8 +354,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             int? height = null;
             bool isInterlaced = true;
             string videoCodec = null;
+            string audioCodec = null;
 
             int? videoBitrate = null;
+            int? audioBitrate = null;
 
             var isHd = channelInfo.IsHD ?? true;
 
@@ -425,17 +427,20 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 }
             }
 
-            if (string.IsNullOrWhiteSpace(videoCodec))
+            if (channelInfo != null)
             {
-                videoCodec = channelInfo.VideoCodec;
-            }
-            string audioCodec = channelInfo.AudioCodec;
+                if (string.IsNullOrWhiteSpace(videoCodec))
+                {
+                    videoCodec = channelInfo.VideoCodec;
+                }
+                audioCodec = channelInfo.AudioCodec;
 
-            if (!videoBitrate.HasValue)
-            {
-                videoBitrate = isHd ? 15000000 : 2000000;
+                if (!videoBitrate.HasValue)
+                {
+                    videoBitrate = isHd ? 15000000 : 2000000;
+                }
+                audioBitrate = isHd ? 448000 : 192000;
             }
-            int? audioBitrate = isHd ? 448000 : 192000;
 
             // normalize
             if (string.Equals(videoCodec, "mpeg2", StringComparison.OrdinalIgnoreCase))

Jellyfin.Server/Jellyfin.Server.csproj

@@ -27,10 +27,6 @@
     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />

Jellyfin.Server/Program.cs

@@ -99,7 +99,7 @@ namespace Jellyfin.Server
                 new SystemEvents(),
                 new NetworkManager(_loggerFactory, environmentInfo)))
             {
-                await appHost.InitAsync();
+                appHost.Init();
 
                 appHost.ImageProcessor.ImageEncoder = GetImageEncoder(fileSystem, appPaths, appHost.LocalizationManager);
 
@@ -108,6 +108,7 @@ namespace Jellyfin.Server
                 await appHost.RunStartupTasks();
 
                 // TODO: read input for a stop command
+
                 try
                 {
                     // Block main thread until shutdown
@@ -166,6 +167,7 @@ namespace Jellyfin.Server
             {
                 Directory.CreateDirectory(programDataPath);
             }
+
             string configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");
             if (string.IsNullOrEmpty(configDir))
             {
@@ -222,7 +224,7 @@ namespace Jellyfin.Server
                         .GetManifestResourceStream("Jellyfin.Server.Resources.Configuration.logging.json"))
                     using (Stream fstr = File.Open(configPath, FileMode.CreateNew))
                     {
-                        await rscstr.CopyToAsync(fstr).ConfigureAwait(false);
+                        await rscstr.CopyToAsync(fstr);
                     }
                 }
                 var configuration = new ConfigurationBuilder()
@@ -332,9 +334,11 @@ namespace Jellyfin.Server
             }
             else
             {
-                commandLineArgsString = string.Join(
-                    " ",
-                    Environment.GetCommandLineArgs().Skip(1).Select(NormalizeCommandLineArgument));
+                commandLineArgsString = string.Join(" ",
+                    Environment.GetCommandLineArgs()
+                        .Skip(1)
+                        .Select(NormalizeCommandLineArgument)
+                    );
             }
 
             _logger.LogInformation("Executable: {0}", module);

Jellyfin.Server/SocketSharp/RequestMono.cs

@@ -15,27 +15,19 @@ namespace Jellyfin.SocketSharp
         {
             int ap = header.IndexOf(attr);
             if (ap == -1)
-            {
                 return null;
-            }
 
             ap += attr.Length;
             if (ap >= header.Length)
-            {
                 return null;
-            }
 
             char ending = header[ap];
             if (ending != '"')
-            {
                 ending = ' ';
-            }
 
             int end = header.IndexOf(ending, ap + 1);
             if (end == -1)
-            {
                 return ending == '"' ? null : header.Substring(ap);
-            }
 
             return header.Substring(ap + 1, end - ap - 1);
         }
@@ -44,9 +36,7 @@ namespace Jellyfin.SocketSharp
         {
             string boundary = GetParameter(ContentType, "; boundary=");
             if (boundary == null)
-            {
                 return;
-            }
 
             using (var requestStream = InputStream)
             {
@@ -134,9 +124,7 @@ namespace Jellyfin.SocketSharp
         {
             string v = "\"" + value + "\"";
             if (v.Length > 20)
-            {
                 v = v.Substring(0, 16) + "...\"";
-            }
 
             string msg = string.Format("A potentially dangerous Request.{0} value was " +
                             "detected from the client ({1}={2}).", name, key, v);
@@ -147,23 +135,21 @@ namespace Jellyfin.SocketSharp
         static void ValidateNameValueCollection(string name, QueryParamCollection coll)
         {
             if (coll == null)
-            {
                 return;
-            }
 
             foreach (var pair in coll)
             {
                 var key = pair.Name;
                 var val = pair.Value;
                 if (val != null && val.Length > 0 && IsInvalidString(val))
-                {
                     ThrowValidationException(name, key, val);
-                }
             }
         }
 
         internal static bool IsInvalidString(string val)
-            => IsInvalidString(val, out var validationFailureIndex);
+        {
+            return IsInvalidString(val, out var validationFailureIndex);
+        }
 
         internal static bool IsInvalidString(string val, out int validationFailureIndex)
         {
@@ -171,9 +157,7 @@ namespace Jellyfin.SocketSharp
 
             int len = val.Length;
             if (len < 2)
-            {
                 return false;
-            }
 
             char current = val[0];
             for (int idx = 1; idx < len; idx++)
@@ -211,15 +195,10 @@ namespace Jellyfin.SocketSharp
 
         bool IsContentType(string ct, bool starts_with)
         {
-            if (ct == null || ContentType == null)
-            {
-                return false;
-            }
+            if (ct == null || ContentType == null) return false;
 
             if (starts_with)
-            {
                 return StrUtils.StartsWith(ContentType, ct, true);
-            }
 
             return string.Equals(ContentType, ct, StringComparison.OrdinalIgnoreCase);
         }
@@ -252,9 +231,7 @@ namespace Jellyfin.SocketSharp
                                         break;
                                     }
                                     else
-                                    {
                                         value.Append((char)c);
-                                    }
                                 }
                                 if (c == -1)
                                 {
@@ -263,26 +240,22 @@ namespace Jellyfin.SocketSharp
                                 }
                             }
                             else if (c == '&')
-                            {
                                 AddRawKeyValue(form, key, value);
-                            }
                             else
-                            {
                                 key.Append((char)c);
-                            }
                         }
                         if (c == -1)
-                        {
                             AddRawKeyValue(form, key, value);
-                        }
                     }
                 }
             }
         }
 
-        static void AddRawKeyValue(WebROCollection form, StringBuilder key, StringBuilder value)
+        void AddRawKeyValue(WebROCollection form, StringBuilder key, StringBuilder value)
         {
-            form.Add(WebUtility.UrlDecode(key.ToString()), WebUtility.UrlDecode(value.ToString()));
+            string decodedKey = WebUtility.UrlDecode(key.ToString());
+            form.Add(decodedKey,
+                  WebUtility.UrlDecode(value.ToString()));
 
             key.Length = 0;
             value.Length = 0;
@@ -298,9 +271,7 @@ namespace Jellyfin.SocketSharp
                 foreach (var pair in this)
                 {
                     if (result.Length > 0)
-                    {
                         result.Append('&');
-                    }
 
                     var key = pair.Name;
                     if (key != null && key.Length > 0)
@@ -343,52 +314,33 @@ namespace Jellyfin.SocketSharp
                 public override int Read(byte[] buffer, int dest_offset, int count)
                 {
                     if (buffer == null)
-                    {
                         throw new ArgumentNullException(nameof(buffer));
-                    }
 
                     if (dest_offset < 0)
-                    {
                         throw new ArgumentOutOfRangeException(nameof(dest_offset), "< 0");
-                    }
 
                     if (count < 0)
-                    {
                         throw new ArgumentOutOfRangeException(nameof(count), "< 0");
-                    }
 
                     int len = buffer.Length;
                     if (dest_offset > len)
-                    {
                         throw new ArgumentException("destination offset is beyond array size");
-                    }
-
                     // reordered to avoid possible integer overflow
                     if (dest_offset > len - count)
-                    {
                         throw new ArgumentException("Reading would overrun buffer");
-                    }
 
                     if (count > end - position)
-                    {
                         count = (int)(end - position);
-                    }
 
                     if (count <= 0)
-                    {
                         return 0;
-                    }
 
                     s.Position = position;
                     int result = s.Read(buffer, dest_offset, count);
                     if (result > 0)
-                    {
                         position += result;
-                    }
                     else
-                    {
                         position = end;
-                    }
 
                     return result;
                 }
@@ -396,20 +348,14 @@ namespace Jellyfin.SocketSharp
                 public override int ReadByte()
                 {
                     if (position >= end)
-                    {
                         return -1;
-                    }
 
                     s.Position = position;
                     int result = s.ReadByte();
                     if (result < 0)
-                    {
                         position = end;
-                    }
                     else
-                    {
                         position++;
-                    }
 
                     return result;
                 }
@@ -434,9 +380,7 @@ namespace Jellyfin.SocketSharp
 
                     long virt = real - offset;
                     if (virt < 0 || virt > Length)
-                    {
                         throw new ArgumentException();
-                    }
 
                     position = s.Seek(real, SeekOrigin.Begin);
                     return position;
@@ -466,9 +410,7 @@ namespace Jellyfin.SocketSharp
                     set
                     {
                         if (value > Length)
-                        {
-                            throw new ArgumentOutOfRangeException(nameof(value));
-                        }
+                            throw new ArgumentOutOfRangeException();
 
                         position = Seek(value, SeekOrigin.Begin);
                     }
@@ -496,7 +438,7 @@ namespace Jellyfin.SocketSharp
             public static readonly CultureInfo InvariantCulture = CultureInfo.InvariantCulture;
         }
 
-        internal static class StrUtils
+        internal sealed class StrUtils
         {
             public static bool StartsWith(string str1, string str2, bool ignore_case)
             {
@@ -513,15 +455,11 @@ namespace Jellyfin.SocketSharp
             {
                 int l2 = str2.Length;
                 if (l2 == 0)
-                {
                     return true;
-                }
 
                 int l1 = str1.Length;
                 if (l2 > l1)
-                {
                     return false;
-                }
 
                 var comparison = ignore_case ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
                 return str1.IndexOf(str2, comparison) == str1.Length - str2.Length - 1;
@@ -555,7 +493,7 @@ namespace Jellyfin.SocketSharp
             Encoding encoding;
             StringBuilder sb;
 
-            const byte LF = (byte)'\n', CR = (byte)'\r';
+            const byte HYPHEN = (byte)'-', LF = (byte)'\n', CR = (byte)'\r';
 
             // See RFC 2046
             // In the case of multipart entities, in which one or more different
@@ -582,7 +520,7 @@ namespace Jellyfin.SocketSharp
                 sb = new StringBuilder();
             }
 
-            private string ReadLine()
+            string ReadLine()
             {
                 // CRLF or LF are ok as line endings.
                 bool got_cr = false;
@@ -605,86 +543,58 @@ namespace Jellyfin.SocketSharp
                 }
 
                 if (got_cr)
-                {
                     sb.Length--;
-                }
 
                 return sb.ToString();
 
             }
 
-            private static string GetContentDispositionAttribute(string l, string name)
+            static string GetContentDispositionAttribute(string l, string name)
             {
                 int idx = l.IndexOf(name + "=\"");
                 if (idx < 0)
-                {
                     return null;
-                }
-
                 int begin = idx + name.Length + "=\"".Length;
                 int end = l.IndexOf('"', begin);
                 if (end < 0)
-                {
                     return null;
-                }
-
                 if (begin == end)
-                {
-                    return string.Empty;
-                }
-
+                    return "";
                 return l.Substring(begin, end - begin);
             }
 
-            private string GetContentDispositionAttributeWithEncoding(string l, string name)
+            string GetContentDispositionAttributeWithEncoding(string l, string name)
             {
                 int idx = l.IndexOf(name + "=\"");
                 if (idx < 0)
-                {
                     return null;
-                }
-
                 int begin = idx + name.Length + "=\"".Length;
                 int end = l.IndexOf('"', begin);
                 if (end < 0)
-                {
                     return null;
-                }
-
                 if (begin == end)
-                {
-                    return string.Empty;
-                }
+                    return "";
 
                 string temp = l.Substring(begin, end - begin);
                 byte[] source = new byte[temp.Length];
                 for (int i = temp.Length - 1; i >= 0; i--)
-                {
                     source[i] = (byte)temp[i];
-                }
 
                 return encoding.GetString(source, 0, source.Length);
             }
 
-            private bool ReadBoundary()
+            bool ReadBoundary()
             {
                 try
                 {
                     string line = ReadLine();
-                    while (line == string.Empty)
-                    {
+                    while (line == "")
                         line = ReadLine();
-                    }
-
                     if (line[0] != '-' || line[1] != '-')
-                    {
                         return false;
-                    }
 
                     if (!StrUtils.EndsWith(line, boundary, false))
-                    {
                         return true;
-                    }
                 }
                 catch
                 {
@@ -693,31 +603,25 @@ namespace Jellyfin.SocketSharp
                 return false;
             }
 
-            private string ReadHeaders()
+            string ReadHeaders()
             {
                 string s = ReadLine();
-                if (s.Length == 0)
-                {
+                if (s == "")
                     return null;
-                }
 
                 return s;
             }
 
-            private static bool CompareBytes(byte[] orig, byte[] other)
+            bool CompareBytes(byte[] orig, byte[] other)
             {
                 for (int i = orig.Length - 1; i >= 0; i--)
-                {
                     if (orig[i] != other[i])
-                    {
                         return false;
-                    }
-                }
 
                 return true;
             }
 
-            private long MoveToNextBoundary()
+            long MoveToNextBoundary()
             {
                 long retval = 0;
                 bool got_cr = false;
@@ -727,18 +631,13 @@ namespace Jellyfin.SocketSharp
                 while (true)
                 {
                     if (c == -1)
-                    {
                         return -1;
-                    }
 
                     if (state == 0 && c == LF)
                     {
                         retval = data.Position - 1;
                         if (got_cr)
-                        {
                             retval--;
-                        }
-
                         state = 1;
                         c = data.ReadByte();
                     }
@@ -751,9 +650,7 @@ namespace Jellyfin.SocketSharp
                     {
                         c = data.ReadByte();
                         if (c == -1)
-                        {
                             return -1;
-                        }
 
                         if (c != '-')
                         {
@@ -765,9 +662,7 @@ namespace Jellyfin.SocketSharp
                         int nread = data.Read(buffer, 0, buffer.Length);
                         int bl = buffer.Length;
                         if (nread != bl)
-                        {
                             return -1;
-                        }
 
                         if (!CompareBytes(boundary_bytes, buffer))
                         {
@@ -778,7 +673,6 @@ namespace Jellyfin.SocketSharp
                                 data.Position++;
                                 got_cr = false;
                             }
-
                             c = data.ReadByte();
                             continue;
                         }
@@ -796,16 +690,12 @@ namespace Jellyfin.SocketSharp
                                 data.Position++;
                                 got_cr = false;
                             }
-
                             c = data.ReadByte();
                             continue;
                         }
                         data.Position = retval + 2;
                         if (got_cr)
-                        {
                             data.Position++;
-                        }
-
                         break;
                     }
                     else
@@ -821,9 +711,7 @@ namespace Jellyfin.SocketSharp
             public Element ReadNextElement()
             {
                 if (at_eof || ReadBoundary())
-                {
                     return null;
-                }
 
                 var elem = new Element();
                 string header;
@@ -846,27 +734,19 @@ namespace Jellyfin.SocketSharp
                 elem.Start = start;
                 long pos = MoveToNextBoundary();
                 if (pos == -1)
-                {
                     return null;
-                }
 
                 elem.Length = pos - start;
                 return elem;
             }
 
-            private static string StripPath(string path)
+            static string StripPath(string path)
             {
                 if (path == null || path.Length == 0)
-                {
                     return path;
-                }
 
-                if (path.IndexOf(":\\", StringComparison.Ordinal) != 1
-                    && !path.StartsWith("\\\\", StringComparison.Ordinal))
-                {
+                if (path.IndexOf(":\\") != 1 && !path.StartsWith("\\\\"))
                     return path;
-                }
-
                 return path.Substring(path.LastIndexOf('\\') + 1);
             }
         }

Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs

@@ -83,15 +83,15 @@ namespace Jellyfin.SocketSharp
 
         private void ProcessContext(HttpListenerContext context)
         {
-            var _ = Task.Run(async () => await InitTask(context, _disposeCancellationToken));
+            //InitTask(context, _disposeCancellationToken);
+            Task.Run(() => InitTask(context, _disposeCancellationToken));
         }
 
-        private static void LogRequest(ILogger logger, HttpListenerRequest request)
+        private void LogRequest(ILogger logger, HttpListenerRequest request)
         {
             var url = request.Url.ToString();
 
-            logger.LogInformation("{0} {1}. UserAgent: {2}",
-                request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod, url, request.UserAgent ?? string.Empty);
+            logger.LogInformation("{0} {1}. UserAgent: {2}", request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod, url, request.UserAgent ?? string.Empty);
         }
 
         private Task InitTask(HttpListenerContext context, CancellationToken cancellationToken)
@@ -196,7 +196,7 @@ namespace Jellyfin.SocketSharp
         {
             try
             {
-                ctx.Response.StatusCode = statusCode;
+                ctx.Response.StatusCode = 200;
                 ctx.Response.Close();
             }
             catch (ObjectDisposedException)

Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs

@@ -242,6 +242,7 @@ namespace Jellyfin.SocketSharp
             return request.ContentType.StartsWith(contentType, StringComparison.OrdinalIgnoreCase);
         }
 
+        public const string Xml = "application/xml";
         private static string GetQueryStringContentType(IRequest httpReq)
         {
             var format = httpReq.QueryString["format"];
@@ -249,40 +250,22 @@ namespace Jellyfin.SocketSharp
             {
                 const int formatMaxLength = 4;
                 var pi = httpReq.PathInfo;
-                if (pi == null || pi.Length <= formatMaxLength)
-                {
-                    return null;
-                }
-                if (pi[0] == '/')
-                {
-                    pi = pi.Substring(1);
-                }
+                if (pi == null || pi.Length <= formatMaxLength) return null;
+                if (pi[0] == '/') pi = pi.Substring(1);
                 format = LeftPart(pi, '/');
-                if (format.Length > formatMaxLength)
-                {
-                    return null;
-                }
+                if (format.Length > formatMaxLength) return null;
             }
 
             format = LeftPart(format, '.').ToLower();
-            if (format.Contains("json", StringComparison.OrdinalIgnoreCase))
-            {
-                return "application/json";
-            }
-            if (format.Contains("xml", StringComparison.OrdinalIgnoreCase))
-            {
-                return "application/xml";
-            }
+            if (format.Contains("json")) return "application/json";
+            if (format.Contains("xml")) return Xml;
 
             return null;
         }
 
         public static string LeftPart(string strVal, char needle)
         {
-            if (strVal == null)
-            {
-                return null;
-            }
+            if (strVal == null) return null;
             var pos = strVal.IndexOf(needle);
             return pos == -1
                 ? strVal
@@ -300,14 +283,14 @@ namespace Jellyfin.SocketSharp
                 {
                     var mode = HandlerFactoryPath;
 
-                    var pos = request.RawUrl.IndexOf("?", StringComparison.Ordinal);
+                    var pos = request.RawUrl.IndexOf("?");
                     if (pos != -1)
                     {
                         var path = request.RawUrl.Substring(0, pos);
                         this.pathInfo = GetPathInfo(
                             path,
                             mode,
-                            mode ?? string.Empty);
+                            mode ?? "");
                     }
                     else
                     {
@@ -324,27 +307,18 @@ namespace Jellyfin.SocketSharp
         private static string GetPathInfo(string fullPath, string mode, string appPath)
         {
             var pathInfo = ResolvePathInfoFromMappedPath(fullPath, mode);
-            if (!string.IsNullOrEmpty(pathInfo))
-            {
-                return pathInfo;
-            }
+            if (!string.IsNullOrEmpty(pathInfo)) return pathInfo;
 
             //Wildcard mode relies on this to work out the handlerPath
             pathInfo = ResolvePathInfoFromMappedPath(fullPath, appPath);
-            if (!string.IsNullOrEmpty(pathInfo))
-            {
-                return pathInfo;
-            }
+            if (!string.IsNullOrEmpty(pathInfo)) return pathInfo;
 
             return fullPath;
         }
 
         private static string ResolvePathInfoFromMappedPath(string fullPath, string mappedPathRoot)
         {
-            if (mappedPathRoot == null)
-            {
-                return null;
-            }
+            if (mappedPathRoot == null) return null;
 
             var sbPathInfo = new StringBuilder();
             var fullPathParts = fullPath.Split('/');
@@ -371,10 +345,7 @@ namespace Jellyfin.SocketSharp
                     }
                 }
             }
-            if (!pathRootFound)
-            {
-                return null;
-            }
+            if (!pathRootFound) return null;
 
             var path = sbPathInfo.ToString();
             return path.Length > 1 ? path.TrimEnd('/') : "/";
@@ -429,10 +400,7 @@ namespace Jellyfin.SocketSharp
         public static Encoding GetEncoding(string contentTypeHeader)
         {
             var param = GetParameter(contentTypeHeader, "charset=");
-            if (param == null)
-            {
-                return null;
-            }
+            if (param == null) return null;
             try
             {
                 return Encoding.GetEncoding(param);
@@ -455,9 +423,7 @@ namespace Jellyfin.SocketSharp
                 if (httpFiles == null)
                 {
                     if (files == null)
-                    {
-                        return httpFiles = Array.Empty<IHttpFile>();
-                    }
+                        return httpFiles = new IHttpFile[0];
 
                     httpFiles = new IHttpFile[files.Count];
                     var i = 0;

MediaBrowser.Api/Library/LibraryService.cs

@@ -839,7 +839,7 @@ namespace MediaBrowser.Api.Library
         {
             try
             {
-                _activityManager.CreateAsync(new ActivityLogEntry
+                _activityManager.Create(new ActivityLogEntry
                 {
                     Name = string.Format(_localization.GetLocalizedString("UserDownloadingItemWithValues"), user.Name, item.Name),
                     Type = "UserDownloadingContent",

MediaBrowser.Api/Playback/MediaInfoService.cs

@@ -74,19 +74,8 @@ namespace MediaBrowser.Api.Playback
         private readonly IUserManager _userManager;
         private readonly IJsonSerializer _json;
         private readonly IAuthorizationContext _authContext;
-        private readonly ILogger _logger;
 
-        public MediaInfoService(
-            IMediaSourceManager mediaSourceManager,
-            IDeviceManager deviceManager,
-            ILibraryManager libraryManager,
-            IServerConfigurationManager config,
-            INetworkManager networkManager,
-            IMediaEncoder mediaEncoder,
-            IUserManager userManager,
-            IJsonSerializer json,
-            IAuthorizationContext authContext,
-            ILoggerFactory loggerFactory)
+        public MediaInfoService(IMediaSourceManager mediaSourceManager, IDeviceManager deviceManager, ILibraryManager libraryManager, IServerConfigurationManager config, INetworkManager networkManager, IMediaEncoder mediaEncoder, IUserManager userManager, IJsonSerializer json, IAuthorizationContext authContext)
         {
             _mediaSourceManager = mediaSourceManager;
             _deviceManager = deviceManager;
@@ -97,7 +86,6 @@ namespace MediaBrowser.Api.Playback
             _userManager = userManager;
             _json = json;
             _authContext = authContext;
-            _logger = loggerFactory.CreateLogger(nameof(MediaInfoService));
         }
 
         public object Get(GetBitrateTestBytes request)
@@ -177,7 +165,7 @@ namespace MediaBrowser.Api.Playback
 
             var profile = request.DeviceProfile;
 
-            //Logger.LogInformation("GetPostedPlaybackInfo profile: {profile}", _json.SerializeToString(profile));
+            //Logger.Info("GetPostedPlaybackInfo profile: {0}", _json.SerializeToString(profile));
 
             if (profile == null)
             {
@@ -274,7 +262,7 @@ namespace MediaBrowser.Api.Playback
                 catch (Exception ex)
                 {
                     mediaSources = new List<MediaSourceInfo>();
-                    _logger.LogError(ex, "Could not find media sources for item id {id}", id);
+                    // TODO Log exception
                     // TODO PlaybackException ??
                     //result.ErrorCode = ex.ErrorCode;
                 }

MediaBrowser.Api/Playback/UniversalAudioService.cs

@@ -19,7 +19,6 @@ using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.System;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Playback
 {
@@ -76,24 +75,7 @@ namespace MediaBrowser.Api.Playback
     [Authenticated]
     public class UniversalAudioService : BaseApiService
     {
-        public UniversalAudioService(
-            IServerConfigurationManager serverConfigurationManager,
-            IUserManager userManager,
-            ILibraryManager libraryManager,
-            IIsoManager isoManager,
-            IMediaEncoder mediaEncoder,
-            IFileSystem fileSystem,
-            IDlnaManager dlnaManager,
-            IDeviceManager deviceManager,
-            ISubtitleEncoder subtitleEncoder,
-            IMediaSourceManager mediaSourceManager,
-            IZipClient zipClient,
-            IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext,
-            IImageProcessor imageProcessor,
-            INetworkManager networkManager,
-            IEnvironmentInfo environmentInfo,
-            ILoggerFactory loggerFactory)
+        public UniversalAudioService(IServerConfigurationManager serverConfigurationManager, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, IDeviceManager deviceManager, ISubtitleEncoder subtitleEncoder, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor, INetworkManager networkManager, IEnvironmentInfo environmentInfo)
         {
             ServerConfigurationManager = serverConfigurationManager;
             UserManager = userManager;
@@ -111,8 +93,6 @@ namespace MediaBrowser.Api.Playback
             ImageProcessor = imageProcessor;
             NetworkManager = networkManager;
             EnvironmentInfo = environmentInfo;
-            _loggerFactory = loggerFactory;
-            _logger = loggerFactory.CreateLogger(nameof(UniversalAudioService));
         }
 
         protected IServerConfigurationManager ServerConfigurationManager { get; private set; }
@@ -131,8 +111,6 @@ namespace MediaBrowser.Api.Playback
         protected IImageProcessor ImageProcessor { get; private set; }
         protected INetworkManager NetworkManager { get; private set; }
         protected IEnvironmentInfo EnvironmentInfo { get; private set; }
-        private ILoggerFactory _loggerFactory;
-        private ILogger _logger;
 
         public Task<object> Get(GetUniversalAudioStream request)
         {
@@ -243,7 +221,7 @@ namespace MediaBrowser.Api.Playback
 
             AuthorizationContext.GetAuthorizationInfo(Request).DeviceId = request.DeviceId;
 
-            var mediaInfoService = new MediaInfoService(MediaSourceManager, DeviceManager, LibraryManager, ServerConfigurationManager, NetworkManager, MediaEncoder, UserManager, JsonSerializer, AuthorizationContext, _loggerFactory)
+            var mediaInfoService = new MediaInfoService(MediaSourceManager, DeviceManager, LibraryManager, ServerConfigurationManager, NetworkManager, MediaEncoder, UserManager, JsonSerializer, AuthorizationContext)
             {
                 Request = Request
             };

MediaBrowser.Common/IApplicationHost.cs

@@ -131,7 +131,7 @@ namespace MediaBrowser.Common
         /// <summary>
         /// Inits this instance.
         /// </summary>
-        Task InitAsync();
+        void Init();
 
         /// <summary>
         /// Creates the instance.

MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs

@@ -96,7 +96,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// </summary>
         /// <value>The tracks.</value>
         [IgnoreDataMember]
-        public IEnumerable<Audio> Tracks => GetRecursiveChildren(i => i is Audio).Cast<Audio>();
+        public IEnumerable<BaseItem> Tracks => GetRecursiveChildren(i => i is Audio);
 
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -357,7 +357,7 @@ namespace MediaBrowser.Controller.Entities
         {
             var list = new List<Tuple<StringBuilder, bool>>();
 
-            int thisMarker = 0;
+            int thisMarker = 0, thisNumericChunk = 0;
 
             while (thisMarker < s1.Length)
             {

MediaBrowser.Controller/Entities/Folder.cs

@@ -644,9 +644,12 @@ namespace MediaBrowser.Controller.Entities
                 return PostFilterAndSort(items, query, true);
             }
 
-            if (!(this is UserRootFolder) && !(this is AggregateFolder) && query.ParentId == Guid.Empty)
+            if (!(this is UserRootFolder) && !(this is AggregateFolder))
             {
-                query.Parent = this;
+                if (!query.ParentId.Equals(Guid.Empty))
+                {
+                    query.Parent = this;
+                }
             }
 
             if (RequiresPostFiltering2(query))

MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

@@ -437,7 +437,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 UseShellExecute = false,
                 FileName = _mediaEncoder.EncoderPath,
                 Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
-                EnableRaisingEvents = true,
+
                 IsHidden = true,
                 ErrorDialog = false
             });
@@ -574,7 +574,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 CreateNoWindow = true,
                 UseShellExecute = false,
-                EnableRaisingEvents = true,
+
                 FileName = _mediaEncoder.EncoderPath,
                 Arguments = processArgs,
                 IsHidden = true,

MediaBrowser.Model/Activity/IActivityManager.cs

@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
 {
@@ -9,8 +8,10 @@ namespace MediaBrowser.Model.Activity
     {
         event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
 
-        Task CreateAsync(ActivityLogEntry entry);
+        void Create(ActivityLogEntry entry);
 
-        IEnumerable<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? x, int? y);
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit);
+
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? x, int? y);
     }
 }

MediaBrowser.Model/Activity/IActivityRepository.cs

@@ -1,12 +1,12 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
 {
     public interface IActivityRepository
     {
-        Task CreateAsync(ActivityLogEntry entry);
+        void Create(ActivityLogEntry entry);
 
-        IQueryable<ActivityLogEntry> GetActivityLogEntries();
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? z, int? startIndex, int? limit);
     }
 }

MediaBrowser.Model/Dlna/AudioOptions.cs

@@ -66,21 +66,21 @@ namespace MediaBrowser.Model.Dlna
                 return MaxBitrate;
             }
 
-            if (Profile == null)
+            if (Profile != null)
             {
-                return null;
-            }
-
-            if (Context == EncodingContext.Static)
-            {
-                if (isAudio && Profile.MaxStaticMusicBitrate.HasValue)
+                if (Context == EncodingContext.Static)
                 {
-                    return Profile.MaxStaticMusicBitrate;
+                    if (isAudio && Profile.MaxStaticMusicBitrate.HasValue)
+                    {
+                        return Profile.MaxStaticMusicBitrate;
+                    }
+                    return Profile.MaxStaticBitrate;
                 }
-                return Profile.MaxStaticBitrate;
+
+                return Profile.MaxStreamingBitrate;
             }
 
-            return Profile.MaxStreamingBitrate;
+            return null;
         }
     }
 }

MediaBrowser.Model/Dlna/ConditionProcessor.cs

@@ -5,10 +5,9 @@ using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.Model.Dlna
 {
-    public static class ConditionProcessor
+    public class ConditionProcessor
     {
-        public static bool IsVideoConditionSatisfied(
-            ProfileCondition condition,
+        public bool IsVideoConditionSatisfied(ProfileCondition condition,
             int? width,
             int? height,
             int? videoBitDepth,
@@ -65,7 +64,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public static bool IsImageConditionSatisfied(ProfileCondition condition, int? width, int? height)
+        public bool IsImageConditionSatisfied(ProfileCondition condition, int? width, int? height)
         {
             switch (condition.Property)
             {
@@ -78,7 +77,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public static bool IsAudioConditionSatisfied(ProfileCondition condition, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
+        public bool IsAudioConditionSatisfied(ProfileCondition condition, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
         {
             switch (condition.Property)
             {
@@ -95,8 +94,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public static bool IsVideoAudioConditionSatisfied(
-            ProfileCondition condition,
+        public bool IsVideoAudioConditionSatisfied(ProfileCondition condition,
             int? audioChannels,
             int? audioBitrate,
             int? audioSampleRate,
@@ -123,7 +121,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        private static bool IsConditionSatisfied(ProfileCondition condition, int? currentValue)
+        private bool IsConditionSatisfied(ProfileCondition condition, int? currentValue)
         {
             if (!currentValue.HasValue)
             {
@@ -152,7 +150,7 @@ namespace MediaBrowser.Model.Dlna
             return false;
         }
 
-        private static bool IsConditionSatisfied(ProfileCondition condition, string currentValue)
+        private bool IsConditionSatisfied(ProfileCondition condition, string currentValue)
         {
             if (string.IsNullOrEmpty(currentValue))
             {
@@ -177,7 +175,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        private static bool IsConditionSatisfied(ProfileCondition condition, bool? currentValue)
+        private bool IsConditionSatisfied(ProfileCondition condition, bool? currentValue)
         {
             if (!currentValue.HasValue)
             {
@@ -201,7 +199,7 @@ namespace MediaBrowser.Model.Dlna
             return false;
         }
 
-        private static bool IsConditionSatisfied(ProfileCondition condition, float currentValue)
+        private bool IsConditionSatisfied(ProfileCondition condition, float currentValue)
         {
             if (currentValue <= 0)
             {
@@ -229,7 +227,7 @@ namespace MediaBrowser.Model.Dlna
             return false;
         }
 
-        private static bool IsConditionSatisfied(ProfileCondition condition, double? currentValue)
+        private bool IsConditionSatisfied(ProfileCondition condition, double? currentValue)
         {
             if (!currentValue.HasValue)
             {
@@ -257,7 +255,7 @@ namespace MediaBrowser.Model.Dlna
             return false;
         }
 
-        private static bool IsConditionSatisfied(ProfileCondition condition, TransportStreamTimestamp? timestamp)
+        private bool IsConditionSatisfied(ProfileCondition condition, TransportStreamTimestamp? timestamp)
         {
             if (!timestamp.HasValue)
             {

MediaBrowser.Model/Dlna/DeviceProfile.cs

@@ -188,10 +188,12 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
+                var conditionProcessor = new ConditionProcessor();
+
                 var anyOff = false;
                 foreach (ProfileCondition c in i.Conditions)
                 {
-                    if (!ConditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate, audioBitDepth))
+                    if (!conditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate, audioBitDepth))
                     {
                         anyOff = true;
                         break;
@@ -233,10 +235,12 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
+                var conditionProcessor = new ConditionProcessor();
+
                 var anyOff = false;
                 foreach (var c in i.Conditions)
                 {
-                    if (!ConditionProcessor.IsImageConditionSatisfied(GetModelProfileCondition(c), width, height))
+                    if (!conditionProcessor.IsImageConditionSatisfied(GetModelProfileCondition(c), width, height))
                     {
                         anyOff = true;
                         break;
@@ -297,10 +301,12 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
+                var conditionProcessor = new ConditionProcessor();
+
                 var anyOff = false;
                 foreach (ProfileCondition c in i.Conditions)
                 {
-                    if (!ConditionProcessor.IsVideoConditionSatisfied(GetModelProfileCondition(c), width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
+                    if (!conditionProcessor.IsVideoConditionSatisfied(GetModelProfileCondition(c), width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                     {
                         anyOff = true;
                         break;

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -93,10 +93,19 @@ namespace MediaBrowser.Model.Dlna
             return GetOptimalStream(streams, options.GetMaxBitrate(false) ?? 0);
         }
 
-        private static StreamInfo GetOptimalStream(List<StreamInfo> streams, long maxBitrate)
-            => SortMediaSources(streams, maxBitrate).FirstOrDefault();
+        private StreamInfo GetOptimalStream(List<StreamInfo> streams, long maxBitrate)
+        {
+            var sorted = SortMediaSources(streams, maxBitrate);
 
-        private static IOrderedEnumerable<StreamInfo> SortMediaSources(List<StreamInfo> streams, long maxBitrate)
+            foreach (StreamInfo stream in sorted)
+            {
+                return stream;
+            }
+
+            return null;
+        }
+
+        private StreamInfo[] SortMediaSources(List<StreamInfo> streams, long maxBitrate)
         {
             return streams.OrderBy(i =>
             {
@@ -142,17 +151,25 @@ namespace MediaBrowser.Model.Dlna
 
                 return 0;
 
-            }).ThenBy(streams.IndexOf);
+            }).ThenBy(streams.IndexOf).ToArray();
         }
 
-        private static TranscodeReason? GetTranscodeReasonForFailedCondition(ProfileCondition condition)
+        private TranscodeReason? GetTranscodeReasonForFailedCondition(ProfileCondition condition)
         {
             switch (condition.Property)
             {
                 case ProfileConditionValue.AudioBitrate:
+                    if (condition.Condition == ProfileConditionType.LessThanEqual)
+                    {
+                        return TranscodeReason.AudioBitrateNotSupported;
+                    }
                     return TranscodeReason.AudioBitrateNotSupported;
 
                 case ProfileConditionValue.AudioChannels:
+                    if (condition.Condition == ProfileConditionType.LessThanEqual)
+                    {
+                        return TranscodeReason.AudioChannelsNotSupported;
+                    }
                     return TranscodeReason.AudioChannelsNotSupported;
 
                 case ProfileConditionValue.AudioProfile:
@@ -229,7 +246,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public static string NormalizeMediaSourceFormatIntoSingleContainer(string inputContainer, string _, DeviceProfile profile, DlnaProfileType type)
+        public static string NormalizeMediaSourceFormatIntoSingleContainer(string inputContainer, string unused1, DeviceProfile profile, DlnaProfileType type)
         {
             if (string.IsNullOrEmpty(inputContainer))
             {
@@ -249,10 +266,12 @@ namespace MediaBrowser.Model.Dlna
                 {
                     foreach (var directPlayProfile in profile.DirectPlayProfiles)
                     {
-                        if (directPlayProfile.Type == type
-                            && directPlayProfile.SupportsContainer(format))
+                        if (directPlayProfile.Type == type)
                         {
-                            return format;
+                            if (directPlayProfile.SupportsContainer(format))
+                            {
+                                return format;
+                            }
                         }
                     }
                 }
@@ -263,7 +282,9 @@ namespace MediaBrowser.Model.Dlna
 
         private StreamInfo BuildAudioItem(MediaSourceInfo item, AudioOptions options)
         {
-            StreamInfo playlistItem = new StreamInfo
+            var transcodeReasons = new List<TranscodeReason>();
+
+            var playlistItem = new StreamInfo
             {
                 ItemId = options.ItemId,
                 MediaType = DlnaProfileType.Audio,
@@ -292,16 +313,18 @@ namespace MediaBrowser.Model.Dlna
             var directPlayInfo = GetAudioDirectPlayMethods(item, audioStream, options);
 
             var directPlayMethods = directPlayInfo.Item1;
-            var transcodeReasons = directPlayInfo.Item2.ToList();
+            transcodeReasons.AddRange(directPlayInfo.Item2);
 
-            int? inputAudioChannels = audioStream?.Channels;
-            int? inputAudioBitrate = audioStream?.BitDepth;
-            int? inputAudioSampleRate = audioStream?.SampleRate;
-            int? inputAudioBitDepth = audioStream.BitDepth;
+            var conditionProcessor = new ConditionProcessor();
 
-            if (directPlayMethods.Count() > 0)
+            int? inputAudioChannels = audioStream == null ? null : audioStream.Channels;
+            int? inputAudioBitrate = audioStream == null ? null : audioStream.BitDepth;
+            int? inputAudioSampleRate = audioStream == null ? null : audioStream.SampleRate;
+            int? inputAudioBitDepth = audioStream == null ? null : audioStream.BitDepth;
+
+            if (directPlayMethods.Count > 0)
             {
-                string audioCodec = audioStream?.Codec;
+                string audioCodec = audioStream == null ? null : audioStream.Codec;
 
                 // Make sure audio codec profiles are satisfied
                 var conditions = new List<ProfileCondition>();
@@ -312,7 +335,7 @@ namespace MediaBrowser.Model.Dlna
                         bool applyConditions = true;
                         foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
-                            if (!ConditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
+                            if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                             {
                                 LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
                                 applyConditions = false;
@@ -322,7 +345,10 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            conditions.AddRange(i.Conditions);
+                            foreach (ProfileCondition c in i.Conditions)
+                            {
+                                conditions.Add(c);
+                            }
                         }
                     }
                 }
@@ -330,7 +356,7 @@ namespace MediaBrowser.Model.Dlna
                 bool all = true;
                 foreach (ProfileCondition c in conditions)
                 {
-                    if (!ConditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
+                    if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                     {
                         LogConditionFailure(options.Profile, "AudioCodecProfile", c, item);
                         var transcodeReason = GetTranscodeReasonForFailedCondition(c);
@@ -359,12 +385,13 @@ namespace MediaBrowser.Model.Dlna
             TranscodingProfile transcodingProfile = null;
             foreach (var i in options.Profile.TranscodingProfiles)
             {
-                if (i.Type == playlistItem.MediaType
-                    && i.Context == options.Context
-                    && _transcoderSupport.CanEncodeToAudioCodec(i.AudioCodec ?? i.Container))
+                if (i.Type == playlistItem.MediaType && i.Context == options.Context)
                 {
-                    transcodingProfile = i;
-                    break;
+                    if (_transcoderSupport.CanEncodeToAudioCodec(i.AudioCodec ?? i.Container))
+                    {
+                        transcodingProfile = i;
+                        break;
+                    }
                 }
             }
 
@@ -394,7 +421,7 @@ namespace MediaBrowser.Model.Dlna
                     bool applyConditions = true;
                     foreach (var applyCondition in i.ApplyConditions)
                     {
-                        if (!ConditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
+                        if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                         {
                             LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
                             applyConditions = false;
@@ -436,7 +463,7 @@ namespace MediaBrowser.Model.Dlna
             return playlistItem;
         }
 
-        private static long? GetBitrateForDirectPlayCheck(MediaSourceInfo item, AudioOptions options, bool isAudio)
+        private long? GetBitrateForDirectPlayCheck(MediaSourceInfo item, AudioOptions options, bool isAudio)
         {
             if (item.Protocol == MediaProtocol.File)
             {
@@ -446,56 +473,65 @@ namespace MediaBrowser.Model.Dlna
             return options.GetMaxBitrate(isAudio);
         }
 
-        private (IEnumerable<PlayMethod>, IEnumerable<TranscodeReason>) GetAudioDirectPlayMethods(MediaSourceInfo item, MediaStream audioStream, AudioOptions options)
+        private Tuple<List<PlayMethod>, List<TranscodeReason>> GetAudioDirectPlayMethods(MediaSourceInfo item, MediaStream audioStream, AudioOptions options)
         {
-            DirectPlayProfile directPlayProfile = options.Profile.DirectPlayProfiles
-                .FirstOrDefault(x => x.Type == DlnaProfileType.Audio && IsAudioDirectPlaySupported(x, item, audioStream));
+            var transcodeReasons = new List<TranscodeReason>();
 
-            if (directPlayProfile == null)
+            DirectPlayProfile directPlayProfile = null;
+            foreach (var i in options.Profile.DirectPlayProfiles)
             {
-                _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}",
-                    options.Profile.Name ?? "Unknown Profile",
-                    item.Path ?? "Unknown path");
-
-                return (Enumerable.Empty<PlayMethod>(), GetTranscodeReasonsFromDirectPlayProfile(item, null, audioStream, options.Profile.DirectPlayProfiles));
+                if (i.Type == DlnaProfileType.Audio && IsAudioDirectPlaySupported(i, item, audioStream))
+                {
+                    directPlayProfile = i;
+                    break;
+                }
             }
 
             var playMethods = new List<PlayMethod>();
-            var transcodeReasons = new List<TranscodeReason>();
 
-            // While options takes the network and other factors into account. Only applies to direct stream
-            if (item.SupportsDirectStream)
+            if (directPlayProfile != null)
             {
-                if (IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate(true) ?? 0, PlayMethod.DirectStream))
+                // While options takes the network and other factors into account. Only applies to direct stream
+                if (item.SupportsDirectStream)
                 {
-                    if (options.EnableDirectStream)
+                    if (IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate(true) ?? 0, PlayMethod.DirectStream))
                     {
-                        playMethods.Add(PlayMethod.DirectStream);
+                        if (options.EnableDirectStream)
+                        {
+                            playMethods.Add(PlayMethod.DirectStream);
+                        }
+                    }
+                    else
+                    {
+                        transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit);
                     }
                 }
-                else
-                {
-                    transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit);
-                }
-            }
 
-            // The profile describes what the device supports
-            // If device requirements are satisfied then allow both direct stream and direct play
-            if (item.SupportsDirectPlay)
-            {
-                if (IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true) ?? 0, PlayMethod.DirectPlay))
+                // The profile describes what the device supports
+                // If device requirements are satisfied then allow both direct stream and direct play
+                if (item.SupportsDirectPlay)
                 {
-                    if (options.EnableDirectPlay)
+                    if (IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true) ?? 0, PlayMethod.DirectPlay))
                     {
-                        playMethods.Add(PlayMethod.DirectPlay);
+                        if (options.EnableDirectPlay)
+                        {
+                            playMethods.Add(PlayMethod.DirectPlay);
+                        }
+                    }
+                    else
+                    {
+                        transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit);
                     }
                 }
-                else
-                {
-                    transcodeReasons.Add(TranscodeReason.ContainerBitrateExceedsLimit);
-                }
             }
+            else
+            {
+                transcodeReasons.InsertRange(0, GetTranscodeReasonsFromDirectPlayProfile(item, null, audioStream, options.Profile.DirectPlayProfiles));
 
+                _logger.LogInformation("Profile: {0}, No direct play profiles found for Path: {1}",
+                    options.Profile.Name ?? "Unknown Profile",
+                    item.Path ?? "Unknown path");
+            }
 
             if (playMethods.Count > 0)
             {
@@ -506,25 +542,41 @@ namespace MediaBrowser.Model.Dlna
                 transcodeReasons = transcodeReasons.Distinct().ToList();
             }
 
-            return (playMethods, transcodeReasons);
+            return new Tuple<List<PlayMethod>, List<TranscodeReason>>(playMethods, transcodeReasons);
         }
 
-        private static List<TranscodeReason> GetTranscodeReasonsFromDirectPlayProfile(MediaSourceInfo item, MediaStream videoStream, MediaStream audioStream, IEnumerable<DirectPlayProfile> directPlayProfiles)
+        private List<TranscodeReason> GetTranscodeReasonsFromDirectPlayProfile(MediaSourceInfo item, MediaStream videoStream, MediaStream audioStream, IEnumerable<DirectPlayProfile> directPlayProfiles)
         {
+            var list = new List<TranscodeReason>();
             var containerSupported = false;
             var audioSupported = false;
             var videoSupported = false;
 
             foreach (var profile in directPlayProfiles)
             {
+                audioSupported = false;
+                videoSupported = false;
+
                 // Check container type
                 if (profile.SupportsContainer(item.Container))
                 {
                     containerSupported = true;
 
-                    videoSupported = videoStream != null && profile.SupportsVideoCodec(videoStream.Codec);
+                    if (videoStream != null)
+                    {
+                        if (profile.SupportsVideoCodec(videoStream.Codec))
+                        {
+                            videoSupported = true;
+                        }
+                    }
 
-                    audioSupported = audioStream != null && profile.SupportsAudioCodec(audioStream.Codec);
+                    if (audioStream != null)
+                    {
+                        if (profile.SupportsAudioCodec(audioStream.Codec))
+                        {
+                            audioSupported = true;
+                        }
+                    }
 
                     if (videoSupported && audioSupported)
                     {
@@ -533,7 +585,6 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            var list = new List<TranscodeReason>();
             if (!containerSupported)
             {
                 list.Add(TranscodeReason.ContainerNotSupported);
@@ -552,17 +603,18 @@ namespace MediaBrowser.Model.Dlna
             return list;
         }
 
-        private static int? GetDefaultSubtitleStreamIndex(MediaSourceInfo item, SubtitleProfile[] subtitleProfiles)
+        private int? GetDefaultSubtitleStreamIndex(MediaSourceInfo item, SubtitleProfile[] subtitleProfiles)
         {
             int highestScore = -1;
 
             foreach (var stream in item.MediaStreams)
             {
-                if (stream.Type == MediaStreamType.Subtitle
-                    && stream.Score.HasValue
-                    && stream.Score.Value > highestScore)
+                if (stream.Type == MediaStreamType.Subtitle && stream.Score.HasValue)
                 {
-                    highestScore = stream.Score.Value;
+                    if (stream.Score.Value > highestScore)
+                    {
+                        highestScore = stream.Score.Value;
+                    }
                 }
             }
 
@@ -594,7 +646,7 @@ namespace MediaBrowser.Model.Dlna
             return item.DefaultSubtitleStreamIndex;
         }
 
-        private static void SetStreamInfoOptionsFromTranscodingProfile(StreamInfo playlistItem, TranscodingProfile transcodingProfile)
+        private void SetStreamInfoOptionsFromTranscodingProfile(StreamInfo playlistItem, TranscodingProfile transcodingProfile)
         {
             if (string.IsNullOrEmpty(transcodingProfile.AudioCodec))
             {
@@ -634,10 +686,12 @@ namespace MediaBrowser.Model.Dlna
             }
             playlistItem.SubProtocol = transcodingProfile.Protocol;
 
-            if (!string.IsNullOrEmpty(transcodingProfile.MaxAudioChannels)
-                && int.TryParse(transcodingProfile.MaxAudioChannels, NumberStyles.Any, CultureInfo.InvariantCulture, out int transcodingMaxAudioChannels))
+            if (!string.IsNullOrEmpty(transcodingProfile.MaxAudioChannels))
             {
-                playlistItem.TranscodingMaxAudioChannels = transcodingMaxAudioChannels;
+                if (int.TryParse(transcodingProfile.MaxAudioChannels, NumberStyles.Any, CultureInfo.InvariantCulture, out var transcodingMaxAudioChannels))
+                {
+                    playlistItem.TranscodingMaxAudioChannels = transcodingMaxAudioChannels;
+                }
             }
         }
 
@@ -648,7 +702,9 @@ namespace MediaBrowser.Model.Dlna
                 throw new ArgumentNullException(nameof(item));
             }
 
-            StreamInfo playlistItem = new StreamInfo
+            var transcodeReasons = new List<TranscodeReason>();
+
+            var playlistItem = new StreamInfo
             {
                 ItemId = options.ItemId,
                 MediaType = DlnaProfileType.Video,
@@ -681,8 +737,6 @@ namespace MediaBrowser.Model.Dlna
                 isEligibleForDirectPlay,
                 isEligibleForDirectStream);
 
-            var transcodeReasons = new List<TranscodeReason>();
-
             if (isEligibleForDirectPlay || isEligibleForDirectStream)
             {
                 // See if it can be direct played
@@ -749,6 +803,8 @@ namespace MediaBrowser.Model.Dlna
 
                 SetStreamInfoOptionsFromTranscodingProfile(playlistItem, transcodingProfile);
 
+                var conditionProcessor = new ConditionProcessor();
+
                 var isFirstAppliedCodecProfile = true;
                 foreach (var i in options.Profile.CodecProfiles)
                 {
@@ -757,26 +813,26 @@ namespace MediaBrowser.Model.Dlna
                         bool applyConditions = true;
                         foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
-                            int? width = videoStream?.Width;
-                            int? height = videoStream?.Height;
-                            int? bitDepth = videoStream?.BitDepth;
-                            int? videoBitrate = videoStream?.BitRate;
-                            double? videoLevel = videoStream?.Level;
-                            string videoProfile = videoStream?.Profile;
+                            int? width = videoStream == null ? null : videoStream.Width;
+                            int? height = videoStream == null ? null : videoStream.Height;
+                            int? bitDepth = videoStream == null ? null : videoStream.BitDepth;
+                            int? videoBitrate = videoStream == null ? null : videoStream.BitRate;
+                            double? videoLevel = videoStream == null ? null : videoStream.Level;
+                            string videoProfile = videoStream == null ? null : videoStream.Profile;
                             float videoFramerate = videoStream == null ? 0 : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate ?? 0;
-                            bool? isAnamorphic = videoStream?.IsAnamorphic;
-                            bool? isInterlaced = videoStream?.IsInterlaced;
-                            string videoCodecTag = videoStream?.CodecTag;
-                            bool? isAvc = videoStream?.IsAVC;
+                            bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
+                            bool? isInterlaced = videoStream == null ? (bool?)null : videoStream.IsInterlaced;
+                            string videoCodecTag = videoStream == null ? null : videoStream.CodecTag;
+                            bool? isAvc = videoStream == null ? null : videoStream.IsAVC;
 
                             TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : item.Timestamp;
-                            int? packetLength = videoStream?.PacketLength;
-                            int? refFrames = videoStream?.RefFrames;
+                            int? packetLength = videoStream == null ? null : videoStream.PacketLength;
+                            int? refFrames = videoStream == null ? null : videoStream.RefFrames;
 
                             int? numAudioStreams = item.GetStreamCount(MediaStreamType.Audio);
                             int? numVideoStreams = item.GetStreamCount(MediaStreamType.Video);
 
-                            if (!ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
+                            if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                             {
                                 //LogConditionFailure(options.Profile, "VideoCodecProfile.ApplyConditions", applyCondition, item);
                                 applyConditions = false;
@@ -820,7 +876,7 @@ namespace MediaBrowser.Model.Dlna
                             int? inputAudioSampleRate = audioStream == null ? null : audioStream.SampleRate;
                             int? inputAudioBitDepth = audioStream == null ? null : audioStream.BitDepth;
 
-                            if (!ConditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth, audioProfile, isSecondaryAudio))
+                            if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth, audioProfile, isSecondaryAudio))
                             {
                                 //LogConditionFailure(options.Profile, "VideoCodecProfile.ApplyConditions", applyCondition, item);
                                 applyConditions = false;
@@ -866,7 +922,7 @@ namespace MediaBrowser.Model.Dlna
             return playlistItem;
         }
 
-        private static int GetDefaultAudioBitrateIfUnknown(MediaStream audioStream)
+        private int GetDefaultAudioBitrateIfUnknown(MediaStream audioStream)
         {
             if ((audioStream.Channels ?? 0) >= 6)
             {
@@ -876,37 +932,33 @@ namespace MediaBrowser.Model.Dlna
             return 192000;
         }
 
-        private static int GetAudioBitrate(string subProtocol, long maxTotalBitrate, string[] targetAudioCodecs, MediaStream audioStream, StreamInfo item)
+        private int GetAudioBitrate(string subProtocol, long maxTotalBitrate, string[] targetAudioCodecs, MediaStream audioStream, StreamInfo item)
         {
-            string targetAudioCodec = targetAudioCodecs.Length == 0 ? null : targetAudioCodecs[0];
+            var targetAudioCodec = targetAudioCodecs.Length == 0 ? null : targetAudioCodecs[0];
 
-            int? targetAudioChannels = item.GetTargetAudioChannels(targetAudioCodec);
+            var targetAudioChannels = item.GetTargetAudioChannels(targetAudioCodec);
+
+            int defaultBitrate = audioStream == null ? 192000 : audioStream.BitRate ?? GetDefaultAudioBitrateIfUnknown(audioStream);
+
+            // Reduce the bitrate if we're downmixing
+            if (targetAudioChannels.HasValue && audioStream != null && audioStream.Channels.HasValue && targetAudioChannels.Value < audioStream.Channels.Value)
+            {
+                defaultBitrate = targetAudioChannels.Value <= 2 ? 128000 : 192000;
+            }
 
-            int defaultBitrate;
             int encoderAudioBitrateLimit = int.MaxValue;
 
-            if (audioStream == null)
+            if (audioStream != null)
             {
-                defaultBitrate = 192000;
-            }
-            else
-            {
-                if (targetAudioChannels.HasValue && audioStream.Channels.HasValue && targetAudioChannels.Value < audioStream.Channels.Value)
-                {
-                    // Reduce the bitrate if we're downmixing
-                    defaultBitrate = targetAudioChannels.Value < 2 ? 128000 : 192000;
-                }
-                else
-                {
-                    defaultBitrate = audioStream.BitRate ?? GetDefaultAudioBitrateIfUnknown(audioStream);
-                }
-
                 // Seeing webm encoding failures when source has 1 audio channel and 22k bitrate.
                 // Any attempts to transcode over 64k will fail
-                if (audioStream.Channels == 1
-                    && (audioStream.BitRate ?? 0) < 64000)
+                if (audioStream.Channels.HasValue &&
+                    audioStream.Channels.Value == 1)
                 {
-                    encoderAudioBitrateLimit = 64000;
+                    if ((audioStream.BitRate ?? 0) < 64000)
+                    {
+                        encoderAudioBitrateLimit = 64000;
+                    }
                 }
             }
 
@@ -918,17 +970,19 @@ namespace MediaBrowser.Model.Dlna
             return Math.Min(defaultBitrate, encoderAudioBitrateLimit);
         }
 
-        private static int GetMaxAudioBitrateForTotalBitrate(long totalBitrate)
+        private int GetMaxAudioBitrateForTotalBitrate(long totalBitrate)
         {
             if (totalBitrate <= 640000)
             {
                 return 128000;
             }
-            else if (totalBitrate <= 2000000)
+
+            if (totalBitrate <= 2000000)
             {
                 return 384000;
             }
-            else if (totalBitrate <= 3000000)
+
+            if (totalBitrate <= 3000000)
             {
                 return 448000;
             }
@@ -936,25 +990,24 @@ namespace MediaBrowser.Model.Dlna
             return 640000;
         }
 
-        private (PlayMethod?, List<TranscodeReason>) GetVideoDirectPlayProfile(
-            VideoOptions options,
+        private Tuple<PlayMethod?, List<TranscodeReason>> GetVideoDirectPlayProfile(VideoOptions options,
             MediaSourceInfo mediaSource,
             MediaStream videoStream,
             MediaStream audioStream,
             bool isEligibleForDirectPlay,
             bool isEligibleForDirectStream)
         {
+            DeviceProfile profile = options.Profile;
+
             if (options.ForceDirectPlay)
             {
-                return (PlayMethod.DirectPlay, new List<TranscodeReason>());
+                return new Tuple<PlayMethod?, List<TranscodeReason>>(PlayMethod.DirectPlay, new List<TranscodeReason>());
             }
             if (options.ForceDirectStream)
             {
-                return (PlayMethod.DirectStream, new List<TranscodeReason>());
+                return new Tuple<PlayMethod?, List<TranscodeReason>>(PlayMethod.DirectStream, new List<TranscodeReason>());
             }
 
-            DeviceProfile profile = options.Profile;
-
             // See if it can be direct played
             DirectPlayProfile directPlay = null;
             foreach (var i in profile.DirectPlayProfiles)
@@ -972,7 +1025,7 @@ namespace MediaBrowser.Model.Dlna
                     profile.Name ?? "Unknown Profile",
                     mediaSource.Path ?? "Unknown path");
 
-                return (null, GetTranscodeReasonsFromDirectPlayProfile(mediaSource, videoStream, audioStream, profile.DirectPlayProfiles));
+                return new Tuple<PlayMethod?, List<TranscodeReason>>(null, GetTranscodeReasonsFromDirectPlayProfile(mediaSource, videoStream, audioStream, profile.DirectPlayProfiles));
             }
 
             string container = mediaSource.Container;
@@ -980,8 +1033,8 @@ namespace MediaBrowser.Model.Dlna
             var conditions = new List<ProfileCondition>();
             foreach (var i in profile.ContainerProfiles)
             {
-                if (i.Type == DlnaProfileType.Video
-                    && i.ContainsContainer(container))
+                if (i.Type == DlnaProfileType.Video &&
+                    i.ContainsContainer(container))
                 {
                     foreach (var c in i.Conditions)
                     {
@@ -990,27 +1043,29 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            int? width = videoStream?.Width;
-            int? height = videoStream?.Height;
-            int? bitDepth = videoStream?.BitDepth;
-            int? videoBitrate = videoStream?.BitRate;
-            double? videoLevel = videoStream?.Level;
-            string videoProfile = videoStream?.Profile;
-            float videoFramerate = videoStream == null ? 0 : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate ?? 0;
-            bool? isAnamorphic = videoStream?.IsAnamorphic;
-            bool? isInterlaced = videoStream?.IsInterlaced;
-            string videoCodecTag = videoStream?.CodecTag;
-            bool? isAvc = videoStream?.IsAVC;
+            var conditionProcessor = new ConditionProcessor();
 
-            int? audioBitrate = audioStream?.BitRate;
-            int? audioChannels = audioStream?.Channels;
-            string audioProfile = audioStream?.Profile;
-            int? audioSampleRate = audioStream?.SampleRate;
-            int? audioBitDepth = audioStream?.BitDepth;
+            int? width = videoStream == null ? null : videoStream.Width;
+            int? height = videoStream == null ? null : videoStream.Height;
+            int? bitDepth = videoStream == null ? null : videoStream.BitDepth;
+            int? videoBitrate = videoStream == null ? null : videoStream.BitRate;
+            double? videoLevel = videoStream == null ? null : videoStream.Level;
+            string videoProfile = videoStream == null ? null : videoStream.Profile;
+            float videoFramerate = videoStream == null ? 0 : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate ?? 0;
+            bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
+            bool? isInterlaced = videoStream == null ? (bool?)null : videoStream.IsInterlaced;
+            string videoCodecTag = videoStream == null ? null : videoStream.CodecTag;
+            bool? isAvc = videoStream == null ? null : videoStream.IsAVC;
+
+            int? audioBitrate = audioStream == null ? null : audioStream.BitRate;
+            int? audioChannels = audioStream == null ? null : audioStream.Channels;
+            string audioProfile = audioStream == null ? null : audioStream.Profile;
+            int? audioSampleRate = audioStream == null ? null : audioStream.SampleRate;
+            int? audioBitDepth = audioStream == null ? null : audioStream.BitDepth;
 
             TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
-            int? packetLength = videoStream?.PacketLength;
-            int? refFrames = videoStream?.RefFrames;
+            int? packetLength = videoStream == null ? null : videoStream.PacketLength;
+            int? refFrames = videoStream == null ? null : videoStream.RefFrames;
 
             int? numAudioStreams = mediaSource.GetStreamCount(MediaStreamType.Audio);
             int? numVideoStreams = mediaSource.GetStreamCount(MediaStreamType.Video);
@@ -1018,20 +1073,20 @@ namespace MediaBrowser.Model.Dlna
             // Check container conditions
             foreach (ProfileCondition i in conditions)
             {
-                if (!ConditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
+                if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
                     LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource);
 
                     var transcodeReason = GetTranscodeReasonForFailedCondition(i);
                     var transcodeReasons = transcodeReason.HasValue
                         ? new List<TranscodeReason> { transcodeReason.Value }
-                        : new List<TranscodeReason>();
+                        : new List<TranscodeReason> { };
 
-                    return (null, transcodeReasons);
+                    return new Tuple<PlayMethod?, List<TranscodeReason>>(null, transcodeReasons);
                 }
             }
 
-            string videoCodec = videoStream?.Codec;
+            string videoCodec = videoStream == null ? null : videoStream.Codec;
 
             conditions = new List<ProfileCondition>();
             foreach (var i in profile.CodecProfiles)
@@ -1041,7 +1096,7 @@ namespace MediaBrowser.Model.Dlna
                     bool applyConditions = true;
                     foreach (ProfileCondition applyCondition in i.ApplyConditions)
                     {
-                        if (!ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
+                        if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                         {
                             //LogConditionFailure(profile, "VideoCodecProfile.ApplyConditions", applyCondition, mediaSource);
                             applyConditions = false;
@@ -1061,22 +1116,23 @@ namespace MediaBrowser.Model.Dlna
 
             foreach (ProfileCondition i in conditions)
             {
-                if (!ConditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
+                if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
                     LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource);
 
                     var transcodeReason = GetTranscodeReasonForFailedCondition(i);
                     var transcodeReasons = transcodeReason.HasValue
                         ? new List<TranscodeReason> { transcodeReason.Value }
-                        : new List<TranscodeReason>();
+                        : new List<TranscodeReason> { };
 
-                    return (null, transcodeReasons);
+                    return new Tuple<PlayMethod?, List<TranscodeReason>>(null, transcodeReasons);
                 }
             }
 
             if (audioStream != null)
             {
                 string audioCodec = audioStream.Codec;
+
                 conditions = new List<ProfileCondition>();
                 bool? isSecondaryAudio = audioStream == null ? null : mediaSource.IsSecondaryAudio(audioStream);
 
@@ -1087,7 +1143,7 @@ namespace MediaBrowser.Model.Dlna
                         bool applyConditions = true;
                         foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
-                            if (!ConditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
+                            if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                             {
                                 //LogConditionFailure(profile, "VideoAudioCodecProfile.ApplyConditions", applyCondition, mediaSource);
                                 applyConditions = false;
@@ -1107,26 +1163,26 @@ namespace MediaBrowser.Model.Dlna
 
                 foreach (ProfileCondition i in conditions)
                 {
-                    if (!ConditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
+                    if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                     {
                         LogConditionFailure(profile, "VideoAudioCodecProfile", i, mediaSource);
 
                         var transcodeReason = GetTranscodeReasonForFailedCondition(i);
                         var transcodeReasons = transcodeReason.HasValue
                             ? new List<TranscodeReason> { transcodeReason.Value }
-                            : new List<TranscodeReason>();
+                            : new List<TranscodeReason> { };
 
-                        return (null, transcodeReasons);
+                        return new Tuple<PlayMethod?, List<TranscodeReason>>(null, transcodeReasons);
                     }
                 }
             }
 
             if (isEligibleForDirectStream && mediaSource.SupportsDirectStream)
             {
-                return (PlayMethod.DirectStream, new List<TranscodeReason>());
+                return new Tuple<PlayMethod?, List<TranscodeReason>>(PlayMethod.DirectStream, new List<TranscodeReason>());
             }
 
-            return (null, new List<TranscodeReason> { TranscodeReason.ContainerBitrateExceedsLimit });
+            return new Tuple<PlayMethod?, List<TranscodeReason>>(null, new List<TranscodeReason> { TranscodeReason.ContainerBitrateExceedsLimit });
         }
 
         private void LogConditionFailure(DeviceProfile profile, string type, ProfileCondition condition, MediaSourceInfo mediaSource)
@@ -1141,8 +1197,7 @@ namespace MediaBrowser.Model.Dlna
                 mediaSource.Path ?? "Unknown path");
         }
 
-        private (bool directPlay, TranscodeReason? reason) IsEligibleForDirectPlay(
-            MediaSourceInfo item,
+        private ValueTuple<bool, TranscodeReason?> IsEligibleForDirectPlay(MediaSourceInfo item,
             long maxBitrate,
             MediaStream subtitleStream,
             VideoOptions options,
@@ -1155,23 +1210,21 @@ namespace MediaBrowser.Model.Dlna
                 if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed)
                 {
                     _logger.LogInformation("Not eligible for {0} due to unsupported subtitles", playMethod);
-                    return (false, TranscodeReason.SubtitleCodecNotSupported);
+                    return new ValueTuple<bool, TranscodeReason?>(false, TranscodeReason.SubtitleCodecNotSupported);
                 }
             }
 
-            bool result = IsAudioEligibleForDirectPlay(item, maxBitrate, playMethod);
+            var result = IsAudioEligibleForDirectPlay(item, maxBitrate, playMethod);
 
-            return (result, result ? (TranscodeReason?)null : TranscodeReason.ContainerBitrateExceedsLimit);
+            if (result)
+            {
+                return new ValueTuple<bool, TranscodeReason?>(result, null);
+            }
+
+            return new ValueTuple<bool, TranscodeReason?>(result, TranscodeReason.ContainerBitrateExceedsLimit);
         }
 
-        public static SubtitleProfile GetSubtitleProfile(
-            MediaSourceInfo mediaSource,
-            MediaStream subtitleStream,
-            SubtitleProfile[] subtitleProfiles,
-            PlayMethod playMethod,
-            ITranscoderSupport transcoderSupport,
-            string outputContainer,
-            string transcodingSubProtocol)
+        public static SubtitleProfile GetSubtitleProfile(MediaSourceInfo mediaSource, MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, ITranscoderSupport transcoderSupport, string outputContainer, string transcodingSubProtocol)
         {
             if (!subtitleStream.IsExternal && (playMethod != PlayMethod.Transcode || !string.Equals(transcodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase)))
             {
@@ -1248,20 +1301,27 @@ namespace MediaBrowser.Model.Dlna
         {
             if (!string.IsNullOrEmpty(transcodingContainer))
             {
-                string[] normalizedContainers = ContainerProfile.SplitValue(transcodingContainer);
+                var normalizedContainers = ContainerProfile.SplitValue(transcodingContainer);
 
-                if (ContainerProfile.ContainsContainer(normalizedContainers, "ts")
-                    || ContainerProfile.ContainsContainer(normalizedContainers, "mpegts")
-                    || ContainerProfile.ContainsContainer(normalizedContainers, "mp4"))
+                if (ContainerProfile.ContainsContainer(normalizedContainers, "ts"))
                 {
                     return false;
                 }
-                else if (ContainerProfile.ContainsContainer(normalizedContainers, "mkv")
-                    || ContainerProfile.ContainsContainer(normalizedContainers, "matroska"))
+                if (ContainerProfile.ContainsContainer(normalizedContainers, "mpegts"))
+                {
+                    return false;
+                }
+                if (ContainerProfile.ContainsContainer(normalizedContainers, "mp4"))
+                {
+                    return false;
+                }
+                if (ContainerProfile.ContainsContainer(normalizedContainers, "mkv") ||
+                    ContainerProfile.ContainsContainer(normalizedContainers, "matroska"))
                 {
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -1328,22 +1388,22 @@ namespace MediaBrowser.Model.Dlna
                 return true;
             }
 
-            long requestedMaxBitrate = maxBitrate > 0 ? maxBitrate : 1000000;
+            var requestedMaxBitrate = maxBitrate > 0 ? maxBitrate : 1000000;
 
             // If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps
-            int itemBitrate = item.Bitrate ?? 40000000;
+            var itemBitrate = item.Bitrate ??
+                40000000;
 
             if (itemBitrate > requestedMaxBitrate)
             {
-                _logger.LogInformation("Bitrate exceeds {PlayBackMethod} limit: media bitrate: {MediaBitrate}, max bitrate: {MaxBitrate}",
-                    playMethod, itemBitrate, requestedMaxBitrate);
+                _logger.LogInformation("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", itemBitrate.ToString(CultureInfo.InvariantCulture), requestedMaxBitrate.ToString(CultureInfo.InvariantCulture));
                 return false;
             }
 
             return true;
         }
 
-        private static void ValidateInput(VideoOptions options)
+        private void ValidateInput(VideoOptions options)
         {
             ValidateAudioInput(options);
 
@@ -1358,7 +1418,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        private static void ValidateAudioInput(AudioOptions options)
+        private void ValidateAudioInput(AudioOptions options)
         {
             if (options.ItemId.Equals(Guid.Empty))
             {
@@ -1378,6 +1438,32 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
+        private void ApplyTranscodingConditions(StreamInfo item, List<CodecProfile> codecProfiles)
+        {
+            foreach (var profile in codecProfiles)
+            {
+                ApplyTranscodingConditions(item, profile);
+            }
+        }
+
+        private void ApplyTranscodingConditions(StreamInfo item, CodecProfile codecProfile)
+        {
+            var codecs = ContainerProfile.SplitValue(codecProfile.Codec);
+            if (codecs.Length == 0)
+            {
+                ApplyTranscodingConditions(item, codecProfile.Conditions, null, true, true);
+                return;
+            }
+
+            var enableNonQualified = true;
+
+            foreach (var codec in codecs)
+            {
+                ApplyTranscodingConditions(item, codecProfile.Conditions, codec, true, enableNonQualified);
+                enableNonQualified = false;
+            }
+        }
+
         private void ApplyTranscodingConditions(StreamInfo item, IEnumerable<ProfileCondition> conditions, string qualifier, bool enableQualifiedConditions, bool enableNonQualifiedConditions)
         {
             foreach (ProfileCondition condition in conditions)
@@ -1752,7 +1838,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        private static bool IsAudioDirectPlaySupported(DirectPlayProfile profile, MediaSourceInfo item, MediaStream audioStream)
+        private bool IsAudioDirectPlaySupported(DirectPlayProfile profile, MediaSourceInfo item, MediaStream audioStream)
         {
             // Check container type
             if (!profile.SupportsContainer(item.Container))
@@ -1761,7 +1847,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             // Check audio codec
-            string audioCodec = audioStream?.Codec;
+            string audioCodec = audioStream == null ? null : audioStream.Codec;
             if (!profile.SupportsAudioCodec(audioCodec))
             {
                 return false;
@@ -1779,16 +1865,20 @@ namespace MediaBrowser.Model.Dlna
             }
 
             // Check video codec
-            string videoCodec = videoStream?.Codec;
+            string videoCodec = videoStream == null ? null : videoStream.Codec;
             if (!profile.SupportsVideoCodec(videoCodec))
             {
                 return false;
             }
 
             // Check audio codec
-            if (audioStream != null && !profile.SupportsAudioCodec(audioStream.Codec))
+            if (audioStream != null)
             {
-                return false;
+                string audioCodec = audioStream == null ? null : audioStream.Codec;
+                if (!profile.SupportsAudioCodec(audioCodec))
+                {
+                    return false;
+                }
             }
 
             return true;

MediaBrowser.sln

@@ -42,6 +42,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Notifications", "Emby.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Naming", "Emby.Naming\Emby.Naming.csproj", "{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "taglib-sharp", "ThirdParty\taglib-sharp\src\taglib-sharp.csproj", "{D45FC504-D06B-41A0-A220-C20B7E8F1304}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj", "{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IsoMounter", "Emby.IsoMounting\IsoMounter\IsoMounter.csproj", "{9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}"
@@ -142,6 +144,10 @@ Global
 		{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D45FC504-D06B-41A0-A220-C20B7E8F1304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D45FC504-D06B-41A0-A220-C20B7E8F1304}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D45FC504-D06B-41A0-A220-C20B7E8F1304}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D45FC504-D06B-41A0-A220-C20B7E8F1304}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.ActiveCfg = Release|Any CPU

Mono.Nat/Upnp/Searchers/UpnpSearcher.cs

@@ -47,6 +47,7 @@ namespace Mono.Nat
     {
         public event EventHandler<DeviceEventArgs> DeviceFound;
 
+        private DateTime nextSearch;
         private readonly ILogger _logger;
         private readonly IHttpClient _httpClient;
 
@@ -97,6 +98,11 @@ namespace Mono.Nat
         {
         }
 
+        public DateTime NextSearch
+        {
+            get { return nextSearch; }
+        }
+
         private void OnDeviceFound(DeviceEventArgs args)
         {
             if (DeviceFound != null)

SocketHttpListener/HttpBase.cs

@@ -13,6 +13,12 @@ namespace SocketHttpListener
 
         #endregion
 
+        #region Internal Fields
+
+        internal byte[] EntityBodyData;
+
+        #endregion
+
         #region Protected Fields
 
         protected const string CrLf = "\r\n";
@@ -31,6 +37,18 @@ namespace SocketHttpListener
 
         #region Public Properties
 
+        public string EntityBody
+        {
+            get
+            {
+                var data = EntityBodyData;
+
+                return data != null && data.Length > 0
+                       ? getEncoding(_headers["Content-Type"]).GetString(data, 0, data.Length)
+                       : string.Empty;
+            }
+        }
+
         public QueryParamCollection Headers => _headers;
 
         public Version ProtocolVersion => _version;

SocketHttpListener/HttpResponse.cs

@@ -115,6 +115,10 @@ namespace SocketHttpListener
 
             output.Append(CrLf);
 
+            var entity = EntityBody;
+            if (entity.Length > 0)
+                output.Append(entity);
+
             return output.ToString();
         }
 

SocketHttpListener/Net/HttpConnection.cs

@@ -32,6 +32,8 @@ namespace SocketHttpListener.Net
         int _reuses;
         bool _contextBound;
         bool secure;
+        int _timeout = 90000; // 90k ms for first request, 15k ms from then on
+        private Timer _timer;
         IPEndPoint local_ep;
         HttpListener _lastListener;
         X509Certificate cert;
@@ -89,6 +91,8 @@ namespace SocketHttpListener.Net
 
         public async Task Init()
         {
+            _timer = new Timer(OnTimeout, null, Timeout.Infinite, Timeout.Infinite);
+
             if (ssl_stream != null)
             {
                 var enableAsync = true;
@@ -158,10 +162,14 @@ namespace SocketHttpListener.Net
                 _buffer = new byte[BufferSize];
             try
             {
+                if (_reuses == 1)
+                    _timeout = 15000;
+                //_timer.Change(_timeout, Timeout.Infinite);
                 _stream.BeginRead(_buffer, 0, BufferSize, s_onreadCallback, this);
             }
             catch
             {
+                //_timer.Change(Timeout.Infinite, Timeout.Infinite);
                 CloseSocket();
                 Unbind();
             }
@@ -208,6 +216,7 @@ namespace SocketHttpListener.Net
 
         private void OnReadInternal(IAsyncResult ares)
         {
+            //_timer.Change(Timeout.Infinite, Timeout.Infinite);
             int nread = -1;
             try
             {

SocketHttpListener/WebSocket.cs

@@ -24,6 +24,7 @@ namespace SocketHttpListener
     {
         #region Private Fields
 
+        private string _base64Key;
         private Action _closeContext;
         private CompressionMethod _compression;
         private WebSocketContext _context;
@@ -34,12 +35,20 @@ namespace SocketHttpListener
         private object _forMessageEventQueue;
         private object _forSend;
         private const string _guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+        private Func<WebSocketContext, string>
+                                        _handshakeRequestChecker;
         private Queue<MessageEventArgs> _messageEventQueue;
+        private uint _nonceCount;
+        private string _origin;
+        private bool _preAuth;
         private string _protocol;
+        private string[] _protocols;
+        private Uri _proxyUri;
         private volatile WebSocketState _readyState;
         private AutoResetEvent _receivePong;
         private bool _secure;
         private Stream _stream;
+        private Uri _uri;
         private const string _version = "13";
 
         #endregion

deployment/common.build.sh

@@ -23,7 +23,8 @@ get_version()
 (
     local ROOT=${1-$DEFAULT_ROOT}
     grep "AssemblyVersion" ${ROOT}/SharedVersion.cs \
-        | sed -E 's/\[assembly: ?AssemblyVersion\("([0-9\.]+)"\)\]/\1/' 
+        | sed -E 's/\[assembly: ?AssemblyVersion\("([0-9\.]+)"\)\]/\1/' \
+        | sed -E 's/.0$//'
 )
 
 # Run a build

deployment/fedora-package-x64/clean.sh

@@ -4,15 +4,4 @@ source ../common.build.sh
 
 VERSION=`get_version ../..`
 
-package_temporary_dir="`pwd`/pkg-dist-tmp"
-pkg_src_dir="`pwd`/pkg-src"
-image_name="jellyfin-rpmbuild"
-docker_sudo=""
-if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && \
- [ ! $USER == "root" ] && ! $(echo "$OSTYPE" | grep -q "darwin"); then
-    docker_sudo=sudo
-fi
-
-$docker_sudo docker image rm $image_name --force
-rm -rf "$package_temporary_dir"
-rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz"
+clean_jellyfin ../.. Release `pwd`/dist/jellyfin_${VERSION}

deployment/fedora-package-x64/package.sh

@@ -18,15 +18,10 @@ output_dir="`pwd`/pkg-dist"
 pkg_src_dir="`pwd`/pkg-src"
 current_user="`whoami`"
 image_name="jellyfin-rpmbuild"
-docker_sudo=""
-if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && \
- [ ! $USER == "root" ] && ! $(echo "$OSTYPE" | grep -q "darwin"); then
-    docker_sudo=sudo
-fi
 
 cleanup() {
     set +o errexit
-    $docker_sudo docker image rm $image_name --force
+    docker image rm $image_name --force
     rm -rf "$package_temporary_dir"
     rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz"
 }
@@ -35,7 +30,7 @@ GNU_TAR=1
 mkdir -p "$package_temporary_dir"
 echo "Bundling all sources for RPM build."
 tar \
---transform "s,^\.,jellyfin-${VERSION}," \
+--transform "s,^\.,jellyfin-${VERSION}" \
 --exclude='.git*' \
 --exclude='**/.git' \
 --exclude='**/.hg' \
@@ -47,8 +42,10 @@ tar \
 --exclude='**/.nuget' \
 --exclude='*.deb' \
 --exclude='*.rpm' \
--zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" \
--C "../.." ./ || GNU_TAR=0
+-Jcvf \
+"$package_temporary_dir/jellyfin-${VERSION}.tar.xz" \
+-C "../.." \
+./ || true && GNU_TAR=0
 
 if [ $GNU_TAR -eq 0 ]; then
     echo "The installed tar binary did not support --transform. Using workaround."
@@ -78,9 +75,9 @@ if [ $GNU_TAR -eq 0 ]; then
     tar -zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" -C "$package_temporary_dir" "jellyfin-${VERSION}"
 fi
 
-$docker_sudo docker build ../.. -t "$image_name" -f ./Dockerfile
+docker build ../.. -t "$image_name" -f ./Dockerfile
 mkdir -p "$output_dir"
-$docker_sudo docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;'
+docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;'
 chown -R "$current_user" "$package_temporary_dir" \
 || sudo chown -R "$current_user" "$package_temporary_dir"
 mv "$package_temporary_dir"/*.rpm "$output_dir"

deployment/win-generic/build-jellyfin.ps1

@@ -40,21 +40,21 @@ function Install-FFMPEG {
         Write-Warning "FFMPEG will not be installed"
     }elseif($Architecture -eq 'x64'){
          Write-Verbose "Downloading 64 bit FFMPEG"
-         Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.0.2-win64-static.zip -UseBasicParsing -OutFile "$tempdir/fmmpeg.zip" | Write-Verbose
+         Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.1-win64-static.zip -UseBasicParsing -OutFile "$tempdir/fmmpeg.zip" | Write-Verbose
     }else{
          Write-Verbose "Downloading 32 bit FFMPEG"
-         Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-4.0.2-win32-static.zip -UseBasicParsing -OutFile "$tempdir/fmmpeg.zip" | Write-Verbose
+         Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-4.1-win32-static.zip -UseBasicParsing -OutFile "$tempdir/fmmpeg.zip" | Write-Verbose
     }
 
     Expand-Archive "$tempdir/fmmpeg.zip" -DestinationPath "$tempdir/ffmpeg/" | Write-Verbose
     if($Architecture -eq 'x64'){
         Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.0.2-win64-static/bin" | ForEach-Object {
+        Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.1-win64-static/bin" | ForEach-Object {
             Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
         }
     }else{
         Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.0.2-win32-static/bin" | ForEach-Object {
+        Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.1-win32-static/bin" | ForEach-Object {
             Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
         }
     }
@@ -102,8 +102,8 @@ if($InstallNSSM.IsPresent -or ($InstallNSSM -eq $true)){
     Write-Verbose "Starting NSSM Install"
     Install-NSSM $InstallLocation $Architecture
 }
-Copy-Item .\deployment\win-generic\install-jellyfin.ps1 $InstallLocation\install-jellyfin.ps1
-Copy-Item .\deployment\win-generic\install.bat $InstallLocation\install.bat
+Copy-Item .\install-jellyfin.ps1 $InstallLocation\install-jellyfin.ps1
+Copy-Item .\install.bat $InstallLocation\install.bat
 if($GenerateZip.IsPresent -or ($GenerateZip -eq $true)){
     Compress-Archive -Path $InstallLocation -DestinationPath "$InstallLocation/jellyfin.zip" -Force
 }

deployment/win-x64/package.sh

@@ -1,46 +1,9 @@
 #!/usr/bin/env bash
-package_win64() (
-    local NSSM_VERSION="nssm-2.24-101-g897c7ad"
-    local NSSM_URL="https://nssm.cc/ci/${NSSM_VERSION}.zip"
-    local FFMPEG_VERSION="ffmpeg-4.0.2-win64-static"
-    local FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win64/static/${FFMPEG_VERSION}.zip"
-    local ROOT=${1-$DEFAULT_ROOT}
-    local OUTPUT_DIR=${2-$DEFAULT_OUTPUT_DIR}
-    local PKG_DIR=${3-$DEFAULT_PKG_DIR}
-    local ARCHIVE_CMD="zip -r"
-    # Package portable build result
-    if [ -d ${OUTPUT_DIR} ]; then      
-        echo -e "${CYAN}Packaging build in '${OUTPUT_DIR}' for `basename "${OUTPUT_DIR}"` to '${PKG_DIR}' with root '${ROOT}'.${NC}"
-        local TEMP_DIR="$(mktemp -d)" 
-        wget ${NSSM_URL} -O ${TEMP_DIR}/nssm.zip
-        wget ${FFMPEG_URL} -O ${TEMP_DIR}/ffmpeg.zip
-        unzip ${TEMP_DIR}/nssm.zip -d $TEMP_DIR
-        cp ${TEMP_DIR}/${NSSM_VERSION}}/win64/nssm.exe ${OUTPUT_DIR}/nssm.exe
-        unzip ${TEMP_DIR}/ffmpeg.zip -d $TEMP_DIR
-        cp ${TEMP_DIR}/${FFMPEG_VERSION}/bin/ffmpeg.exe ${OUTPUT_DIR}/ffmpeg.exe
-        cp ${TEMP_DIR}/${FFMPEG_VERSION}/bin/ffprobe.exe ${OUTPUT_DIR}/ffprobe.exe
-        rm -r ${TEMP_DIR}
-        cp ${ROOT}/deployment/win-generic/install-jellyfin.ps1 ${OUTPUT_DIR}/install-jellyfin.ps1
-        cp ${ROOT}/deployment/win-generic/install.bat ${OUTPUT_DIR}/install.bat
-        mkdir -p ${PKG_DIR}
-        pushd ${OUTPUT_DIR} 
-        ${ARCHIVE_CMD} ${ROOT}/${PKG_DIR}/`basename "${OUTPUT_DIR}"`.zip .
-        popd
-        local EXIT_CODE=$?
-        if [ $EXIT_CODE -eq 0 ]; then
-            echo -e "${GREEN}[DONE] Packaging build in '${OUTPUT_DIR}' for `basename "${OUTPUT_DIR}"` to '${PKG_DIR}' with root '${ROOT}' complete.${NC}"
-        else
-            echo -e "${RED}[FAIL] Packaging build in '${OUTPUT_DIR}' for `basename "${OUTPUT_DIR}"` to '${PKG_DIR}' with root '${ROOT}' FAILED.${NC}"
-        fi       
-    else
-        echo -e "${RED}[FAIL] Build artifacts do not exist for ${OUTPUT_DIR}. Run build.sh first.${NC}"
-    fi
-)
 
 source ../common.build.sh
 
 VERSION=`get_version ../..`
 
-package_win64 ../.. `pwd`/dist/jellyfin_${VERSION}
+package_portable ../.. `pwd`/dist/jellyfin_${VERSION}
 
 #TODO setup and maybe change above code to produce the Windows native zip format.

deployment/win-x86/package.sh

@@ -1,45 +1,9 @@
 #!/usr/bin/env bash
-package_win32() (
-    local NSSM_VERSION="nssm-2.24-101-g897c7ad"
-    local NSSM_URL="https://nssm.cc/ci/${NSSM_VERSION}.zip"
-    local FFMPEG_VERSION="ffmpeg-4.0.2-win32-static"
-    local FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win32/static/${FFMPEG_VERSION}.zip"
-    local ROOT=${1-$DEFAULT_ROOT}
-    local OUTPUT_DIR=${2-$DEFAULT_OUTPUT_DIR}
-    local PKG_DIR=${3-$DEFAULT_PKG_DIR}
-    local ARCHIVE_CMD="zip -r"
-    # Package portable build result
-    if [ -d ${OUTPUT_DIR} ]; then      
-        echo -e "${CYAN}Packaging build in '${OUTPUT_DIR}' for `basename "${OUTPUT_DIR}"` to '${PKG_DIR}' with root '${ROOT}'.${NC}"
-        local TEMP_DIR="$(mktemp -d)" 
-        wget ${NSSM_URL} -O ${TEMP_DIR}/nssm.zip
-        wget ${FFMPEG_URL} -O ${TEMP_DIR}/ffmpeg.zip
-        unzip ${TEMP_DIR}/nssm.zip -d $TEMP_DIR
-        cp ${TEMP_DIR}/${NSSM_VERSION}/win32/nssm.exe ${OUTPUT_DIR}/nssm.exe
-        unzip ${TEMP_DIR}/ffmpeg.zip -d $TEMP_DIR
-        cp ${TEMP_DIR}/${FFMPEG_VERSION}/bin/ffmpeg.exe ${OUTPUT_DIR}/ffmpeg.exe
-        cp ${TEMP_DIR}/${FFMPEG_VERSION}/bin/ffprobe.exe ${OUTPUT_DIR}/ffprobe.exe
-        rm -r ${TEMP_DIR}
-        cp ${ROOT}/deployment/win-generic/install-jellyfin.ps1 ${OUTPUT_DIR}/install-jellyfin.ps1
-        cp ${ROOT}/deployment/win-generic/install.bat ${OUTPUT_DIR}/install.bat
-        mkdir -p ${PKG_DIR}
-        pushd ${OUTPUT_DIR} 
-        ${ARCHIVE_CMD} ${ROOT}/${PKG_DIR}/`basename "${OUTPUT_DIR}"`.zip .
-        popd
-        local EXIT_CODE=$?
-        if [ $EXIT_CODE -eq 0 ]; then
-            echo -e "${GREEN}[DONE] Packaging build in '${OUTPUT_DIR}' for `basename "${OUTPUT_DIR}"` to '${PKG_DIR}' with root '${ROOT}' complete.${NC}"
-        else
-            echo -e "${RED}[FAIL] Packaging build in '${OUTPUT_DIR}' for `basename "${OUTPUT_DIR}"` to '${PKG_DIR}' with root '${ROOT}' FAILED.${NC}"
-        fi       
-    else
-        echo -e "${RED}[FAIL] Build artifacts do not exist for ${OUTPUT_DIR}. Run build.sh first.${NC}"
-    fi
-)
+
 source ../common.build.sh
 
 VERSION=`get_version ../..`
 
-package_win32 ../.. `pwd`/dist/jellyfin_${VERSION}
+package_portable ../.. `pwd`/dist/jellyfin_${VERSION}
 
 #TODO setup and maybe change above code to produce the Windows native zip format.

jellyfin.ruleset

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for Jellyfin.Server" Description="Code analysis rules for Jellyfin.Server.csproj" ToolsVersion="14.0">
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <!-- disable warning SA1101: Prefix local calls with 'this.' -->
-    <Rule Id="SA1101" Action="None" />
-    <!-- disable warning SA1200: 'using' directive must appear within a namespace declaration -->
-    <Rule Id="SA1200" Action="None" />
-    <!-- disable warning SA1309: Fields must not begin with an underscore -->
-    <Rule Id="SA1309" Action="None" />
-    <!-- disable warning SA1633: The file header is missing or not located at the top of the file -->
-    <Rule Id="SA1633" Action="None" />
-  </Rules>
-</RuleSet>