lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use alameda

Browse Source
This commit is contained in:
Luke Pulverenti 2017-04-13 14:57:24 -04:00
parent 46626dda12
commit dd715fbcc7
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -41,6 +41,7 @@ using SortOrder = MediaBrowser.Model.Entities.SortOrder;
using VideoResolver = MediaBrowser.Naming.Video.VideoResolver; using VideoResolver = MediaBrowser.Naming.Video.VideoResolver;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.IO; using MediaBrowser.Common.IO;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.Tasks; using MediaBrowser.Model.Tasks;
namespace Emby.Server.Implementations.Library namespace Emby.Server.Implementations.Library
@ -375,11 +376,22 @@ namespace Emby.Server.Implementations.Library
throw new ArgumentNullException("item"); throw new ArgumentNullException("item");
} }
_logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", if (item is LiveTvProgram)
item.GetType().Name, {
item.Name ?? "Unknown name", _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}",
item.Path ?? string.Empty, item.GetType().Name,
item.Id); 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; var parent = item.Parent;

4
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -280,9 +280,7 @@ namespace MediaBrowser.WebDashboard.Api
var files = new List<string>(); var files = new List<string>();
files.Add("bower_components/requirejs/require.js" + versionString); files.Add("scripts/apploader.js" + versionString);
files.Add("scripts/site.js" + versionString);
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
{ {