diff options
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 22 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 4 |
2 files changed, 18 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index dbb0160a5..fc2299907 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -41,6 +41,7 @@ using SortOrder = MediaBrowser.Model.Entities.SortOrder; using VideoResolver = MediaBrowser.Naming.Video.VideoResolver; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.IO; +using MediaBrowser.Controller.LiveTv; using MediaBrowser.Model.Tasks; namespace Emby.Server.Implementations.Library @@ -375,11 +376,22 @@ namespace Emby.Server.Implementations.Library throw new ArgumentNullException("item"); } - _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", - item.GetType().Name, - item.Name ?? "Unknown name", - item.Path ?? string.Empty, - item.Id); + if (item is LiveTvProgram) + { + _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", + item.GetType().Name, + item.Name ?? "Unknown name", + item.Path ?? string.Empty, + item.Id); + } + else + { + _logger.Info("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", + item.GetType().Name, + item.Name ?? "Unknown name", + item.Path ?? string.Empty, + item.Id); + } var parent = item.Parent; diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index f124b6e4b..8880441e2 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -280,9 +280,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new List<string>(); - files.Add("bower_components/requirejs/require.js" + versionString); - - files.Add("scripts/site.js" + versionString); + files.Add("scripts/apploader.js" + versionString); if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) { |