From 52a2ff5a2ee8cac36182bb56913e18d0e0f6f745 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 4 Mar 2015 21:49:08 -0500 Subject: [PATCH] updated image magick sharp --- MediaBrowser.Controller/Entities/BaseItem.cs | 7 ------- MediaBrowser.Controller/Entities/Folder.cs | 5 +---- .../Entities/LinkedChild.cs | 1 - .../Providers/BaseItemXmlParser.cs | 17 ----------------- .../Savers/XmlSaverHelpers.cs | 5 ----- ...MediaBrowser.Server.Implementations.csproj | 2 +- .../packages.config | 2 +- .../MediaBrowser.ServerApplication.csproj | 2 +- .../packages.config | 2 +- .../Savers/BaseNfoSaver.cs | 19 +++++++++++++------ 10 files changed, 18 insertions(+), 44 deletions(-) diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 50a6dda305..7a13bfc1c0 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1245,13 +1245,6 @@ namespace MediaBrowser.Controller.Entities { if (string.Equals(i.GetType().Name, info.ItemType, StringComparison.OrdinalIgnoreCase)) { - if (info.ItemYear.HasValue) - { - if (info.ItemYear.Value != (i.ProductionYear ?? -1)) - { - return false; - } - } return true; } } diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 0d9bb03acf..cffc0989a5 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1135,10 +1135,7 @@ namespace MediaBrowser.Controller.Entities foreach (var child in LinkedChildren) { // Reset the cached value - if (child.ItemId.HasValue && child.ItemId.Value == Guid.Empty) - { - child.ItemId = null; - } + child.ItemId = null; } return false; diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs index 78e8e49594..949c9741b1 100644 --- a/MediaBrowser.Controller/Entities/LinkedChild.cs +++ b/MediaBrowser.Controller/Entities/LinkedChild.cs @@ -11,7 +11,6 @@ namespace MediaBrowser.Controller.Entities public string ItemName { get; set; } public string ItemType { get; set; } - public int? ItemYear { get; set; } [IgnoreDataMember] public string Id { get; set; } diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index a22e492f47..ddd650e3e1 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -1407,23 +1407,6 @@ namespace MediaBrowser.Controller.Providers break; } - case "Year": - { - var val = reader.ReadElementContentAsString(); - - if (!string.IsNullOrWhiteSpace(val)) - { - int rval; - - if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval)) - { - linkedItem.ItemYear = rval; - } - } - - break; - } - default: reader.Skip(); break; diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs index 194b3cd23b..9818338030 100644 --- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs +++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs @@ -751,11 +751,6 @@ namespace MediaBrowser.LocalMetadata.Savers builder.Append("" + SecurityElement.Escape(link.ItemType) + ""); } - if (link.ItemYear.HasValue) - { - builder.Append("" + SecurityElement.Escape(link.ItemYear.Value.ToString(UsCulture)) + ""); - } - if (!string.IsNullOrWhiteSpace(link.Path)) { builder.Append("" + SecurityElement.Escape((link.Path)) + ""); diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 359e7a2aaa..5aedc493f1 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -47,7 +47,7 @@ False - ..\packages\ImageMagickSharp.1.0.0.7\lib\net45\ImageMagickSharp.dll + ..\packages\ImageMagickSharp.1.0.0.8\lib\net45\ImageMagickSharp.dll False diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index 41c2bbb822..37cc7b65e5 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -1,6 +1,6 @@  - + diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 67593eaaff..5951262bfa 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -62,7 +62,7 @@ False - ..\packages\ImageMagickSharp.1.0.0.7\lib\net45\ImageMagickSharp.dll + ..\packages\ImageMagickSharp.1.0.0.8\lib\net45\ImageMagickSharp.dll ..\packages\MediaBrowser.IsoMounting.3.0.69\lib\net45\MediaBrowser.IsoMounter.dll diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 2459bdd445..fe519da3dc 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs index 7aa33b053c..13108a486e 100644 --- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs @@ -836,19 +836,26 @@ namespace MediaBrowser.XbmcMetadata.Savers private static void AddCollectionItems(Folder item, XmlWriter writer) { var items = item.LinkedChildren - .Where(i => i.Type == LinkedChildType.Manual && !string.IsNullOrWhiteSpace(i.ItemName)) + .Where(i => i.Type == LinkedChildType.Manual) .ToList(); foreach (var link in items) { writer.WriteStartElement("collectionitem"); - writer.WriteElementString("name", link.ItemName); - writer.WriteElementString("type", link.ItemType); - - if (link.ItemYear.HasValue) + if (!string.IsNullOrWhiteSpace(link.ItemName)) { - writer.WriteElementString("year", link.ItemYear.Value.ToString(UsCulture)); + writer.WriteElementString("name", link.ItemName); + } + + if (!string.IsNullOrWhiteSpace(link.ItemType)) + { + writer.WriteElementString("type", link.ItemType); + } + + if (!string.IsNullOrWhiteSpace(link.Path)) + { + writer.WriteElementString("path", link.Path); } writer.WriteEndElement();