diff --git a/Watermark.Net/Watermark.Net.csproj b/Watermark.Net/Watermark.Net.csproj
index 8d69d04..0ef1487 100644
--- a/Watermark.Net/Watermark.Net.csproj
+++ b/Watermark.Net/Watermark.Net.csproj
@@ -18,4 +18,8 @@
+
+
+
+
diff --git a/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs b/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs
index 8b139c2..0fd5587 100644
--- a/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs
+++ b/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs
@@ -5,7 +5,6 @@ using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using Watermark.Net.src.WatermarkNet.Enums;
using Watermark.Net.src.WatermarkNet.Models.Definitions;
-using Watermark.Net.src.WatermarkNet.Types;
using static System.Net.Mime.MediaTypeNames;
using static System.Runtime.InteropServices.JavaScript.JSType;
using Image = SixLabors.ImageSharp.Image;
@@ -36,17 +35,17 @@ namespace Watermark.Net.src.WatermarkNet.Core
/// Source directory containing images to process.
/// Watermark configuration.
/// List of processed images with watermark information.
- public List ProcessDirectory(string directory, T watermark)
+ public List ProcessDirectory(string directory, T watermark)
where T : IWatermarkDefinition
{
- List processedImages = new List();
+ List processedImages = new List();
foreach (var imageFile in Directory.GetFiles(directory))
{
//Do not process directories and hidden files
if (File.GetAttributes(imageFile).HasFlag(FileAttributes.Directory) || File.GetAttributes(imageFile).HasFlag(FileAttributes.Hidden))
continue;
- WmarkedImage? resultedImage = null;
+ ResultImage? resultedImage = null;
if (typeof(T).IsAssignableTo(typeof(ImageWatermark)))
{
var concreateWatermark = (ImageWatermark)Convert.ChangeType(watermark, typeof(ImageWatermark));
@@ -71,13 +70,13 @@ namespace Watermark.Net.src.WatermarkNet.Core
/// Image watermark configuration.
/// Processed image information or null on failure.
/// Thrown when source image or watermark image is missing.
- public WmarkedImage? ProcessImage(string imagePath, string outputDirectory, ImageWatermark watermark)
+ public ResultImage? ProcessImage(string imagePath, string outputDirectory, ImageWatermark watermark)
{
if (!File.Exists(imagePath)) { throw new FileNotFoundException("Source file not found!", imagePath); }
if (!File.Exists(watermark.ImagePath)) { throw new FileNotFoundException("Watermark file not found!", imagePath); }
if (!Directory.Exists(outputDirectory)) { Directory.CreateDirectory(outputDirectory); }
- WmarkedImage? resultedImage = null;
+ ResultImage? resultedImage = null;
using (var targetImage = Image.Load(imagePath))
using (var watermarkImage = Image.Load(watermark.ImagePath))
{
@@ -87,7 +86,7 @@ namespace Watermark.Net.src.WatermarkNet.Core
using (var markedImage = targetImage.Clone(ctx => this.ApplyScalingWaterMarkImage(ctx, watermark, watermarkImage, targetImage)))
{
- resultedImage = new WmarkedImage(markedImage, outputDirectory + Path.DirectorySeparatorChar + Path.GetFileName(imagePath));
+ resultedImage = new ResultImage(markedImage, outputDirectory + Path.DirectorySeparatorChar + Path.GetFileName(imagePath));
markedImage.Save(resultedImage.Path);
}
}
@@ -102,17 +101,17 @@ namespace Watermark.Net.src.WatermarkNet.Core
/// Text watermark configuration.
/// Processed image information or null on failure.
/// Thrown when source image is missing.
- public WmarkedImage? ProcessImage(string imagePath, string outputDirectory, TextWatermark watermark)
+ public ResultImage? ProcessImage(string imagePath, string outputDirectory, TextWatermark watermark)
{
if(!File.Exists(imagePath)) { throw new FileNotFoundException("Source file not found!", imagePath); }
if (!Directory.Exists(outputDirectory)) { Directory.CreateDirectory(outputDirectory); }
- WmarkedImage? resultedImage = null;
+ ResultImage? resultedImage = null;
using (var targetImage = Image.Load(imagePath))
{
using (var markedImage = targetImage.Clone(ctx => this.ApplyScalingWaterMarkText(ctx, watermark)))
{
- resultedImage = new WmarkedImage(markedImage, outputDirectory + Path.DirectorySeparatorChar + Path.GetFileName(imagePath));
+ resultedImage = new ResultImage(markedImage, outputDirectory + Path.DirectorySeparatorChar + Path.GetFileName(imagePath));
markedImage.Save(resultedImage.Path);
}
}
diff --git a/Watermark.Net/src/WatermarkNet.Models/Definitions/ResultImage.cs b/Watermark.Net/src/WatermarkNet.Models/Definitions/ResultImage.cs
new file mode 100644
index 0000000..b08a2a3
--- /dev/null
+++ b/Watermark.Net/src/WatermarkNet.Models/Definitions/ResultImage.cs
@@ -0,0 +1,20 @@
+using SixLabors.ImageSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Watermark.Net.src.WatermarkNet.Models.Definitions
+{
+ public class ResultImage
+ {
+ public string Path { get; }
+ public Image Image { get; }
+ public ResultImage(Image image, string path)
+ {
+ this.Image = image;
+ this.Path = path;
+ }
+ }
+}
diff --git a/Watermark.Net/src/WatermarkNet.Models/Definitions/SourceImage.cs b/Watermark.Net/src/WatermarkNet.Models/Definitions/SourceImage.cs
new file mode 100644
index 0000000..3b883ff
--- /dev/null
+++ b/Watermark.Net/src/WatermarkNet.Models/Definitions/SourceImage.cs
@@ -0,0 +1,15 @@
+using SixLabors.ImageSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Watermark.Net.src.WatermarkNet.Models.Definitions
+{
+ public class SourceImage
+ {
+ public Image Image { get; set; }
+ public String Path { get; set; }
+ }
+}
diff --git a/Watermark.Net/src/WatermarkNet.Types/SourceImage.cs b/Watermark.Net/src/WatermarkNet.Types/SourceImage.cs
deleted file mode 100644
index cb06844..0000000
--- a/Watermark.Net/src/WatermarkNet.Types/SourceImage.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using SixLabors.ImageSharp;
-
-namespace Watermark.Net.src.WatermarkNet.Types
-{
- internal class SourceImage
- {
- private string _path;
- private Image _image;
-
- public Image Image => _image;
- public String Path => _path;
- }
-}
diff --git a/Watermark.Net/src/WatermarkNet.Types/WmarkedImage.cs b/Watermark.Net/src/WatermarkNet.Types/WmarkedImage.cs
deleted file mode 100644
index cfc14c6..0000000
--- a/Watermark.Net/src/WatermarkNet.Types/WmarkedImage.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using SixLabors.ImageSharp;
-
-namespace Watermark.Net.src.WatermarkNet.Types
-{
- public class WmarkedImage
- {
- public string Path { get; }
- public Image Image { get; }
- public WmarkedImage(Image image, string path)
- {
- this.Image = image;
- this.Path= path;
- }
- }
-}