mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-01-07 23:40:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

FF-1510: Updated Sixlabors versions to match FlowRunner

Browse Source
This commit is contained in:
John Andrews
2024-04-25 17:20:42 +12:00
parent 011ce27f42
commit 293bca2686
12 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ComicNodes/ComicNodes.csproj
View File

@@ -24,9 +24,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Docnet.Core" Version="2.6.0" />
<PackageReference Include="SharpCompress" Version="0.36.0" />
<PackageReference Include="SharpCompress" Version="0.37.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="FileFlows.Plugin">

4
ComicNodes/Helpers/PdfHelper.cs
View File

@@ -47,7 +47,9 @@ internal class PdfHelper
args?.Logger?.ILog("File Extension of image: " + fileExtension);
}
var file = Path.Combine(destinationDirectory, filePrefix + "-" + i.ToString(new string('0', pageCount.ToString().Length))) + "." + fileExtension;
var file = Path.Combine(destinationDirectory,
filePrefix + "-" + i.ToString(new string('0', pageCount.ToString().Length)))
+ "." + fileExtension;
using (var outputStream = File.Create(file + "." + fileExtension))
{

BIN
FileFlows.Plugin.dll
View File

Binary file not shown.

BIN
FileFlows.Plugin.pdb
View File

Binary file not shown.

2
ImageNodes/ImageNodes.csproj
View File

@@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.6.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
</ItemGroup>
<ItemGroup>
<None Update="i18n\*.json">

7
ImageNodes/Images/AutoCropImage.cs
View File

@@ -42,7 +42,8 @@ public class AutoCropImage : ImageNode
private int ExecuteImageSharp(NodeParameters args)
{
using var image = Image.Load(args.WorkingFile, out IImageFormat format);
var format = Image.DetectFormat(args.WorkingFile);
using var image = Image.Load(args.WorkingFile);
int originalWidth = image.Width;
int originalHeight= image.Height;
float threshold = Threshold / 100f;
@@ -74,8 +75,8 @@ public class AutoCropImage : ImageNode
if (bounds.Width == originalWidth && bounds.Height == originalHeight)
return 2;
using var image2 = Image.Load(args.WorkingFile, out format);
format = Image.DetectFormat(args.WorkingFile);
using var image2 = Image.Load(args.WorkingFile);
image2.Mutate(c =>
{

16
ImageNodes/Images/ImageBaseNode.cs
View File

@@ -51,7 +51,9 @@ public abstract class ImageBaseNode:Node
}
else
{
using var image = Image.Load(localFile, out IImageFormat format);
var format = Image.DetectFormat(localFile);
using var image = Image.Load(localFile);
CurrentHeight = image.Height;
CurrentWidth = image.Width;
CurrentFormat = format.Name;
@@ -80,27 +82,27 @@ public abstract class ImageBaseNode:Node
}
else
{
using var image = Image.Load(args.WorkingFile, out IImageFormat format);
var format = Image.DetectFormat(args.WorkingFile);
using var image = Image.Load(args.WorkingFile);
DateTime? dateTaken = null;
if (image.Metadata.ExifProfile != null)
{
args.Logger?.ILog("EXIF Profile found");
var dateTimeOriginalString = image.Metadata.ExifProfile.GetValue(SixLabors.ImageSharp.Metadata.Profiles.Exif.ExifTag.DateTimeOriginal)?.Value;
if (string.IsNullOrWhiteSpace(dateTimeOriginalString))
if(image.Metadata.ExifProfile.TryGetValue(SixLabors.ImageSharp.Metadata.Profiles.Exif.ExifTag.DateTimeOriginal, out var dateTimeOriginalString) == false
|| string.IsNullOrWhiteSpace(dateTimeOriginalString?.Value))
{
args.Logger?.ILog("No DateTimeOriginal found");
}
else
{
if (string.IsNullOrWhiteSpace(dateTimeOriginalString) == false &&
TryParseDateTime(dateTimeOriginalString, out DateTime? dateTimeOriginal))
if (TryParseDateTime(dateTimeOriginalString.Value, out DateTime? dateTimeOriginal))
{
dateTaken = dateTimeOriginal;
args.Logger?.ILog("DateTimeOriginal: " + dateTimeOriginal);
}
else
{
args.Logger?.ILog("Invalid date format for DateTimeOriginal: " + dateTimeOriginalString);
args.Logger?.ILog("Invalid date format for DateTimeOriginal: " + dateTimeOriginalString.Value);
}
}
}

3
ImageNodes/Images/ImageFlip.cs
View File

@@ -18,7 +18,8 @@ public class ImageFlip: ImageNode
public override int Execute(NodeParameters args)
{
var input = ConvertImageIfNeeded(args);
using var image = Image.Load(input, out IImageFormat format);
var format = Image.DetectFormat(input);
using var image = Image.Load(input);
image.Mutate(c => c.Flip(Vertical ? FlipMode.Vertical : FlipMode.Horizontal));
var formatOpts = GetFormat(args);
SaveImage(args, image, formatOpts.file, formatOpts.format ?? format);

3
ImageNodes/Images/ImageFormat.cs
View File

@@ -33,7 +33,8 @@ public class ImageFormat: ImageNode
}
else
{
using var image = Image.Load(args.WorkingFile, out IImageFormat format);
var format = Image.DetectFormat(args.WorkingFile);
using var image = Image.Load(args.WorkingFile);
SaveImage(args, image, formatOpts.file, formatOpts.format ?? format);
return 1;
}

3
ImageNodes/Images/ImageNode.cs
View File

@@ -165,7 +165,8 @@ public abstract class ImageNode : ImageBaseNode
if (updateWorkingFile)
{
args.SetWorkingFile(file);
using var image = Image.Load(local, out IImageFormat format);
var format = Image.DetectFormat(local);
using var image = Image.Load(local);
UpdateImageInfo(args, img.Width, img.Height, format.Name, Variables);
}

3
ImageNodes/Images/ImageResizer.cs
View File

@@ -58,7 +58,8 @@ public class ImageResizer: ImageNode
public override int Execute(NodeParameters args)
{
string inputFile = ConvertImageIfNeeded(args);
using var image = Image.Load(inputFile, out IImageFormat format);
var format = Image.DetectFormat(inputFile);
using var image = Image.Load(inputFile);
SixLabors.ImageSharp.Processing.ResizeMode rzMode;
switch (Mode)
{

3
ImageNodes/Images/ImageRotate.cs
View File

@@ -36,7 +36,8 @@ public class ImageRotate: ImageNode
public override int Execute(NodeParameters args)
{
string inputFile = ConvertImageIfNeeded(args);
using var image = Image.Load(inputFile, out IImageFormat format);
var format = Image.DetectFormat(inputFile);
using var image = Image.Load(inputFile);
image.Mutate(c => c.Rotate(Angle));
var formatOpts = GetFormat(args);
SaveImage(args, image, formatOpts.file, formatOpts.format ?? format);