Merge pull request #9 from jellyfin/master

Yanking in latest changes

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -512,7 +512,7 @@ namespace Emby.Server.Implementations.Library
 
             if (forceCaseInsensitive || !ConfigurationManager.Configuration.EnableCaseSensitiveItemIds)
             {
-                key = key.ToLower();
+                key = key.ToLowerInvariant();
             }
 
             key = type.FullName + key;
@@ -869,11 +869,6 @@ namespace Emby.Server.Implementations.Library
             return GetItemByNameId<MusicGenre>(MusicGenre.GetPath, name);
         }
 
-        public Guid GetGameGenreId(string name)
-        {
-            return GetItemByNameId<GameGenre>(GameGenre.GetPath, name);
-        }
-
         /// <summary>
         /// Gets a Genre
         /// </summary>
@@ -894,16 +889,6 @@ namespace Emby.Server.Implementations.Library
             return CreateItemByName<MusicGenre>(MusicGenre.GetPath, name, new DtoOptions(true));
         }
 
-        /// <summary>
-        /// Gets the game genre.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>Task{GameGenre}.</returns>
-        public GameGenre GetGameGenre(string name)
-        {
-            return CreateItemByName<GameGenre>(GameGenre.GetPath, name, new DtoOptions(true));
-        }
-
         /// <summary>
         /// Gets a Year
         /// </summary>
@@ -1370,17 +1355,6 @@ namespace Emby.Server.Implementations.Library
             return ItemRepository.GetGenres(query);
         }
 
-        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGameGenres(InternalItemsQuery query)
-        {
-            if (query.User != null)
-            {
-                AddUserToQuery(query, query.User);
-            }
-
-            SetTopParentOrAncestorIds(query);
-            return ItemRepository.GetGameGenres(query);
-        }
-
         public QueryResult<Tuple<BaseItem, ItemCounts>> GetMusicGenres(InternalItemsQuery query)
         {
             if (query.User != null)

Emby.Server.Implementations/Library/MediaSourceManager.cs

@@ -20,7 +20,6 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Threading;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Library
@@ -36,7 +35,6 @@ namespace Emby.Server.Implementations.Library
         private IMediaSourceProvider[] _providers;
         private readonly ILogger _logger;
         private readonly IUserDataManager _userDataManager;
-        private readonly ITimerFactory _timerFactory;
         private readonly Func<IMediaEncoder> _mediaEncoder;
         private ILocalizationManager _localizationManager;
         private IApplicationPaths _appPaths;
@@ -51,7 +49,6 @@ namespace Emby.Server.Implementations.Library
             IJsonSerializer jsonSerializer,
             IFileSystem fileSystem,
             IUserDataManager userDataManager,
-            ITimerFactory timerFactory,
             Func<IMediaEncoder> mediaEncoder)
         {
             _itemRepo = itemRepo;
@@ -61,7 +58,6 @@ namespace Emby.Server.Implementations.Library
             _jsonSerializer = jsonSerializer;
             _fileSystem = fileSystem;
             _userDataManager = userDataManager;
-            _timerFactory = timerFactory;
             _mediaEncoder = mediaEncoder;
             _localizationManager = localizationManager;
             _appPaths = applicationPaths;
@@ -322,18 +318,18 @@ namespace Emby.Server.Implementations.Library
 
         private string[] NormalizeLanguage(string language)
         {
-            if (language != null)
+            if (language == null)
             {
-                var culture = _localizationManager.FindLanguageInfo(language);
-                if (culture != null)
-                {
-                    return culture.ThreeLetterISOLanguageNames;
-                }
-
-                return new string[] { language };
+                return Array.Empty<string>();
             }
 
-            return Array.Empty<string>();
+            var culture = _localizationManager.FindLanguageInfo(language);
+            if (culture != null)
+            {
+                return culture.ThreeLetterISOLanguageNames;
+            }
+
+            return new string[] { language };
         }
 
         private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)

Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Drawing;
@@ -85,7 +86,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
             return false;
         }
 
-        private static readonly string[] IgnoreFiles =
+        private static readonly HashSet<string> IgnoreFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "folder",
             "thumb",
@@ -102,7 +103,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
         {
             var filename = Path.GetFileNameWithoutExtension(path) ?? string.Empty;
 
-            if (IgnoreFiles.Contains(filename, StringComparer.OrdinalIgnoreCase))
+            if (IgnoreFiles.Contains(filename))
             {
                 return false;
             }
@@ -112,7 +113,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
                 return false;
             }
 
-            return imageProcessor.SupportedInputFormats.Contains((Path.GetExtension(path) ?? string.Empty).TrimStart('.'), StringComparer.OrdinalIgnoreCase);
+            return imageProcessor.SupportedInputFormats.Contains((Path.GetExtension(path) ?? string.Empty).TrimStart('.'));
         }
 
     }

Emby.Server.Implementations/Library/SearchEngine.cs

@@ -99,14 +99,12 @@ namespace Emby.Server.Implementations.Library
                 if (!query.IncludeMedia)
                 {
                     AddIfMissing(includeItemTypes, typeof(Genre).Name);
-                    AddIfMissing(includeItemTypes, typeof(GameGenre).Name);
                     AddIfMissing(includeItemTypes, typeof(MusicGenre).Name);
                 }
             }
             else
             {
                 AddIfMissing(excludeItemTypes, typeof(Genre).Name);
-                AddIfMissing(excludeItemTypes, typeof(GameGenre).Name);
                 AddIfMissing(excludeItemTypes, typeof(MusicGenre).Name);
             }
 

Emby.Server.Implementations/Library/UserManager.cs

@@ -24,7 +24,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -212,11 +211,8 @@ namespace Emby.Server.Implementations.Library
             {
                 foreach (var user in users)
                 {
-                    if (!user.ConnectLinkType.HasValue || user.ConnectLinkType.Value == UserLinkType.LinkedUser)
-                    {
-                        user.Policy.IsAdministrator = true;
-                        UpdateUserPolicy(user, user.Policy, false);
-                    }
+                    user.Policy.IsAdministrator = true;
+                    UpdateUserPolicy(user, user.Policy, false);
                 }
             }
         }
@@ -272,13 +268,9 @@ namespace Emby.Server.Implementations.Library
 
             if (user != null)
             {
-                // Authenticate using local credentials if not a guest
-                if (!user.ConnectLinkType.HasValue || user.ConnectLinkType.Value != UserLinkType.Guest)
-                {
-                    var authResult = await AuthenticateLocalUser(username, password, hashedPassword, user, remoteEndPoint).ConfigureAwait(false);
-                    authenticationProvider = authResult.Item1;
-                    success = authResult.Item2;
-                }
+                var authResult = await AuthenticateLocalUser(username, password, hashedPassword, user, remoteEndPoint).ConfigureAwait(false);
+                authenticationProvider = authResult.Item1;
+                success = authResult.Item2;
             }
             else
             {
@@ -455,30 +447,30 @@ namespace Emby.Server.Implementations.Library
 
         private void UpdateInvalidLoginAttemptCount(User user, int newValue)
         {
-            if (user.Policy.InvalidLoginAttemptCount != newValue || newValue > 0)
+            if (user.Policy.InvalidLoginAttemptCount == newValue || newValue <= 0)
             {
-                user.Policy.InvalidLoginAttemptCount = newValue;
+                return;
+            }
 
-                var maxCount = user.Policy.IsAdministrator ? 3 : 5;
+            user.Policy.InvalidLoginAttemptCount = newValue;
 
-                // TODO: Fix
-                /*
-                var fireLockout = false;
+            var maxCount = user.Policy.IsAdministrator ? 3 : 5;
 
-                if (newValue >= maxCount)
-                {
-                    _logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
-                    user.Policy.IsDisabled = true;
+            var fireLockout = false;
 
-                    fireLockout = true;
-                }*/
+            if (newValue >= maxCount)
+            {
+                _logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue);
+                user.Policy.IsDisabled = true;
 
-                UpdateUserPolicy(user, user.Policy, false);
+                fireLockout = true;
+            }
 
-                /* if (fireLockout)
-                {
-                    UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
-                }*/
+            UpdateUserPolicy(user, user.Policy, false);
+
+            if (fireLockout)
+            {
+                UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
             }
         }
 
@@ -553,9 +545,6 @@ namespace Emby.Server.Implementations.Library
                 LastActivityDate = user.LastActivityDate,
                 LastLoginDate = user.LastLoginDate,
                 Configuration = user.Configuration,
-                ConnectLinkType = user.ConnectLinkType,
-                ConnectUserId = user.ConnectUserId,
-                ConnectUserName = user.ConnectUserName,
                 ServerId = _appHost.SystemId,
                 Policy = user.Policy
             };
@@ -814,11 +803,6 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentNullException(nameof(user));
             }
 
-            if (user.ConnectLinkType.HasValue && user.ConnectLinkType.Value == UserLinkType.Guest)
-            {
-                throw new ArgumentException("Passwords for guests cannot be changed.");
-            }
-
             await GetAuthenticationProvider(user).ChangePassword(user, newPassword).ConfigureAwait(false);
 
             UpdateUser(user);
@@ -925,11 +909,6 @@ namespace Emby.Server.Implementations.Library
                 null :
                 GetUserByName(enteredUsername);
 
-            if (user != null && user.ConnectLinkType.HasValue && user.ConnectLinkType.Value == UserLinkType.Guest)
-            {
-                throw new ArgumentException("Unable to process forgot password request for guests.");
-            }
-
             var action = ForgotPasswordAction.InNetworkRequired;
             string pinFile = null;
             DateTime? expirationDate = null;
@@ -974,10 +953,7 @@ namespace Emby.Server.Implementations.Library
                 _lastPin = null;
                 _lastPasswordPinCreationResult = null;
 
-                var users = Users.Where(i => !i.ConnectLinkType.HasValue || i.ConnectLinkType.Value != UserLinkType.Guest)
-                        .ToList();
-
-                foreach (var user in users)
+                foreach (var user in Users)
                 {
                     await ResetPassword(user).ConfigureAwait(false);
 
@@ -1205,9 +1181,11 @@ namespace Emby.Server.Implementations.Library
             _sessionManager = sessionManager;
         }
 
-        public void Run()
+        public Task RunAsync()
         {
             _userManager.UserPolicyUpdated += _userManager_UserPolicyUpdated;
+
+            return Task.CompletedTask;
         }
 
         private void _userManager_UserPolicyUpdated(object sender, GenericEventArgs<User> e)

Emby.Server.Implementations/Library/UserViewManager.cs

@@ -308,9 +308,6 @@ namespace Emby.Server.Implementations.Library
                             mediaTypes.Add(MediaType.Book);
                             mediaTypes.Add(MediaType.Audio);
                             break;
-                        case CollectionType.Games:
-                            mediaTypes.Add(MediaType.Game);
-                            break;
                         case CollectionType.Music:
                             mediaTypes.Add(MediaType.Audio);
                             break;
@@ -336,7 +333,6 @@ namespace Emby.Server.Implementations.Library
                 typeof(Person).Name,
                 typeof(Studio).Name,
                 typeof(Year).Name,
-                typeof(GameGenre).Name,
                 typeof(MusicGenre).Name,
                 typeof(Genre).Name
 

Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Persistence;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.Library.Validators
-{
-    /// <summary>
-    /// Class GameGenresPostScanTask
-    /// </summary>
-    public class GameGenresPostScanTask : ILibraryPostScanTask
-    {
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-        private readonly ILogger _logger;
-        private readonly IItemRepository _itemRepo;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameGenresPostScanTask" /> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="logger">The logger.</param>
-        public GameGenresPostScanTask(ILibraryManager libraryManager, ILogger logger, IItemRepository itemRepo)
-        {
-            _libraryManager = libraryManager;
-            _logger = logger;
-            _itemRepo = itemRepo;
-        }
-
-        /// <summary>
-        /// Runs the specified progress.
-        /// </summary>
-        /// <param name="progress">The progress.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            return new GameGenresValidator(_libraryManager, _logger, _itemRepo).Run(progress, cancellationToken);
-        }
-    }
-}

Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Persistence;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.Library.Validators
-{
-    class GameGenresValidator
-    {
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-
-        /// <summary>
-        /// The _logger
-        /// </summary>
-        private readonly ILogger _logger;
-        private readonly IItemRepository _itemRepo;
-
-        public GameGenresValidator(ILibraryManager libraryManager, ILogger logger, IItemRepository itemRepo)
-        {
-            _libraryManager = libraryManager;
-            _logger = logger;
-            _itemRepo = itemRepo;
-        }
-
-        /// <summary>
-        /// Runs the specified progress.
-        /// </summary>
-        /// <param name="progress">The progress.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            var names = _itemRepo.GetGameGenreNames();
-
-            var numComplete = 0;
-            var count = names.Count;
-
-            foreach (var name in names)
-            {
-                try
-                {
-                    var item = _libraryManager.GetGameGenre(name);
-
-                    await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    // Don't clutter the log
-                    throw;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error refreshing {GenreName}", name);
-                }
-
-                numComplete++;
-                double percent = numComplete;
-                percent /= count;
-                percent *= 100;
-
-                progress.Report(percent);
-            }
-
-            progress.Report(100);
-        }
-    }
-}