updated image magick sharp

10 files changed, 17 insertions, 43 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 50a6dda30..7a13bfc1c 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 0d9bb03ac..cffc0989a 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 78e8e4959..949c9741b 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 a22e492f4..ddd650e3e 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 194b3cd23..981833803 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -751,11 +751,6 @@ namespace MediaBrowser.LocalMetadata.Savers
                     builder.Append("<Type>" + SecurityElement.Escape(link.ItemType) + "</Type>");
                 }
 
-                if (link.ItemYear.HasValue)
-                {
-                    builder.Append("<Year>" + SecurityElement.Escape(link.ItemYear.Value.ToString(UsCulture)) + "</Year>");
-                }
-
                 if (!string.IsNullOrWhiteSpace(link.Path))
                 {
                     builder.Append("<Path>" + SecurityElement.Escape((link.Path)) + "</Path>");
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 359e7a2aa..5aedc493f 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -47,7 +47,7 @@
   <ItemGroup>
     <Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageMagickSharp.1.0.0.7\lib\net45\ImageMagickSharp.dll</HintPath>
+      <HintPath>..\packages\ImageMagickSharp.1.0.0.8\lib\net45\ImageMagickSharp.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Naming, Version=1.0.5509.27636, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 41c2bbb82..37cc7b65e 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="ImageMagickSharp" version="1.0.0.7" targetFramework="net45" />

+  <package id="ImageMagickSharp" version="1.0.0.8" targetFramework="net45" />

   <package id="MediaBrowser.Naming" version="1.0.0.32" targetFramework="net45" />

   <package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />

   <package id="morelinq" version="1.1.0" targetFramework="net45" />

diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 67593eaaf..5951262bf 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -62,7 +62,7 @@
   <ItemGroup>
     <Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageMagickSharp.1.0.0.7\lib\net45\ImageMagickSharp.dll</HintPath>
+      <HintPath>..\packages\ImageMagickSharp.1.0.0.8\lib\net45\ImageMagickSharp.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.IsoMounter">
       <HintPath>..\packages\MediaBrowser.IsoMounting.3.0.69\lib\net45\MediaBrowser.IsoMounter.dll</HintPath>
diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config
index 2459bdd44..fe519da3d 100644
--- a/MediaBrowser.ServerApplication/packages.config
+++ b/MediaBrowser.ServerApplication/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ImageMagickSharp" version="1.0.0.7" targetFramework="net45" />
+  <package id="ImageMagickSharp" version="1.0.0.8" targetFramework="net45" />
   <package id="MediaBrowser.IsoMounting" version="3.0.69" targetFramework="net45" />
   <package id="System.Data.SQLite.Core" version="1.0.94.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 7aa33b053..13108a486 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 (!string.IsNullOrWhiteSpace(link.ItemName))
+                {
+                    writer.WriteElementString("name", link.ItemName);
+                }
+
+                if (!string.IsNullOrWhiteSpace(link.ItemType))
+                {
+                    writer.WriteElementString("type", link.ItemType);
+                }
 
-                if (link.ItemYear.HasValue)
+                if (!string.IsNullOrWhiteSpace(link.Path))
                 {
-                    writer.WriteElementString("year", link.ItemYear.Value.ToString(UsCulture));
+                    writer.WriteElementString("path", link.Path);
                 }
 
                 writer.WriteEndElement();