Remove support for games as a media type

changyou68 · Jan 31, 2019 · 8985fb8 · 8985fb8
1 parent b5e8cce
commit 8985fb8
Show file tree

Hide file tree

Showing 102 changed files with 9 additions and 1,705 deletions.
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -454,7 +454,7 @@ private QueryResult<BaseItem> GetChildrenSorted(BaseItem item, User user, Search
                 User = user,
                 Recursive = true,
                 IsMissing = false,
-                ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name },
+                ExcludeItemTypes = new[] { typeof(Book).Name },
                 IsFolder = isFolder,
                 MediaTypes = mediaTypes.ToArray(),
                 DtoOptions = GetDtoOptions()
@@ -523,7 +523,7 @@ private QueryResult<ServerItem> GetUserItems(BaseItem item, StubType? stubType,
                 Limit = limit,
                 StartIndex = startIndex,
                 IsVirtualItem = false,
-                ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name },
+                ExcludeItemTypes = new[] { typeof(Book).Name },
                 IsPlaceHolder = false,
                 DtoOptions = GetDtoOptions()
             };

diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -808,7 +808,7 @@ private void WriteObjectClass(XmlWriter writer, BaseItem item, StubType? stubTyp
             {
                 writer.WriteString(_profile.RequiresPlainFolders ? "object.container.storageFolder" : "object.container.genre.musicGenre");
             }
-            else if (item is Genre || item is GameGenre)
+            else if (item is Genre)
             {
                 writer.WriteString(_profile.RequiresPlainFolders ? "object.container.storageFolder" : "object.container.genre");
             }

diff --git a/Emby.Notifications/CoreNotificationTypes.cs b/Emby.Notifications/CoreNotificationTypes.cs
@@ -73,11 +73,6 @@ public IEnumerable<NotificationTypeInfo> GetNotificationTypes()
                      Type = NotificationType.AudioPlayback.ToString()
                 },
 
-                new NotificationTypeInfo
-                {
-                     Type = NotificationType.GamePlayback.ToString()
-                },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.VideoPlayback.ToString()
@@ -88,11 +83,6 @@ public IEnumerable<NotificationTypeInfo> GetNotificationTypes()
                      Type = NotificationType.AudioPlaybackStopped.ToString()
                 },
 
-                new NotificationTypeInfo
-                {
-                     Type = NotificationType.GamePlaybackStopped.ToString()
-                },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.VideoPlaybackStopped.ToString()

diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
@@ -207,10 +207,6 @@ private static string GetPlaybackNotificationType(string mediaType)
             {
                 return NotificationType.AudioPlayback.ToString();
             }
-            if (string.Equals(mediaType, MediaType.Game, StringComparison.OrdinalIgnoreCase))
-            {
-                return NotificationType.GamePlayback.ToString();
-            }
             if (string.Equals(mediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
             {
                 return NotificationType.VideoPlayback.ToString();
@@ -225,10 +221,6 @@ private static string GetPlaybackStoppedNotificationType(string mediaType)
             {
                 return NotificationType.AudioPlaybackStopped.ToString();
             }
-            if (string.Equals(mediaType, MediaType.Game, StringComparison.OrdinalIgnoreCase))
-            {
-                return NotificationType.GamePlaybackStopped.ToString();
-            }
             if (string.Equals(mediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
             {
                 return NotificationType.VideoPlaybackStopped.ToString();

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1671,7 +1671,6 @@ private IEnumerable<string> FilterAssembliesToLoad(IEnumerable<string> paths)
 
             var minRequiredVersions = new Dictionary<string, Version>(StringComparer.OrdinalIgnoreCase)
             {
-                { "GameBrowser.dll", new Version(3, 1) },
                 { "moviethemesongs.dll", new Version(1, 6) },
                 { "themesongs.dll", new Version(1, 2) }
             };

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1239,10 +1239,6 @@ private bool TypeRequiresDeserialization(Type type)
             {
                 return false;
             }
-            else if (type == typeof(GameGenre))
-            {
-                return false;
-            }
             else if (type == typeof(Genre))
             {
                 return false;
@@ -4789,10 +4785,6 @@ private List<string> GetItemByNameTypesInQuery(InternalItemsQuery query)
             {
                 list.Add(typeof(MusicGenre).Name);
             }
-            if (IsTypeInQuery(typeof(GameGenre).Name, query))
-            {
-                list.Add(typeof(GameGenre).Name);
-            }
             if (IsTypeInQuery(typeof(MusicArtist).Name, query))
             {
                 list.Add(typeof(MusicArtist).Name);
@@ -4891,9 +4883,6 @@ private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
             typeof(Book),
             typeof(CollectionFolder),
             typeof(Folder),
-            typeof(Game),
-            typeof(GameGenre),
-            typeof(GameSystem),
             typeof(Genre),
             typeof(Person),
             typeof(Photo),
@@ -5251,11 +5240,6 @@ public QueryResult<Tuple<BaseItem, ItemCounts>> GetGenres(InternalItemsQuery que
             return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName);
         }
 
-        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGameGenres(InternalItemsQuery query)
-        {
-            return GetItemValues(query, new[] { 2 }, typeof(GameGenre).FullName);
-        }
-
         public QueryResult<Tuple<BaseItem, ItemCounts>> GetMusicGenres(InternalItemsQuery query)
         {
             return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName);
@@ -5276,14 +5260,9 @@ public List<string> GetMusicGenreNames()
             return GetItemValueNames(new[] { 2 }, new List<string> { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist" }, new List<string>());
         }
 
-        public List<string> GetGameGenreNames()
-        {
-            return GetItemValueNames(new[] { 2 }, new List<string> { "Game" }, new List<string>());
-        }
-
         public List<string> GetGenreNames()
         {
-            return GetItemValueNames(new[] { 2 }, new List<string>(), new List<string> { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist", "Game", "GameSystem" });
+            return GetItemValueNames(new[] { 2 }, new List<string>(), new List<string> { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist" });
         }
 
         private List<string> GetItemValueNames(int[] itemValueTypes, List<string> withItemTypes, List<string> excludeItemTypes)
@@ -5652,10 +5631,6 @@ private ItemCounts GetItemCounts(IReadOnlyList<IResultSetValue> reader, int coun
                 {
                     counts.SongCount = value;
                 }
-                else if (string.Equals(typeName, typeof(Game).FullName, StringComparison.OrdinalIgnoreCase))
-                {
-                    counts.GameCount = value;
-                }
                 else if (string.Equals(typeName, typeof(Trailer).FullName, StringComparison.OrdinalIgnoreCase))
                 {
                     counts.TrailerCount = value;

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -374,18 +374,13 @@ private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IList<Base
                 dto.MusicVideoCount = taggedItems.Count(i => i is MusicVideo);
                 dto.SongCount = taggedItems.Count(i => i is Audio);
             }
-            else if (item is GameGenre)
-            {
-                dto.GameCount = taggedItems.Count(i => i is Game);
-            }
             else
             {
                 // This populates them all and covers Genre, Person, Studio, Year
 
                 dto.ArtistCount = taggedItems.Count(i => i is MusicArtist);
                 dto.AlbumCount = taggedItems.Count(i => i is MusicAlbum);
                 dto.EpisodeCount = taggedItems.Count(i => i is Episode);
-                dto.GameCount = taggedItems.Count(i => i is Game);
                 dto.MovieCount = taggedItems.Count(i => i is Movie);
                 dto.TrailerCount = taggedItems.Count(i => i is Trailer);
                 dto.MusicVideoCount = taggedItems.Count(i => i is MusicVideo);
@@ -532,17 +527,6 @@ private void SetMusicVideoProperties(BaseItemDto dto, MusicVideo item)
             dto.Album = item.Album;
         }
 
-        private static void SetGameProperties(BaseItemDto dto, Game item)
-        {
-            dto.GameSystem = item.GameSystem;
-            dto.MultiPartGameFiles = item.MultiPartGameFiles;
-        }
-
-        private static void SetGameSystemProperties(BaseItemDto dto, GameSystem item)
-        {
-            dto.GameSystem = item.GameSystemName;
-        }
-
         private string[] GetImageTags(BaseItem item, List<ItemImageInfo> images)
         {
             return images
@@ -698,11 +682,6 @@ private Guid GetGenreId(string name, BaseItem owner)
                 return _libraryManager.GetMusicGenreId(name);
             }
 
-            if (owner is Game || owner is GameSystem)
-            {
-                return _libraryManager.GetGameGenreId(name);
-            }
-
             return _libraryManager.GetGenreId(name);
         }
 
@@ -1206,20 +1185,6 @@ private void AttachBasicFields(BaseItemDto dto, BaseItem item, BaseItem owner, D
                 }
             }
 
-            var game = item as Game;
-
-            if (game != null)
-            {
-                SetGameProperties(dto, game);
-            }
-
-            var gameSystem = item as GameSystem;
-
-            if (gameSystem != null)
-            {
-                SetGameSystemProperties(dto, gameSystem);
-            }
-
             var musicVideo = item as MusicVideo;
             if (musicVideo != null)
             {

diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -215,7 +215,7 @@ protected virtual string CreateImage(BaseItem item,
                 {
                     return CreateSquareCollage(item, itemsWithImages, outputPath);
                 }
-                if (item is Playlist || item is MusicGenre || item is Genre || item is GameGenre || item is PhotoAlbum)
+                if (item is Playlist || item is MusicGenre || item is Genre || item is PhotoAlbum)
                 {
                     return CreateSquareCollage(item, itemsWithImages, outputPath);
                 }

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -869,11 +869,6 @@ public Guid GetMusicGenreId(string name)
             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 @@ public MusicGenre GetMusicGenre(string name)
             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 @@ public QueryResult<Tuple<BaseItem, ItemCounts>> GetGenres(InternalItemsQuery que
             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)

diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -99,14 +99,12 @@ private List<SearchHintInfo> GetSearchHints(SearchQuery query, User user)
                 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);
             }
 

diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -308,9 +308,6 @@ private List<BaseItem> GetItemsForLatestItems(User user, LatestItemsQuery reques
                             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 @@ private List<BaseItem> GetItemsForLatestItems(User user, LatestItemsQuery reques
                 typeof(Person).Name,
                 typeof(Studio).Name,
                 typeof(Year).Name,
-                typeof(GameGenre).Name,
                 typeof(MusicGenre).Name,
                 typeof(Genre).Name
 

diff --git a/Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs