FF-1221 - added leading dot to extensions

This commit is contained in:
John Andrews
2024-01-26 08:37:45 +13:00
parent fb412ea65d
commit 3e8ba3d4d9
19 changed files with 101 additions and 36 deletions

View File

@@ -44,7 +44,7 @@ public abstract class ImageBaseNode:Node
protected void UpdateImageInfo(NodeParameters args, Dictionary<string, object> variables = null)
{
string extension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant();
string extension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant().TrimStart('.');
if (extension == "heic")
{
using var image = new MagickImage(args.WorkingFile);
@@ -105,7 +105,7 @@ public abstract class ImageBaseNode:Node
/// <returns>the filename fo the image to use</returns>
protected string ConvertImageIfNeeded(NodeParameters args)
{
string extension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant();
string extension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant().TrimStart('.');
if (extension == "heic")
{
// special case have to use imagemagick

View File

@@ -22,7 +22,7 @@ public class ImageFormat: ImageNode
return 2;
}
string extension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant();
string extension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant().TrimStart('.');
if (extension == "heic")
{
// special case have to use imagemagick

View File

@@ -99,7 +99,7 @@ public abstract class ImageNode : ImageBaseNode
{
string local = args.FileService.FileIsLocal(file)
? file
: FileHelper.Combine(args.TempPath, Guid.NewGuid() + "." + FileHelper.GetExtension(file));
: FileHelper.Combine(args.TempPath, Guid.NewGuid() + FileHelper.GetExtension(file));
using var outStream = new System.IO.FileStream(local, System.IO.FileMode.Create);
img.Save(outStream, format);
@@ -121,12 +121,12 @@ public abstract class ImageNode : ImageBaseNode
{
string local = args.FileService.FileIsLocal(file)
? file
: FileHelper.Combine(args.TempPath, Guid.NewGuid() + "." + FileHelper.GetExtension(file));
: FileHelper.Combine(args.TempPath, Guid.NewGuid() + FileHelper.GetExtension(file));
using var outStream = new System.IO.FileStream(local, System.IO.FileMode.Create);
string origExtension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant();
string newExtension = FileHelper.GetExtension(file).ToLowerInvariant();
string origExtension = FileHelper.GetExtension(args.WorkingFile).ToLowerInvariant().TrimStart('.');
string newExtension = FileHelper.GetExtension(file).ToLowerInvariant().TrimStart('.');
if (origExtension != newExtension)
{
switch (newExtension)