From f7ef2ff2f5e0eac72594b703adfa1827b47d419f Mon Sep 17 00:00:00 2001 From: Jin Jae-yeon Date: Mon, 9 Apr 2018 15:09:48 +0900 Subject: [PATCH] Engine codes move to Shared project --- .../Conditions/NoOperationCondition.cs | 14 --- .../Daramkun.DaramRenamer.Engine.csproj | 101 ------------------ .../Properties/AssemblyInfo.cs | 36 ------- Daramkun.DaramRenamer.Engine/packages.config | 6 -- .../Conditions/ExtensionCondition.cs | 0 .../Conditions/IsTextFileCondition.cs | 0 .../Conditions/RegexpCondition.cs | 0 .../Daramkun.DaramRenamer.Shared.projitems | 45 ++++++++ .../Daramkun.DaramRenamer.Shared.shproj | 13 +++ .../FileInfo.cs | 0 .../IProcessor.cs | 0 .../LocalizedAttribute.cs | 0 .../ProcessorExtensions.cs | 45 ++++---- .../Processors/BatchProcessor.cs | 11 +- .../Processors/Date/AddDateProcessor.cs | 0 .../Processors/Date/DeleteDateProcessor.cs | 0 .../AddExtensionAutomatedProcessor.cs | 0 .../Extension/AddExtensionProcessor.cs | 0 .../Extension/CasecastExtensionProcessor.cs | 0 .../Extension/DeleteExtensionProcessor.cs | 0 .../Extension/ReplaceExtensionProcessor.cs | 0 .../FilePath/ChangePathProcessor.cs | 0 .../Processors/Filename/CasecastProcessor.cs | 0 .../Filename/ConcatenateProcessor.cs | 0 .../Filename/DeleteBlockProcessor.cs | 0 .../Filename/DeleteFilenameProcessor.cs | 0 .../Filename/ReplacePlainProcessor.cs | 0 .../Filename/ReplaceRegexpProcessor.cs | 0 .../Processors/Filename/SubstringProcessor.cs | 0 .../Processors/Filename/TrimmingProcessor.cs | 0 .../Processors/ManualEditProcessor.cs | 0 .../Number/AddIndexNumberProcessor.cs | 0 .../Number/DeleteWithoutNumbersProcessor.cs | 0 .../IncreaseDecreaseNumbersProcessor.cs | 0 .../Number/NumberCountMatchProcessor.cs | 0 .../Processors/Tag/AddDocumentTagProcessor.cs | 0 .../Processors/Tag/AddHashProcessor.cs | 0 .../Processors/Tag/AddMediaTagProcessor.cs | 0 Daramkun.DaramRenamer.sln | 14 +-- .../Daramkun.DaramRenamer.csproj | 15 ++- Daramkun.DaramRenamer/SubWindow_Batch.xaml.cs | 2 +- Daramkun.DaramRenamer/packages.config | 2 + 42 files changed, 111 insertions(+), 193 deletions(-) delete mode 100644 Daramkun.DaramRenamer.Engine/Conditions/NoOperationCondition.cs delete mode 100644 Daramkun.DaramRenamer.Engine/Daramkun.DaramRenamer.Engine.csproj delete mode 100644 Daramkun.DaramRenamer.Engine/Properties/AssemblyInfo.cs delete mode 100644 Daramkun.DaramRenamer.Engine/packages.config rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Conditions/ExtensionCondition.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Conditions/IsTextFileCondition.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Conditions/RegexpCondition.cs (100%) create mode 100644 Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.projitems create mode 100644 Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.shproj rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/FileInfo.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/IProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/LocalizedAttribute.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/ProcessorExtensions.cs (77%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/BatchProcessor.cs (81%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Date/AddDateProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Date/DeleteDateProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Extension/AddExtensionAutomatedProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Extension/AddExtensionProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Extension/CasecastExtensionProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Extension/DeleteExtensionProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Extension/ReplaceExtensionProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/FilePath/ChangePathProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/CasecastProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/ConcatenateProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/DeleteBlockProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/DeleteFilenameProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/ReplacePlainProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/ReplaceRegexpProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/SubstringProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Filename/TrimmingProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/ManualEditProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Number/AddIndexNumberProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Number/DeleteWithoutNumbersProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Number/IncreaseDecreaseNumbersProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Number/NumberCountMatchProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Tag/AddDocumentTagProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Tag/AddHashProcessor.cs (100%) rename {Daramkun.DaramRenamer.Engine => Daramkun.DaramRenamer.Shared}/Processors/Tag/AddMediaTagProcessor.cs (100%) diff --git a/Daramkun.DaramRenamer.Engine/Conditions/NoOperationCondition.cs b/Daramkun.DaramRenamer.Engine/Conditions/NoOperationCondition.cs deleted file mode 100644 index 31a0716..0000000 --- a/Daramkun.DaramRenamer.Engine/Conditions/NoOperationCondition.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Daramkun.DaramRenamer.Conditions -{ - public class NoOperationCondition : ICondition - { - public string Name => "nop"; - public bool IsValid ( FileInfo file ) { return true; } - } -} diff --git a/Daramkun.DaramRenamer.Engine/Daramkun.DaramRenamer.Engine.csproj b/Daramkun.DaramRenamer.Engine/Daramkun.DaramRenamer.Engine.csproj deleted file mode 100644 index 8a4dcf4..0000000 --- a/Daramkun.DaramRenamer.Engine/Daramkun.DaramRenamer.Engine.csproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Debug - AnyCPU - {387C59A9-953D-4260-AD9A-105834D6876F} - Library - Properties - Daramkun.DaramRenamer - DaramRenamer.Engine - v4.6 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - - - DaramRenamer.pfx - - - - ..\packages\Daramee.FileTypeDetector.1.0.1\lib\net46\Daramee.FileTypeDetector.dll - - - ..\packages\Jint.2.11.58\lib\net451\Jint.dll - - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2f14f0e2-9bf8-44a5-8cba-f4675734fead} - taglib-sharp - - - - \ No newline at end of file diff --git a/Daramkun.DaramRenamer.Engine/Properties/AssemblyInfo.cs b/Daramkun.DaramRenamer.Engine/Properties/AssemblyInfo.cs deleted file mode 100644 index 87b5180..0000000 --- a/Daramkun.DaramRenamer.Engine/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 -// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 -// 이러한 특성 값을 변경하세요. -[assembly: AssemblyTitle( "Daram Renamer Renaming Engine" )] -[assembly: AssemblyDescription("Daram Renamer's Engine")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany( "DARAM WORLD" )] -[assembly: AssemblyProduct("DaramRenamer.Engine")] -[assembly: AssemblyCopyright( "Copyright © 2013-2018 Daramee" )] -[assembly: AssemblyTrademark( "DaramTools®" )] -[assembly: AssemblyCulture("")] - -// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 -// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면 -// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요. -[assembly: ComVisible(false)] - -// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. -[assembly: Guid("387c59a9-953d-4260-ad9a-105834d6876f")] - -// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. -// -// 주 버전 -// 부 버전 -// 빌드 번호 -// 수정 버전 -// -// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 -// 기본값으로 할 수 있습니다. -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3.0.0")] -[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/Daramkun.DaramRenamer.Engine/packages.config b/Daramkun.DaramRenamer.Engine/packages.config deleted file mode 100644 index a386c50..0000000 --- a/Daramkun.DaramRenamer.Engine/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Daramkun.DaramRenamer.Engine/Conditions/ExtensionCondition.cs b/Daramkun.DaramRenamer.Shared/Conditions/ExtensionCondition.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Conditions/ExtensionCondition.cs rename to Daramkun.DaramRenamer.Shared/Conditions/ExtensionCondition.cs diff --git a/Daramkun.DaramRenamer.Engine/Conditions/IsTextFileCondition.cs b/Daramkun.DaramRenamer.Shared/Conditions/IsTextFileCondition.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Conditions/IsTextFileCondition.cs rename to Daramkun.DaramRenamer.Shared/Conditions/IsTextFileCondition.cs diff --git a/Daramkun.DaramRenamer.Engine/Conditions/RegexpCondition.cs b/Daramkun.DaramRenamer.Shared/Conditions/RegexpCondition.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Conditions/RegexpCondition.cs rename to Daramkun.DaramRenamer.Shared/Conditions/RegexpCondition.cs diff --git a/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.projitems b/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.projitems new file mode 100644 index 0000000..2963cc3 --- /dev/null +++ b/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.projitems @@ -0,0 +1,45 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + bbb4e072-4668-438c-b930-fc6831319ce7 + + + Daramkun.DaramRenamer.Shared + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.shproj b/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.shproj new file mode 100644 index 0000000..fcaaf13 --- /dev/null +++ b/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.shproj @@ -0,0 +1,13 @@ + + + + bbb4e072-4668-438c-b930-fc6831319ce7 + 14.0 + + + + + + + + diff --git a/Daramkun.DaramRenamer.Engine/FileInfo.cs b/Daramkun.DaramRenamer.Shared/FileInfo.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/FileInfo.cs rename to Daramkun.DaramRenamer.Shared/FileInfo.cs diff --git a/Daramkun.DaramRenamer.Engine/IProcessor.cs b/Daramkun.DaramRenamer.Shared/IProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/IProcessor.cs rename to Daramkun.DaramRenamer.Shared/IProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/LocalizedAttribute.cs b/Daramkun.DaramRenamer.Shared/LocalizedAttribute.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/LocalizedAttribute.cs rename to Daramkun.DaramRenamer.Shared/LocalizedAttribute.cs diff --git a/Daramkun.DaramRenamer.Engine/ProcessorExtensions.cs b/Daramkun.DaramRenamer.Shared/ProcessorExtensions.cs similarity index 77% rename from Daramkun.DaramRenamer.Engine/ProcessorExtensions.cs rename to Daramkun.DaramRenamer.Shared/ProcessorExtensions.cs index c9ca2fa..d2708fa 100644 --- a/Daramkun.DaramRenamer.Engine/ProcessorExtensions.cs +++ b/Daramkun.DaramRenamer.Shared/ProcessorExtensions.cs @@ -109,37 +109,40 @@ private static MethodInfo GenerateDynamicMethod ( Type type, string methodName, return method; } - static List delegates; + static List delegates = new List (); public static IReadOnlyList Delegates { get { - if ( delegates == null) + lock ( delegates ) { - delegates = new List (); - - Assembly assembly = Assembly.Load ( "DaramRenamer.Engine" ); - foreach ( Type type in assembly.GetTypes () ) + if ( /*delegates == null*/delegates.Count == 0 ) { - if ( type.GetInterface ( typeof ( IProcessor ).FullName ) != null ) - { - IProcessor processor = Activator.CreateInstance ( type ) as IProcessor; - MethodInfo methodInfo = processor.CreateMethod (); - Type methodType = processor.GetMethodType (); - delegates.Add ( methodInfo.CreateDelegate ( methodType ) ); - } - else if ( type.GetInterface ( typeof ( ICondition ).FullName ) != null ) + //delegates = new List (); + + Assembly assembly = Assembly.Load ( "DaramRenamer.Engine" ); + foreach ( Type type in assembly.GetTypes () ) { - ICondition condition = Activator.CreateInstance ( type ) as ICondition; - MethodInfo methodInfo = condition.CreateMethod (); - Type methodType = condition.GetMethodType (); - delegates.Add ( methodInfo.CreateDelegate ( methodType ) ); + if ( type.GetInterface ( typeof ( IProcessor ).FullName ) != null ) + { + IProcessor processor = Activator.CreateInstance ( type ) as IProcessor; + MethodInfo methodInfo = processor.CreateMethod (); + Type methodType = processor.GetMethodType (); + delegates.Add ( methodInfo.CreateDelegate ( methodType ) ); + } + else if ( type.GetInterface ( typeof ( ICondition ).FullName ) != null ) + { + ICondition condition = Activator.CreateInstance ( type ) as ICondition; + MethodInfo methodInfo = condition.CreateMethod (); + Type methodType = condition.GetMethodType (); + delegates.Add ( methodInfo.CreateDelegate ( methodType ) ); + } } + delegates.Add ( new Func ( get_renamer_version ) ); + delegates.Add ( new Func ( get_file_content ) ); } - delegates.Add ( new Func ( get_renamer_version ) ); - delegates.Add ( new Func ( get_file_content ) ); + return delegates; } - return delegates; } } diff --git a/Daramkun.DaramRenamer.Engine/Processors/BatchProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/BatchProcessor.cs similarity index 81% rename from Daramkun.DaramRenamer.Engine/Processors/BatchProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/BatchProcessor.cs index b0f790b..4ced11a 100644 --- a/Daramkun.DaramRenamer.Engine/Processors/BatchProcessor.cs +++ b/Daramkun.DaramRenamer.Shared/Processors/BatchProcessor.cs @@ -23,12 +23,12 @@ public class BatchProcessor : IProcessor public bool Process ( FileInfo file ) { Jint.Engine engine = new Jint.Engine ( cfg => cfg.AllowClr ( - Assembly.GetAssembly ( typeof ( TagLib.File ) ), - Assembly.Load ( "Daramkun.DaramRenamer.Engine" ) + Assembly.GetAssembly ( typeof ( TagLib.File ) ) ) ); engine.SetValue ( "file", file ); - foreach ( Delegate dele in ProcessorExtensions.Delegates ) + var delegates = ProcessorExtensions.Delegates; + foreach ( Delegate dele in delegates ) engine.SetValue ( dele.Method.Name, dele ); try @@ -36,7 +36,10 @@ public bool Process ( FileInfo file ) Jint.Engine proceed = engine.Execute ( Script ); return proceed.GetCompletionValue ().AsBoolean (); } - catch { return false; } + catch ( Exception ex ) + { + return false; + } } } } diff --git a/Daramkun.DaramRenamer.Engine/Processors/Date/AddDateProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Date/AddDateProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Date/AddDateProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Date/AddDateProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Date/DeleteDateProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Date/DeleteDateProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Date/DeleteDateProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Date/DeleteDateProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Extension/AddExtensionAutomatedProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Extension/AddExtensionAutomatedProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Extension/AddExtensionAutomatedProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Extension/AddExtensionAutomatedProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Extension/AddExtensionProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Extension/AddExtensionProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Extension/AddExtensionProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Extension/AddExtensionProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Extension/CasecastExtensionProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Extension/CasecastExtensionProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Extension/CasecastExtensionProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Extension/CasecastExtensionProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Extension/DeleteExtensionProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Extension/DeleteExtensionProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Extension/DeleteExtensionProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Extension/DeleteExtensionProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Extension/ReplaceExtensionProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Extension/ReplaceExtensionProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Extension/ReplaceExtensionProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Extension/ReplaceExtensionProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/FilePath/ChangePathProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/FilePath/ChangePathProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/FilePath/ChangePathProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/FilePath/ChangePathProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/CasecastProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/CasecastProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/CasecastProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/CasecastProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/ConcatenateProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/ConcatenateProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/ConcatenateProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/ConcatenateProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/DeleteBlockProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/DeleteBlockProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/DeleteBlockProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/DeleteBlockProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/DeleteFilenameProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/DeleteFilenameProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/DeleteFilenameProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/DeleteFilenameProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/ReplacePlainProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/ReplacePlainProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/ReplacePlainProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/ReplacePlainProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/ReplaceRegexpProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/ReplaceRegexpProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/ReplaceRegexpProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/ReplaceRegexpProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/SubstringProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/SubstringProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/SubstringProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/SubstringProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Filename/TrimmingProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Filename/TrimmingProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Filename/TrimmingProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Filename/TrimmingProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/ManualEditProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/ManualEditProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/ManualEditProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/ManualEditProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Number/AddIndexNumberProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Number/AddIndexNumberProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Number/AddIndexNumberProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Number/AddIndexNumberProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Number/DeleteWithoutNumbersProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Number/DeleteWithoutNumbersProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Number/DeleteWithoutNumbersProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Number/DeleteWithoutNumbersProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Number/IncreaseDecreaseNumbersProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Number/IncreaseDecreaseNumbersProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Number/IncreaseDecreaseNumbersProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Number/IncreaseDecreaseNumbersProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Number/NumberCountMatchProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Number/NumberCountMatchProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Number/NumberCountMatchProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Number/NumberCountMatchProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Tag/AddDocumentTagProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Tag/AddDocumentTagProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Tag/AddDocumentTagProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Tag/AddDocumentTagProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Tag/AddHashProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Tag/AddHashProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Tag/AddHashProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Tag/AddHashProcessor.cs diff --git a/Daramkun.DaramRenamer.Engine/Processors/Tag/AddMediaTagProcessor.cs b/Daramkun.DaramRenamer.Shared/Processors/Tag/AddMediaTagProcessor.cs similarity index 100% rename from Daramkun.DaramRenamer.Engine/Processors/Tag/AddMediaTagProcessor.cs rename to Daramkun.DaramRenamer.Shared/Processors/Tag/AddMediaTagProcessor.cs diff --git a/Daramkun.DaramRenamer.sln b/Daramkun.DaramRenamer.sln index 315e5fb..9120e74 100644 --- a/Daramkun.DaramRenamer.sln +++ b/Daramkun.DaramRenamer.sln @@ -14,11 +14,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. External Libraries", "2. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daramee.DaramCommonLib", "..\DaramCommonLib\Daramee.DaramCommonLib\Daramee.DaramCommonLib.csproj", "{B33B6A90-7CD7-4351-B32E-FC0102984180}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daramkun.DaramRenamer.Engine", "Daramkun.DaramRenamer.Engine\Daramkun.DaramRenamer.Engine.csproj", "{387C59A9-953D-4260-AD9A-105834D6876F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "taglib-sharp", "..\taglib-sharp\src\taglib-sharp.csproj", "{2F14F0E2-9BF8-44A5-8CBA-F4675734FEAD}" EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Daramkun.DaramRenamer.Shared", "Daramkun.DaramRenamer.Shared\Daramkun.DaramRenamer.Shared.shproj", "{BBB4E072-4668-438C-B930-FC6831319CE7}" +EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Daramkun.DaramRenamer.Shared\Daramkun.DaramRenamer.Shared.projitems*{bbb4e072-4668-438c-b930-fc6831319ce7}*SharedItemsImports = 13 + Daramkun.DaramRenamer.Shared\Daramkun.DaramRenamer.Shared.projitems*{e18bb4a0-ac41-48f2-8940-427b5f7f93ac}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -32,10 +36,6 @@ Global {B33B6A90-7CD7-4351-B32E-FC0102984180}.Debug|Any CPU.Build.0 = Debug|Any CPU {B33B6A90-7CD7-4351-B32E-FC0102984180}.Release|Any CPU.ActiveCfg = Release|Any CPU {B33B6A90-7CD7-4351-B32E-FC0102984180}.Release|Any CPU.Build.0 = Release|Any CPU - {387C59A9-953D-4260-AD9A-105834D6876F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {387C59A9-953D-4260-AD9A-105834D6876F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {387C59A9-953D-4260-AD9A-105834D6876F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {387C59A9-953D-4260-AD9A-105834D6876F}.Release|Any CPU.Build.0 = Release|Any CPU {2F14F0E2-9BF8-44A5-8CBA-F4675734FEAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F14F0E2-9BF8-44A5-8CBA-F4675734FEAD}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F14F0E2-9BF8-44A5-8CBA-F4675734FEAD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,8 +47,8 @@ Global GlobalSection(NestedProjects) = preSolution {E18BB4A0-AC41-48F2-8940-427B5F7F93AC} = {7CA1A390-CF80-4277-8A2B-80C8FC069517} {B33B6A90-7CD7-4351-B32E-FC0102984180} = {D1B29789-6386-4C11-8E17-1B4246972CD4} - {387C59A9-953D-4260-AD9A-105834D6876F} = {7CA1A390-CF80-4277-8A2B-80C8FC069517} {2F14F0E2-9BF8-44A5-8CBA-F4675734FEAD} = {D1B29789-6386-4C11-8E17-1B4246972CD4} + {BBB4E072-4668-438C-B930-FC6831319CE7} = {7CA1A390-CF80-4277-8A2B-80C8FC069517} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DEAD2016-E3EF-438C-84F0-C0C8ED314DA9} diff --git a/Daramkun.DaramRenamer/Daramkun.DaramRenamer.csproj b/Daramkun.DaramRenamer/Daramkun.DaramRenamer.csproj index 312fb33..90a6fe8 100644 --- a/Daramkun.DaramRenamer/Daramkun.DaramRenamer.csproj +++ b/Daramkun.DaramRenamer/Daramkun.DaramRenamer.csproj @@ -90,16 +90,24 @@ DaramRenamer.manifest + + ..\packages\Daramee.FileTypeDetector.1.0.1\lib\net46\Daramee.FileTypeDetector.dll + ..\packages\Jint.2.11.58\lib\net451\Jint.dll + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + 4.0 + ..\packages\Daramee.TaskDialogSharp.1.0.0\lib\net40\TaskDialogSharp.dll @@ -182,11 +190,12 @@ {b33b6a90-7cd7-4351-b32e-fc0102984180} Daramee.DaramCommonLib - - {387c59a9-953d-4260-ad9a-105834d6876f} - Daramkun.DaramRenamer.Engine + + {2f14f0e2-9bf8-44a5-8cba-f4675734fead} + taglib-sharp +