Merge pull request #700 from jellyfin/dev

Dev sync

5 files changed, 30 insertions, 64 deletions

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 0adc5553b..1ed838893 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -469,7 +469,7 @@ namespace Emby.Server.Implementations.Library
             }
 
             // TODO: Don't hardcode this
-            var isAudio = false;
+            const bool isAudio = false;
 
             try
             {
@@ -480,9 +480,11 @@ namespace Emby.Server.Implementations.Library
                 else
                 {
                     // hack - these two values were taken from LiveTVMediaSourceProvider
-                    var cacheKey = request.OpenToken;
+                    string 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)
@@ -491,6 +493,7 @@ 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);
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index baa665fce..e39192d28 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -86,12 +86,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                     .Where(i => !LibraryManager.IgnoreFile(i, args.Parent))
                     .ToList();
 
-                if (isBooksCollectionType)
-                {
-                    return FindAudio<AudioBook>(args, args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
-                }
-
-                return null;
+                return FindAudio<AudioBook>(args, args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
             }
 
             if (LibraryManager.IsAudioFile(args.Path, libraryOptions))
@@ -145,36 +140,19 @@ 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
-            var supportsMultiVersion = false;
+            const bool 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 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);
+                var item = (T)result.Items[0];
+                item.IsInMixedFolder = false;
+                item.Name = Path.GetFileName(item.ContainingFolderPath);
+                return item;
             }
 
             return null;
@@ -194,11 +172,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 {
                     leftOver.Add(child);
                 }
-                else if (IsIgnored(child.Name))
-                {
-
-                }
-                else
+                else if (!IsIgnored(child.Name))
                 {
                     files.Add(child);
                 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index e48213dbb..472a3f105 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -410,7 +410,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             // TODO: Allow GetMultiDiscMovie in here
-            var supportsMultiVersion = true;
+            const bool supportsMultiVersion = true;
 
             var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
                 new MultiItemResolverResult();
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 8ef227689..5c95534ec 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -153,16 +153,8 @@ 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;
 
-                        if (!isTvContentType)
-                        {
-                            isNamed = true;
-                            isOptimistic = false;
-                        }
-
-                        var episodeInfo = episodeResolver.Resolve(fullName, false, isNamed, isOptimistic, fillExtendedInfo: false);
+                        var episodeInfo = episodeResolver.Resolve(fullName, false, true, false, fillExtendedInfo: false);
                         if (episodeInfo != null && episodeInfo.EpisodeNumber.HasValue)
                         {
                             return true;
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index d5bc3d332..6139659b7 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -322,17 +322,14 @@ 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 != null)
+            if (!user.Policy.EnableRemoteAccess && !_networkManager.IsInLocalNetwork(remoteEndPoint))
             {
-                if (!user.Policy.EnableRemoteAccess && !_networkManager.IsInLocalNetwork(remoteEndPoint))
-                {
-                    throw new SecurityException("Forbidden.");
-                }
+                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
@@ -463,26 +460,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));
-                }
+                }*/
             }
         }