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

add content type error handling

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-24 02:41:53 -05:00
parent e265d8efec
commit b23bdfe9f2
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -5267,11 +5267,19 @@ namespace Emby.Server.Implementations.Data
{
foreach (var pair in values)
{
var itemValue = pair.Item2;
// Don't save if invalid
if (string.IsNullOrWhiteSpace(itemValue))
{
continue;
}
statement.Reset();
statement.TryBind("@ItemId", itemId.ToGuidParamValue());
statement.TryBind("@Type", pair.Item1);
statement.TryBind("@Value", pair.Item2);
statement.TryBind("@Value", itemValue);
if (pair.Item2 == null)
{

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

@ -3084,7 +3084,11 @@ namespace Emby.Server.Implementations.Library
foreach (var contentType in ConfigurationManager.Configuration.ContentTypes)
{
if (string.Equals(path, contentType.Name, StringComparison.OrdinalIgnoreCase)
if (string.IsNullOrWhiteSpace(contentType.Name))
{
removeList.Add(contentType);
}
else if (string.Equals(path, contentType.Name, StringComparison.OrdinalIgnoreCase)
|| _fileSystem.ContainsSubPath(path, contentType.Name))
{
removeList.Add(contentType);

1
MediaBrowser.Api/ItemUpdateService.cs
View File

@ -99,6 +99,7 @@ namespace MediaBrowser.Api
var path = item.ContainingFolderPath;
var types = _config.Configuration.ContentTypes
.Where(i => !string.IsNullOrWhiteSpace(i.Name))
.Where(i => !string.Equals(i.Name, path, StringComparison.OrdinalIgnoreCase))
.ToList();