From 7534ecc396ca214f40aab8b5e848134051830480 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 28 Apr 2013 14:30:58 -0400
Subject: [PATCH 1/2] renamed video backdrops to theme videos

---
 .../UserLibrary/UserLibraryService.cs         | 12 ++++-----
 MediaBrowser.Controller/Entities/BaseItem.cs  | 26 +++++++++----------
 .../Querying/ThemeSongsResult.cs              |  2 +-
 .../Library/CoreResolutionIgnoreRule.cs       |  4 +--
 .../Library/LibraryManager.cs                 |  6 ++---
 .../ScheduledTasks/VideoImagesTask.cs         |  4 +--
 MediaBrowser.WebDashboard/ApiClient.js        |  4 +--
 MediaBrowser.WebDashboard/packages.config     |  2 +-
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 35411935b3..fc4e1bfc62 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -337,11 +337,11 @@ namespace MediaBrowser.Api.UserLibrary
     }
 
     /// <summary>
-    /// Class GetVideoBackdrops
+    /// Class GetThemeVideos
     /// </summary>
-    [Route("/Users/{UserId}/Items/{Id}/VideoBackdrops", "GET")]
+    [Route("/Users/{UserId}/Items/{Id}/ThemeVideos", "GET")]
     [Api(Description = "Gets video backdrops for an item")]
-    public class GetVideoBackdrops : IReturn<VideoBackdropsResult>
+    public class GetThemeVideos : IReturn<ThemeVideosResult>
     {
         /// <summary>
         /// Gets or sets the user id.
@@ -491,7 +491,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns>System.Object.</returns>
-        public object Get(GetVideoBackdrops request)
+        public object Get(GetThemeVideos request)
         {
             var user = _userManager.GetUserById(request.UserId);
 
@@ -502,9 +502,9 @@ namespace MediaBrowser.Api.UserLibrary
 
             var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository);
 
-            var items = item.VideoBackdrops.Select(i => dtoBuilder.GetBaseItemDto(i, user, fields)).AsParallel().Select(t => t.Result).ToArray();
+            var items = item.ThemeVideos.Select(i => dtoBuilder.GetBaseItemDto(i, user, fields)).AsParallel().Select(t => t.Result).ToArray();
 
-            var result = new VideoBackdropsResult
+            var result = new ThemeVideosResult
             {
                 Items = items,
                 TotalRecordCount = items.Length,
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 8da67cb69f..0479259e5f 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         public const string TrailerFolderName = "trailers";
         public const string ThemeSongsFolderName = "theme-music";
-        public const string VideoBackdropsFolderName = "backdrops";
+        public const string ThemeVideosFolderName = "backdrops";
 
         /// <summary>
         /// Gets or sets the name.
@@ -703,24 +703,24 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        private List<Video> _videoBackdrops;
-        private bool _videoBackdropsInitialized;
-        private object _videoBackdropsSyncLock = new object();
+        private List<Video> _themeVideos;
+        private bool _themeVideosInitialized;
+        private object _themeVideosSyncLock = new object();
         [IgnoreDataMember]
-        public List<Video> VideoBackdrops
+        public List<Video> ThemeVideos
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _videoBackdrops, ref _videoBackdropsInitialized, ref _videoBackdropsSyncLock, LoadVideoBackdrops);
-                return _videoBackdrops;
+                LazyInitializer.EnsureInitialized(ref _themeVideos, ref _themeVideosInitialized, ref _themeVideosSyncLock, LoadThemeVideos);
+                return _themeVideos;
             }
             private set
             {
-                _videoBackdrops = value;
+                _themeVideos = value;
 
                 if (value == null)
                 {
-                    _videoBackdropsInitialized = false;
+                    _themeVideosInitialized = false;
                 }
             }
         }
@@ -845,7 +845,7 @@ namespace MediaBrowser.Controller.Entities
         /// Loads the video backdrops.
         /// </summary>
         /// <returns>List{Video}.</returns>
-        private List<Video> LoadVideoBackdrops()
+        private List<Video> LoadThemeVideos()
         {
             ItemResolveArgs resolveArgs;
 
@@ -864,7 +864,7 @@ namespace MediaBrowser.Controller.Entities
                 return new List<Video>();
             }
 
-            var folder = resolveArgs.GetFileSystemEntryByName(VideoBackdropsFolderName);
+            var folder = resolveArgs.GetFileSystemEntryByName(ThemeVideosFolderName);
 
             // Path doesn't exist. No biggie
             if (folder == null)
@@ -918,7 +918,7 @@ namespace MediaBrowser.Controller.Entities
             // Lazy load these again
             LocalTrailers = null;
             ThemeSongs = null;
-            VideoBackdrops = null;
+            ThemeVideos = null;
 
             // Refresh for the item
             var itemRefreshTask = ProviderManager.ExecuteMetadataProviders(this, cancellationToken, forceRefresh, allowSlowProviders);
@@ -930,7 +930,7 @@ namespace MediaBrowser.Controller.Entities
 
             var themeSongTasks = ThemeSongs.Select(i => i.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders));
 
-            var videoBackdropTasks = VideoBackdrops.Select(i => i.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders));
+            var videoBackdropTasks = ThemeVideos.Select(i => i.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders));
             
             cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/MediaBrowser.Model/Querying/ThemeSongsResult.cs b/MediaBrowser.Model/Querying/ThemeSongsResult.cs
index f3a9f7a802..919709f0f6 100644
--- a/MediaBrowser.Model/Querying/ThemeSongsResult.cs
+++ b/MediaBrowser.Model/Querying/ThemeSongsResult.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Model.Querying
         public string OwnerId { get; set; }
     }
 
-    public class VideoBackdropsResult : ItemsResult
+    public class ThemeVideosResult : ItemsResult
     {
         /// <summary>
         /// Gets or sets the owner id.
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index c6beef9573..3caa9ac88a 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var parentFolderName = Path.GetFileName(Path.GetDirectoryName(args.Path));
 
-                if (string.Equals(parentFolderName, BaseItem.ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase) || string.Equals(parentFolderName, BaseItem.VideoBackdropsFolderName, StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(parentFolderName, BaseItem.ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase) || string.Equals(parentFolderName, BaseItem.ThemeVideosFolderName, StringComparison.OrdinalIgnoreCase))
                 {
                     return false;
                 }
@@ -62,7 +62,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     return true;
                 }
 
-                if (string.Equals(filename, BaseItem.VideoBackdropsFolderName, StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(filename, BaseItem.ThemeVideosFolderName, StringComparison.OrdinalIgnoreCase))
                 {
                     return true;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 9200a828b5..b89ed54e36 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -275,12 +275,12 @@ namespace MediaBrowser.Server.Implementations.Library
             var specialFeatures = items.OfType<Movie>().SelectMany(i => i.SpecialFeatures).ToList();
             var localTrailers = items.SelectMany(i => i.LocalTrailers).ToList();
             var themeSongs = items.SelectMany(i => i.ThemeSongs).ToList();
-            var videoBackdrops = items.SelectMany(i => i.VideoBackdrops).ToList();
+            var themeVideos = items.SelectMany(i => i.ThemeVideos).ToList();
 
             items.AddRange(specialFeatures);
             items.AddRange(localTrailers);
             items.AddRange(themeSongs);
-            items.AddRange(videoBackdrops);
+            items.AddRange(themeVideos);
 
             // Need to use DistinctBy Id because there could be multiple instances with the same id
             // due to sharing the default library
@@ -343,7 +343,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 LibraryItemsCache.AddOrUpdate(subItem.Id, subItem, delegate { return copy; });
             }
 
-            foreach (var subItem in item.VideoBackdrops)
+            foreach (var subItem in item.ThemeVideos)
             {
                 // Prevent access to foreach variable in closure
                 var copy = subItem;
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs
index 34f02fb6b9..74307b0d5a 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs
@@ -99,13 +99,13 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
             var allItems = _libraryManager.RootFolder.RecursiveChildren.ToList();
 
             var localTrailers = allItems.SelectMany(i => i.LocalTrailers);
-            var videoBackdrops = allItems.SelectMany(i => i.VideoBackdrops);
+            var themeVideos = allItems.SelectMany(i => i.ThemeVideos);
 
             var videos = allItems.OfType<Video>().ToList();
 
             var items = videos;
             items.AddRange(localTrailers);
-            items.AddRange(videoBackdrops);
+            items.AddRange(themeVideos);
             items.AddRange(videos.OfType<Movie>().SelectMany(i => i.SpecialFeatures).ToList());
 
             items = items.Where(i =>
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 9999c0fe0f..3c53077836 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -1733,7 +1733,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
             });
         };
 
-        self.getVideoBackdrops = function (userId, itemId) {
+        self.getThemeVideos = function (userId, itemId) {
 
             if (!userId) {
                 throw new Error("null userId");
@@ -1742,7 +1742,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null itemId");
             }
 
-            var url = self.getUrl("Users/" + userId + "/Items/" + itemId + "/VideoBackdrops");
+            var url = self.getUrl("Users/" + userId + "/Items/" + itemId + "/ThemeVideos");
 
             return self.ajax({
                 type: "GET",
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 56ad5f6568..ef2a6b2f1d 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.87" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.88" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
 </packages>
\ No newline at end of file

From e8c637c47b6376189243c1940b604826f7df755a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 28 Apr 2013 14:42:54 -0400
Subject: [PATCH 2/2] use regular detail page for game systems

---
 MediaBrowser.WebDashboard/Api/DashboardService.cs          | 1 -
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 7aaa4d1735..b6fea5a4ce 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -455,7 +455,6 @@ namespace MediaBrowser.WebDashboard.Api
                                       "edituserpage.js",
                                       "gamesrecommendedpage.js",
                                       "gamesystemspage.js",
-                                      "gamesystempage.js",
                                       "gamespage.js",
                                       "gamegenrepage.js",
                                       "gamestudiospage.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 385998ca99..19727fa9ca 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -219,9 +219,6 @@
     <Content Include="dashboard-ui\gamestudios.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\gamesystem.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\gamesystems.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -297,9 +294,6 @@
     <Content Include="dashboard-ui\scripts\gamestudiospage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\gamesystempage.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\gamesystemspage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>