michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated image magick sharp

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-04 21:49:08 -05:00
parent a23c23f27b
commit 52a2ff5a2e
10 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -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;
}
}

5
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -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;

1
MediaBrowser.Controller/Entities/LinkedChild.cs
View File

@ -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; }

17
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
View File

@ -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;

5
MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
View File

@ -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>");

2
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -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>

2
MediaBrowser.Server.Implementations/packages.config
View File

@ -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" />

2
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -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>

2
MediaBrowser.ServerApplication/packages.config
View File

@ -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>

19
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@ -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();