mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-06 05:43:03 +02:00
updated image magick sharp
This commit is contained in:
parent
a23c23f27b
commit
52a2ff5a2e
|
@ -1245,13 +1245,6 @@ namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
if (string.Equals(i.GetType().Name, info.ItemType, StringComparison.OrdinalIgnoreCase))
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1135,10 +1135,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
foreach (var child in LinkedChildren)
|
foreach (var child in LinkedChildren)
|
||||||
{
|
{
|
||||||
// Reset the cached value
|
// Reset the cached value
|
||||||
if (child.ItemId.HasValue && child.ItemId.Value == Guid.Empty)
|
child.ItemId = null;
|
||||||
{
|
|
||||||
child.ItemId = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -11,7 +11,6 @@ namespace MediaBrowser.Controller.Entities
|
||||||
|
|
||||||
public string ItemName { get; set; }
|
public string ItemName { get; set; }
|
||||||
public string ItemType { get; set; }
|
public string ItemType { get; set; }
|
||||||
public int? ItemYear { get; set; }
|
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
|
|
|
@ -1407,23 +1407,6 @@ namespace MediaBrowser.Controller.Providers
|
||||||
break;
|
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:
|
default:
|
||||||
reader.Skip();
|
reader.Skip();
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -751,11 +751,6 @@ namespace MediaBrowser.LocalMetadata.Savers
|
||||||
builder.Append("<Type>" + SecurityElement.Escape(link.ItemType) + "</Type>");
|
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))
|
if (!string.IsNullOrWhiteSpace(link.Path))
|
||||||
{
|
{
|
||||||
builder.Append("<Path>" + SecurityElement.Escape((link.Path)) + "</Path>");
|
builder.Append("<Path>" + SecurityElement.Escape((link.Path)) + "</Path>");
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<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>
|
||||||
<Reference Include="MediaBrowser.Naming, Version=1.0.5509.27636, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="MediaBrowser.Naming, Version=1.0.5509.27636, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<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="MediaBrowser.Naming" version="1.0.0.32" targetFramework="net45" />
|
||||||
<package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
|
<package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
|
||||||
<package id="morelinq" version="1.1.0" targetFramework="net45" />
|
<package id="morelinq" version="1.1.0" targetFramework="net45" />
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<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>
|
||||||
<Reference Include="MediaBrowser.IsoMounter">
|
<Reference Include="MediaBrowser.IsoMounter">
|
||||||
<HintPath>..\packages\MediaBrowser.IsoMounting.3.0.69\lib\net45\MediaBrowser.IsoMounter.dll</HintPath>
|
<HintPath>..\packages\MediaBrowser.IsoMounting.3.0.69\lib\net45\MediaBrowser.IsoMounter.dll</HintPath>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<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="MediaBrowser.IsoMounting" version="3.0.69" targetFramework="net45" />
|
||||||
<package id="System.Data.SQLite.Core" version="1.0.94.0" targetFramework="net45" />
|
<package id="System.Data.SQLite.Core" version="1.0.94.0" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
|
@ -836,19 +836,26 @@ namespace MediaBrowser.XbmcMetadata.Savers
|
||||||
private static void AddCollectionItems(Folder item, XmlWriter writer)
|
private static void AddCollectionItems(Folder item, XmlWriter writer)
|
||||||
{
|
{
|
||||||
var items = item.LinkedChildren
|
var items = item.LinkedChildren
|
||||||
.Where(i => i.Type == LinkedChildType.Manual && !string.IsNullOrWhiteSpace(i.ItemName))
|
.Where(i => i.Type == LinkedChildType.Manual)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
foreach (var link in items)
|
foreach (var link in items)
|
||||||
{
|
{
|
||||||
writer.WriteStartElement("collectionitem");
|
writer.WriteStartElement("collectionitem");
|
||||||
|
|
||||||
writer.WriteElementString("name", link.ItemName);
|
if (!string.IsNullOrWhiteSpace(link.ItemName))
|
||||||
writer.WriteElementString("type", link.ItemType);
|
|
||||||
|
|
||||||
if (link.ItemYear.HasValue)
|
|
||||||
{
|
{
|
||||||
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();
|
writer.WriteEndElement();
|
||||||
|
|
Loading…
Reference in a new issue