dnutiu/ImgMetadataRemover
dnutiu/ImgMetadataRemover
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify project structure & delete WPF application.

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2022-02-11 23:39:34 +02:00
parent 89fc37deba
commit bb7d563a08
27 changed files with 62 additions and 487 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ConsoleInterface/ConsoleInterface.csproj
View file

@ -6,6 +6,7 @@
<SelfContained>true</SelfContained> <SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>
<OutputType>exe</OutputType>
<TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks> <TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
</PropertyGroup> </PropertyGroup>

28
ConsoleInterface/Program.cs
View file

@ -1,8 +1,5 @@
using System.Collections.Generic; using CommandLine;
using System.IO;
using CommandLine;
using Image.Files; using Image.Files;
using Image.Output;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
@ -12,16 +9,17 @@ using Microsoft.Extensions.Logging.Abstractions;
namespace ConsoleInterface namespace ConsoleInterface
{ {
internal static class Program public static class Program
{ {
private static readonly ILogger Logger = NullLogger.Instance; private static ILoggerFactory _loggerFactory;
public static readonly ILogger Logger = NullLogger.Instance;
/// <summary> /// <summary>
/// The console interface for the project and the main entrypoint. /// The console interface for the project and the main entrypoint.
/// </summary> /// </summary>
/// <param name="args">Command line provided args.</param> /// <param name="args">Command line provided args.</param>
// ReSharper disable once UnusedMember.Local // ReSharper disable once UnusedMember.Local
private static void Main(IEnumerable<string> args) public static void Main(string[] args)
{ {
Parser.Default.ParseArguments<Options>(args).WithParsed(RunOptions); Parser.Default.ParseArguments<Options>(args).WithParsed(RunOptions);
} }
@ -31,11 +29,11 @@ namespace ConsoleInterface
/// </summary> /// </summary>
private static void RunOptions(Options options) private static void RunOptions(Options options)
{ {
var loggerFactory = LoggerFactory.Create(b => b.AddConsole()); _loggerFactory = LoggerFactory.Create(b => b.AddConsole());
TaskExecutor.Logger = loggerFactory.CreateLogger(nameof(TaskExecutor)); TaskExecutor.Logger = _loggerFactory.CreateLogger(nameof(TaskExecutor));
LocalSystemFilesRetriever.Logger = loggerFactory.CreateLogger(nameof(LocalSystemFilesRetriever)); LocalSystemFilesRetriever.Logger = _loggerFactory.CreateLogger(nameof(LocalSystemFilesRetriever));
KeepFilenameFormatter.Logger = KeepFilenameFormatter.Logger =
loggerFactory.CreateLogger(nameof(KeepFilenameFormatter)); _loggerFactory.CreateLogger(nameof(KeepFilenameFormatter));
CreateDestinationDirectory(options.DestinationDirectory); CreateDestinationDirectory(options.DestinationDirectory);
var outputFormatter = KeepFilenameFormatter.Create(options.DestinationDirectory); var outputFormatter = KeepFilenameFormatter.Create(options.DestinationDirectory);
@ -56,9 +54,11 @@ namespace ConsoleInterface
/// <param name="destinationDirectory">The destination directory.</param> /// <param name="destinationDirectory">The destination directory.</param>
private static void CreateDestinationDirectory(string destinationDirectory) private static void CreateDestinationDirectory(string destinationDirectory)
{ {
if (Directory.Exists(destinationDirectory)) return; if (FileSystemHelpers.Logger == null)
Logger.LogWarning("Output directory does not exist. Creating."); {
Directory.CreateDirectory(destinationDirectory); FileSystemHelpers.Logger = _loggerFactory.CreateLogger(nameof(FileSystemHelpers));
}
FileSystemHelpers.CreateDestinationDirectory(destinationDirectory);
} }
/// <summary> /// <summary>

3
ConsoleInterface/TaskExecutor.cs
View file

@ -2,8 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Image.Compressor; using Image.Core;
using Image.Remover;
using ImageMagick; using ImageMagick;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;

2
ConsoleInterface/TaskExecutorOptions.cs
View file

@ -1,5 +1,5 @@
using System; using System;
using Image.Output; using Image.Files;
namespace ConsoleInterface namespace ConsoleInterface
{ {

6
DesktopApplication/App.config
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>

9
DesktopApplication/App.xaml
View file

@ -1,9 +0,0 @@
<Application x:Class="DesktopApplication.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:DesktopApplication"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>

9
DesktopApplication/App.xaml.cs
View file

@ -1,9 +0,0 @@
namespace DesktopApplication
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App
{
}
}

90
DesktopApplication/DesktopApplication.csproj
View file

@ -1,90 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{47866D0C-006D-4545-99F2-487614147EA0}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>DesktopApplication</RootNamespace>
<AssemblyName>DesktopApplication</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ImageCore\ImageCore.csproj">
<Project>{10ad7910-c8aa-43ed-9231-ebe267ac270f}</Project>
<Name>ImageCore</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

21
DesktopApplication/MainWindow.xaml
View file

@ -1,21 +0,0 @@
<Window x:Class="DesktopApplication.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:DesktopApplication"
mc:Ignorable="d"
Title="MainWindow" MinHeight="350" MinWidth="525" Height="350" Width="525">
<Grid>
<StackPanel>
<DockPanel HorizontalAlignment="Left">
<Button Name="PickFilesBtn" Click="PickFilesBtn_OnClick" Height="25">Pick Source Folder</Button>
<Separator Visibility="Hidden" Width="15" />
<Button Name="CleanFilesBtn" Click="CleanFilesBtn_OnClick" Height="25">Clean Files</Button>
</DockPanel>
<ListBox Name="PickedFilesView" Height="350" ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ItemsSource="{Binding Source={x:Static local:MainWindow.files}}" />
</StackPanel>
</Grid>
</Window>

57
DesktopApplication/MainWindow.xaml.cs
View file

@ -1,57 +0,0 @@
using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
namespace DesktopApplication
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow
{
public static readonly List<string> files = new List<string>();
public MainWindow()
{
InitializeComponent();
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("adsd");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
files.Add("aaaaaxxx");
PickedFilesView.ItemsSource = files;
}
private void PickFilesBtn_OnClick(object sender, RoutedEventArgs e)
{
Console.WriteLine("PickFilesBtn_OnClick - On Click");
}
private void CleanFilesBtn_OnClick(object sender, RoutedEventArgs e)
{
Console.WriteLine("CleanFilesBtn_OnClick - On Click");
}
}
}

55
DesktopApplication/Properties/AssemblyInfo.cs
View file

@ -1,55 +0,0 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DesktopApplication")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DesktopApplication")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

69
DesktopApplication/Properties/Resources.Designer.cs generated
View file

@ -1,69 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DesktopApplication.Properties
{
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder",
"4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance",
"CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState
.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp =
new global::System.Resources.ResourceManager("DesktopApplication.Properties.Resources",
typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState
.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get { return resourceCulture; }
set { resourceCulture = value; }
}
}
}

117
DesktopApplication/Properties/Resources.resx
View file

@ -1,117 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

2
ImageCore.Tests/TestCompressor.cs
View file

@ -1,6 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using Image.Compressor; using Image.Core;
using Xunit; using Xunit;
namespace ImageCore.Tests namespace ImageCore.Tests

2
ImageCore.Tests/TestKeepFilenameFormatter.cs
View file

@ -1,5 +1,5 @@
using System; using System;
using Image.Output; using Image.Files;
using Xunit; using Xunit;
namespace ImageCore.Tests namespace ImageCore.Tests

3
ImageCore.Tests/TestMetadataRemover.cs
View file

@ -1,5 +1,4 @@
using Image.Compressor; using Image.Core;
using Image.Remover;
using ImageMagick; using ImageMagick;
using Moq; using Moq;
using Xunit; using Xunit;

5
ImageCore/Remover/ExifMetadataRemoverAndCompressor.cs → ImageCore/Core/ExifMetadataRemoverAndCompressor.cs
View file

@ -1,7 +1,6 @@
using Image.Compressor; using ImageMagick;
using ImageMagick;
namespace Image.Remover namespace Image.Core
{ {
/// <summary> /// <summary>
/// MetadataRemover removes metadata from an image. The exif profile. /// MetadataRemover removes metadata from an image. The exif profile.

2
ImageCore/Compressor/ICompressor.cs → ImageCore/Core/ICompressor.cs
View file

@ -1,4 +1,4 @@
namespace Image.Compressor namespace Image.Core
{ {
/// <summary> /// <summary>
/// ICompressor is an interface for implementing image compressors. /// ICompressor is an interface for implementing image compressors.

2
ImageCore/Remover/IMetadataRemover.cs → ImageCore/Core/IMetadataRemover.cs
View file

@ -1,4 +1,4 @@
namespace Image.Remover namespace Image.Core
{ {
/// <summary> /// <summary>
/// Interface for implementing metadata removers. /// Interface for implementing metadata removers.

2
ImageCore/Compressor/LosslessCompressor.cs → ImageCore/Core/LosslessCompressor.cs
View file

@ -1,6 +1,6 @@
using ImageMagick; using ImageMagick;
namespace Image.Compressor namespace Image.Core
{ {
/// <summary> /// <summary>
/// LosslessCompressor compresses an image using lossless compression provided by ImageMagick. /// LosslessCompressor compresses an image using lossless compression provided by ImageMagick.

2
ImageCore/Compressor/NullCompressor.cs → ImageCore/Core/NullCompressor.cs
View file

@ -1,4 +1,4 @@
namespace Image.Compressor namespace Image.Core
{ {
/// <summary> /// <summary>
/// Does nothing. Using this Compressor will have no effect. /// Does nothing. Using this Compressor will have no effect.

31
ImageCore/Files/FileSystemHelpers.cs Normal file
View file

@ -0,0 +1,31 @@
using System;
using System.IO;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
namespace Image.Files
{
public static class FileSystemHelpers
{
public static ILogger Logger = NullLogger.Instance;
/// <summary>
/// Creates the directory if it doesn't exist.
/// </summary>
/// <param name="destinationDirectory">The destination directory.</param>
public static void CreateDestinationDirectory(string destinationDirectory)
{
#if NETSTANDARD2_1
Console.WriteLine("");
#elif NETSTANDARD2_0
Console.WriteLine("");
#elif NET5_0
if (Directory.Exists(destinationDirectory)) return;
//Logger.LogWarning("Output directory does not exist. Creating.");
Directory.CreateDirectory(destinationDirectory);
#endif
}
}
}

2
ImageCore/Output/IFileOutputFormatter.cs → ImageCore/Files/IFileOutputFormatter.cs
View file

@ -1,4 +1,4 @@
namespace Image.Output namespace Image.Files
{ {
/// <summary> /// <summary>
/// IOutputFormatter is an interface for generating the output path and destination file name. /// IOutputFormatter is an interface for generating the output path and destination file name.

2
ImageCore/Output/KeepFilenameFormatter.cs → ImageCore/Files/KeepFilenameFormatter.cs
View file

@ -3,7 +3,7 @@ using Ardalis.GuardClauses;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
namespace Image.Output namespace Image.Files
{ {
/// <summary> /// <summary>
/// KeepFilenameFormatter keeps the original file name of the image when formatting the new output /// KeepFilenameFormatter keeps the original file name of the image when formatting the new output

22
ImgMetadataRemover.sln
View file

@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleInterface", "Console
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageCore.Tests", "ImageCore.Tests\ImageCore.Tests.csproj", "{8EB81515-E62C-4408-84E0-6C27E0293902}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageCore.Tests", "ImageCore.Tests\ImageCore.Tests.csproj", "{8EB81515-E62C-4408-84E0-6C27E0293902}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopApplication", "DesktopApplication\DesktopApplication.csproj", "{47866D0C-006D-4545-99F2-487614147EA0}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -85,26 +83,6 @@ Global
{8EB81515-E62C-4408-84E0-6C27E0293902}.Release|x64.Build.0 = Release|Any CPU {8EB81515-E62C-4408-84E0-6C27E0293902}.Release|x64.Build.0 = Release|Any CPU
{8EB81515-E62C-4408-84E0-6C27E0293902}.Release|x86.ActiveCfg = Release|Any CPU {8EB81515-E62C-4408-84E0-6C27E0293902}.Release|x86.ActiveCfg = Release|Any CPU
{8EB81515-E62C-4408-84E0-6C27E0293902}.Release|x86.Build.0 = Release|Any CPU {8EB81515-E62C-4408-84E0-6C27E0293902}.Release|x86.Build.0 = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|ARM.ActiveCfg = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|ARM.Build.0 = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|ARM64.Build.0 = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|x64.ActiveCfg = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|x64.Build.0 = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|x86.ActiveCfg = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Debug|x86.Build.0 = Debug|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|Any CPU.Build.0 = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|ARM.ActiveCfg = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|ARM.Build.0 = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|ARM64.ActiveCfg = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|ARM64.Build.0 = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|x64.ActiveCfg = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|x64.Build.0 = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|x86.ActiveCfg = Release|Any CPU
{47866D0C-006D-4545-99F2-487614147EA0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1
ImgMetadataRemover.sln.DotSettings.user
View file

@ -2,6 +2,7 @@
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD; <s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
&lt;Assembly Path="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Mail.dll" /&gt;&#xD; &lt;Assembly Path="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\3.1.0\ref\netcoreapp3.1\System.Net.Mail.dll" /&gt;&#xD;
&lt;Assembly Path="C:\Users\nutiu\.nuget\packages\magick.net.core\8.6.1\lib\netstandard21\Magick.NET.Core.dll" /&gt;&#xD; &lt;Assembly Path="C:\Users\nutiu\.nuget\packages\magick.net.core\8.6.1\lib\netstandard21\Magick.NET.Core.dll" /&gt;&#xD;
&lt;Assembly Path="C:\Users\nutiu\.nuget\packages\microsoft.extensions.logging.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll" /&gt;&#xD;
&lt;/AssemblyExplorer&gt;</s:String> &lt;/AssemblyExplorer&gt;</s:String>
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=761234b5_002D46ba_002D4312_002Dab60_002Dd15d5d83a61a/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="TestGetFilenamesFromPath" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD; <s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=761234b5_002D46ba_002D4312_002Dab60_002Dd15d5d83a61a/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="TestGetFilenamesFromPath" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
&lt;Project Location="C:\Users\nutiu\RiderProjects\ImgMetadataRemover\ImageCore.Tests" Presentation="&amp;lt;ImageCore.Tests&amp;gt;" /&gt;&#xD; &lt;Project Location="C:\Users\nutiu\RiderProjects\ImgMetadataRemover\ImageCore.Tests" Presentation="&amp;lt;ImageCore.Tests&amp;gt;" /&gt;&#xD;

2
global.json
View file

@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "3.1", "version": "5.0",
"rollForward": "latestMajor", "rollForward": "latestMajor",
"allowPrerelease": false "allowPrerelease": false
} }