Merge pull request #9 from jellyfin/master

Yanking in latest changes

13 files changed, 10 insertions, 371 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 482d14e11..72c4e3573 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -615,7 +615,7 @@ namespace MediaBrowser.Controller.Entities
                     if (!string.IsNullOrEmpty(ForcedSortName))
                     {
                         // Need the ToLower because that's what CreateSortName does
-                        _sortName = ModifySortChunks(ForcedSortName).ToLower();
+                        _sortName = ModifySortChunks(ForcedSortName).ToLowerInvariant();
                     }
                     else
                     {
@@ -661,7 +661,7 @@ namespace MediaBrowser.Controller.Entities
                 return Name.TrimStart();
             }
 
-            var sortable = Name.Trim().ToLower();
+            var sortable = Name.Trim().ToLowerInvariant();
 
             foreach (var removeChar in ConfigurationManager.Configuration.SortRemoveCharacters)
             {
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index 91cfcd0ce..275052d48 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -335,7 +335,11 @@ namespace MediaBrowser.Controller.Entities
                 .OfType<Folder>()
                 .ToList();
 
-            return PhysicalLocations.Where(i => !FileSystem.AreEqual(i, Path)).SelectMany(i => GetPhysicalParents(i, rootChildren)).DistinctBy(i => i.Id);
+            return PhysicalLocations
+                    .Where(i => !FileSystem.AreEqual(i, Path))
+                    .SelectMany(i => GetPhysicalParents(i, rootChildren))
+                    .GroupBy(x => x.Id)
+                    .Select(x => x.First());
         }
 
         private IEnumerable<Folder> GetPhysicalParents(string path, List<Folder> rootChildren)
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index dab96509c..8bfadbee6 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1149,16 +1149,6 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }
 
-            if (request.MinPlayers.HasValue)
-            {
-                return false;
-            }
-
-            if (request.MaxPlayers.HasValue)
-            {
-                return false;
-            }
-
             if (request.MinCommunityRating.HasValue)
             {
                 return false;
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
deleted file mode 100644
index eea1bf43d..000000000
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Controller.Entities
-{
-    public class Game : BaseItem, IHasTrailers, IHasScreenshots, ISupportsPlaceHolders, IHasLookupInfo<GameInfo>
-    {
-        public Game()
-        {
-            MultiPartGameFiles = Array.Empty<string>();
-            RemoteTrailers = EmptyMediaUrlArray;
-            LocalTrailerIds = Array.Empty<Guid>();
-            RemoteTrailerIds = Array.Empty<Guid>();
-        }
-
-        public Guid[] LocalTrailerIds { get; set; }
-        public Guid[] RemoteTrailerIds { get; set; }
-
-        public override bool CanDownload()
-        {
-            return IsFileProtocol;
-        }
-
-        [IgnoreDataMember]
-        public override bool SupportsThemeMedia => true;
-
-        [IgnoreDataMember]
-        public override bool SupportsPeople => false;
-
-        /// <summary>
-        /// Gets the type of the media.
-        /// </summary>
-        /// <value>The type of the media.</value>
-        [IgnoreDataMember]
-        public override string MediaType => Model.Entities.MediaType.Game;
-
-        /// <summary>
-        /// Gets or sets the players supported.
-        /// </summary>
-        /// <value>The players supported.</value>
-        public int? PlayersSupported { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is place holder.
-        /// </summary>
-        /// <value><c>true</c> if this instance is place holder; otherwise, <c>false</c>.</value>
-        public bool IsPlaceHolder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the game system.
-        /// </summary>
-        /// <value>The game system.</value>
-        public string GameSystem { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is multi part.
-        /// </summary>
-        /// <value><c>true</c> if this instance is multi part; otherwise, <c>false</c>.</value>
-        public bool IsMultiPart { get; set; }
-
-        /// <summary>
-        /// Holds the paths to the game files in the event this is a multipart game
-        /// </summary>
-        public string[] MultiPartGameFiles { get; set; }
-
-        public override List<string> GetUserDataKeys()
-        {
-            var list = base.GetUserDataKeys();
-            var id = this.GetProviderId(MetadataProviders.Gamesdb);
-
-            if (!string.IsNullOrEmpty(id))
-            {
-                list.Insert(0, "Game-Gamesdb-" + id);
-            }
-            return list;
-        }
-
-        public override IEnumerable<FileSystemMetadata> GetDeletePaths()
-        {
-            if (!IsInMixedFolder)
-            {
-                return new[] {
-                    new FileSystemMetadata
-                    {
-                        FullName = System.IO.Path.GetDirectoryName(Path),
-                        IsDirectory = true
-                    }
-                };
-            }
-
-            return base.GetDeletePaths();
-        }
-
-        public override UnratedItem GetBlockUnratedType()
-        {
-            return UnratedItem.Game;
-        }
-
-        public GameInfo GetLookupInfo()
-        {
-            var id = GetItemLookupInfo<GameInfo>();
-
-            id.GameSystem = GameSystem;
-
-            return id;
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/GameGenre.cs b/MediaBrowser.Controller/Entities/GameGenre.cs
deleted file mode 100644
index c0fd4ae89..000000000
--- a/MediaBrowser.Controller/Entities/GameGenre.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Controller.Extensions;
-using MediaBrowser.Model.Serialization;
-using Microsoft.Extensions.Logging;
-
-namespace MediaBrowser.Controller.Entities
-{
-    public class GameGenre : BaseItem, IItemByName
-    {
-        public override List<string> GetUserDataKeys()
-        {
-            var list = base.GetUserDataKeys();
-
-            list.Insert(0, GetType().Name + "-" + (Name ?? string.Empty).RemoveDiacritics());
-            return list;
-        }
-
-        public override string CreatePresentationUniqueKey()
-        {
-            return GetUserDataKeys()[0];
-        }
-
-        public override double GetDefaultPrimaryImageAspectRatio()
-        {
-            return 1;
-        }
-
-        /// <summary>
-        /// Returns the folder containing the item.
-        /// If the item is a folder, it returns the folder itself
-        /// </summary>
-        /// <value>The containing folder path.</value>
-        [IgnoreDataMember]
-        public override string ContainingFolderPath => Path;
-
-        [IgnoreDataMember]
-        public override bool SupportsAncestors => false;
-
-        public override bool IsSaveLocalMetadataEnabled()
-        {
-            return true;
-        }
-
-        public override bool CanDelete()
-        {
-            return false;
-        }
-
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
-        {
-            query.GenreIds = new[] { Id };
-            query.IncludeItemTypes = new[] { typeof(Game).Name };
-
-            return LibraryManager.GetItemList(query);
-        }
-
-        [IgnoreDataMember]
-        public override bool SupportsPeople => false;
-
-        public static string GetPath(string name)
-        {
-            return GetPath(name, true);
-        }
-
-        public static string GetPath(string name, bool normalizeName)
-        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validName = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
-
-            return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.GameGenrePath, validName);
-        }
-
-        private string GetRebasedPath()
-        {
-            return GetPath(System.IO.Path.GetFileName(Path), false);
-        }
-
-        public override bool RequiresRefresh()
-        {
-            var newPath = GetRebasedPath();
-            if (!string.Equals(Path, newPath, StringComparison.Ordinal))
-            {
-                Logger.LogDebug("{0} path has changed from {1} to {2}", GetType().Name, Path, newPath);
-                return true;
-            }
-            return base.RequiresRefresh();
-        }
-
-        /// <summary>
-        /// This is called before any metadata refresh and returns true or false indicating if changes were made
-        /// </summary>
-        public override bool BeforeMetadataRefresh(bool replaceAllMetdata)
-        {
-            var hasChanges = base.BeforeMetadataRefresh(replaceAllMetdata);
-
-            var newPath = GetRebasedPath();
-            if (!string.Equals(Path, newPath, StringComparison.Ordinal))
-            {
-                Path = newPath;
-                hasChanges = true;
-            }
-
-            return hasChanges;
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/GameSystem.cs b/MediaBrowser.Controller/Entities/GameSystem.cs
deleted file mode 100644
index 63f830d25..000000000
--- a/MediaBrowser.Controller/Entities/GameSystem.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Users;
-
-namespace MediaBrowser.Controller.Entities
-{
-    /// <summary>
-    /// Class GameSystem
-    /// </summary>
-    public class GameSystem : Folder, IHasLookupInfo<GameSystemInfo>
-    {
-        /// <summary>
-        /// Return the id that should be used to key display prefs for this item.
-        /// Default is based on the type for everything except actual generic folders.
-        /// </summary>
-        /// <value>The display prefs id.</value>
-        [IgnoreDataMember]
-        public override Guid DisplayPreferencesId => Id;
-
-        [IgnoreDataMember]
-        public override bool SupportsPlayedStatus => false;
-
-        [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages => false;
-
-        public override double GetDefaultPrimaryImageAspectRatio()
-        {
-            double value = 16;
-            value /= 9;
-
-            return value;
-        }
-
-        /// <summary>
-        /// Gets or sets the game system.
-        /// </summary>
-        /// <value>The game system.</value>
-        public string GameSystemName { get; set; }
-
-        public override List<string> GetUserDataKeys()
-        {
-            var list = base.GetUserDataKeys();
-
-            if (!string.IsNullOrEmpty(GameSystemName))
-            {
-                list.Insert(0, "GameSystem-" + GameSystemName);
-            }
-            return list;
-        }
-
-        protected override bool GetBlockUnratedValue(UserPolicy config)
-        {
-            // Don't block. Determine by game
-            return false;
-        }
-
-        public override UnratedItem GetBlockUnratedType()
-        {
-            return UnratedItem.Game;
-        }
-
-        public GameSystemInfo GetLookupInfo()
-        {
-            var id = GetItemLookupInfo<GameSystemInfo>();
-
-            id.Path = Path;
-
-            return id;
-        }
-
-        [IgnoreDataMember]
-        public override bool SupportsPeople => false;
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs
index 3f3ab3551..44cb62d22 100644
--- a/MediaBrowser.Controller/Entities/Genre.cs
+++ b/MediaBrowser.Controller/Entities/Genre.cs
@@ -56,7 +56,7 @@ namespace MediaBrowser.Controller.Entities
         public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             query.GenreIds = new[] { Id };
-            query.ExcludeItemTypes = new[] { typeof(Game).Name, typeof(MusicVideo).Name, typeof(Audio.Audio).Name, typeof(MusicAlbum).Name, typeof(MusicArtist).Name };
+            query.ExcludeItemTypes = new[] { typeof(MusicVideo).Name, typeof(Audio.Audio).Name, typeof(MusicAlbum).Name, typeof(MusicArtist).Name };
 
             return LibraryManager.GetItemList(query);
         }
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 4b7af5391..78f859069 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -95,9 +95,6 @@ namespace MediaBrowser.Controller.Entities
         public bool? IsKids { get; set; }
         public bool? IsNews { get; set; }
         public bool? IsSeries { get; set; }
-
-        public int? MinPlayers { get; set; }
-        public int? MaxPlayers { get; set; }
         public int? MinIndexNumber { get; set; }
         public int? AiredDuringSeason { get; set; }
         public double? MinCriticRating { get; set; }
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 4539ab0f2..570e9389e 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -270,7 +270,7 @@ namespace MediaBrowser.Controller.Entities.TV
             // This depends on settings for that series
             // When this happens, remove the duplicate from season 0
 
-            return allEpisodes.DistinctBy(i => i.Id).Reverse();
+            return allEpisodes.GroupBy(i => i.Id).Select(x => x.First()).Reverse();
         }
 
         public async Task RefreshAllMetadata(MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 06bae9211..0d5f508dd 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Users;
 
@@ -33,11 +32,6 @@ namespace MediaBrowser.Controller.Entities
         public string EasyPassword { get; set; }
         public string Salt { get; set; }
 
-        public string ConnectUserName { get; set; }
-        public string ConnectUserId { get; set; }
-        public UserLinkType? ConnectLinkType { get; set; }
-        public string ConnectAccessKey { get; set; }
-
         // Strictly to remove IgnoreDataMember
         public override ItemImageInfo[] ImageInfos
         {
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index de4105df9..3e2191376 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -150,7 +150,6 @@ namespace MediaBrowser.Controller.Entities
 
         private static string[] OriginalFolderViewTypes = new string[]
             {
-                MediaBrowser.Model.Entities.CollectionType.Games,
                 MediaBrowser.Model.Entities.CollectionType.Books,
                 MediaBrowser.Model.Entities.CollectionType.MusicVideos,
                 MediaBrowser.Model.Entities.CollectionType.HomeVideos,
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 0b0134669..683218a9e 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -848,52 +848,6 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
-            if (query.MinPlayers.HasValue)
-            {
-                var filterValue = query.MinPlayers.Value;
-
-                var game = item as Game;
-
-                if (game != null)
-                {
-                    var players = game.PlayersSupported ?? 1;
-
-                    var ok = players >= filterValue;
-
-                    if (!ok)
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            if (query.MaxPlayers.HasValue)
-            {
-                var filterValue = query.MaxPlayers.Value;
-
-                var game = item as Game;
-
-                if (game != null)
-                {
-                    var players = game.PlayersSupported ?? 1;
-
-                    var ok = players <= filterValue;
-
-                    if (!ok)
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
             if (query.MinCommunityRating.HasValue)
             {
                 var val = query.MinCommunityRating.Value;
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 33a967758..31cd42975 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -305,7 +305,7 @@ namespace MediaBrowser.Controller.Entities
 
         private string GetUserDataKey(string providerId)
         {
-            var key = providerId + "-" + ExtraType.ToString().ToLower();
+            var key = providerId + "-" + ExtraType.ToString().ToLowerInvariant();
 
             // Make sure different trailers have their own data.
             if (RunTimeTicks.HasValue)