From d86c6decec6219e6388288297071db3ea0165249 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Jun 2015 01:56:46 -0400 Subject: [PATCH] extract more scripts --- MediaBrowser.Providers/TV/TvdbSeriesProvider.cs | 6 +++++- MediaBrowser.WebDashboard/Api/DashboardService.cs | 6 ++++-- MediaBrowser.WebDashboard/Api/PackageCreator.cs | 5 ----- MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 +++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs index a31cc1e0c..60e484a36 100644 --- a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs @@ -419,7 +419,11 @@ namespace MediaBrowser.Providers.TV } } - _logger.Info("TVDb Provider - Could not find " + name + ". Check name on Thetvdb.org."); + if (searchResults.Count == 0) + { + _logger.Info("TVDb Provider - Could not find " + name + ". Check name on Thetvdb.org."); + } + return searchResults; } diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 5ead3b108..4c8f91525 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -281,7 +281,7 @@ namespace MediaBrowser.WebDashboard.Api } catch (IOException) { - + } var creator = GetPackageCreator(); @@ -300,6 +300,8 @@ namespace MediaBrowser.WebDashboard.Api var cordovaVersion = Path.Combine(path, "thirdparty", "cordova", "registrationservices.js"); File.Copy(cordovaVersion, Path.Combine(path, "scripts", "registrationservices.js"), true); File.Delete(cordovaVersion); + + Directory.Delete(Path.Combine(path, "css", "images", "tour"), true); } await DumpHtml(creator.DashboardUIPath, path, mode, culture, appVersion); @@ -307,7 +309,7 @@ namespace MediaBrowser.WebDashboard.Api await DumpFile("scripts/all.js", Path.Combine(path, "scripts", "all.js"), mode, culture, appVersion).ConfigureAwait(false); await DumpFile("css/all.css", Path.Combine(path, "css", "all.css"), mode, culture, appVersion).ConfigureAwait(false); - + return ""; } diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index cc4916bda..62acf69bc 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -538,20 +538,16 @@ namespace MediaBrowser.WebDashboard.Api "mediacontroller.js", "backdrops.js", "sync.js", - "syncjob.js", "appservices.js", "playlistmanager.js", "appsettings.js", "mediaplayer.js", "mediaplayer-video.js", "nowplayingbar.js", - "nowplayingpage.js", - "taskbutton.js", "alphapicker.js", "addpluginpage.js", "dashboardpage.js", "directorybrowser.js", - "editcollectionitems.js", "edititemmetadata.js", "indexpage.js", "itemdetailpage.js", @@ -561,7 +557,6 @@ namespace MediaBrowser.WebDashboard.Api "pluginspage.js", "remotecontrol.js", "search.js", - "syncactivity.js", "thememediaplayer.js", "useredit.js", "userprofilespage.js" diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 55f8e8c34..db25ca63d 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -135,6 +135,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest