Engine codes move to Shared project

daramkun · Apr 9, 2018 · f7ef2ff · f7ef2ff
1 parent 47182da
commit f7ef2ff
Show file tree

Hide file tree

Showing 42 changed files with 111 additions and 193 deletions.
diff --git a/Daramkun.DaramRenamer.Engine/Conditions/NoOperationCondition.cs b/Daramkun.DaramRenamer.Engine/Conditions/NoOperationCondition.cs
diff --git a/Daramkun.DaramRenamer.Engine/Daramkun.DaramRenamer.Engine.csproj b/Daramkun.DaramRenamer.Engine/Daramkun.DaramRenamer.Engine.csproj
diff --git a/Daramkun.DaramRenamer.Engine/Properties/AssemblyInfo.cs b/Daramkun.DaramRenamer.Engine/Properties/AssemblyInfo.cs
diff --git a/Daramkun.DaramRenamer.Engine/packages.config b/Daramkun.DaramRenamer.Engine/packages.config
diff --git a/...r.Engine/Conditions/ExtensionCondition.cs → ...r.Shared/Conditions/ExtensionCondition.cs b/...r.Engine/Conditions/ExtensionCondition.cs → ...r.Shared/Conditions/ExtensionCondition.cs
diff --git a/....Engine/Conditions/IsTextFileCondition.cs → ....Shared/Conditions/IsTextFileCondition.cs b/....Engine/Conditions/IsTextFileCondition.cs → ....Shared/Conditions/IsTextFileCondition.cs
diff --git a/...amer.Engine/Conditions/RegexpCondition.cs → ...amer.Shared/Conditions/RegexpCondition.cs b/...amer.Engine/Conditions/RegexpCondition.cs → ...amer.Shared/Conditions/RegexpCondition.cs
diff --git a/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.projitems b/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.projitems
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>bbb4e072-4668-438c-b930-fc6831319ce7</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Daramkun.DaramRenamer.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Conditions\ExtensionCondition.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Conditions\IsTextFileCondition.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Conditions\RegexpCondition.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FileInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)LocalizedAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ProcessorExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\BatchProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Date\AddDateProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Date\DeleteDateProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Extension\AddExtensionAutomatedProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Extension\AddExtensionProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Extension\CasecastExtensionProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Extension\DeleteExtensionProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Extension\ReplaceExtensionProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\CasecastProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\ConcatenateProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\DeleteBlockProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\DeleteFilenameProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\ReplacePlainProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\ReplaceRegexpProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\SubstringProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Filename\TrimmingProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\FilePath\ChangePathProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\ManualEditProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Number\AddIndexNumberProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Number\DeleteWithoutNumbersProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Number\IncreaseDecreaseNumbersProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Number\NumberCountMatchProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Tag\AddDocumentTagProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Tag\AddHashProcessor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Processors\Tag\AddMediaTagProcessor.cs" />
+  </ItemGroup>
+</Project>
diff --git a/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.shproj b/Daramkun.DaramRenamer.Shared/Daramkun.DaramRenamer.Shared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>bbb4e072-4668-438c-b930-fc6831319ce7</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Daramkun.DaramRenamer.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/Daramkun.DaramRenamer.Engine/FileInfo.cs → Daramkun.DaramRenamer.Shared/FileInfo.cs b/Daramkun.DaramRenamer.Engine/FileInfo.cs → Daramkun.DaramRenamer.Shared/FileInfo.cs
diff --git a/Daramkun.DaramRenamer.Engine/IProcessor.cs → Daramkun.DaramRenamer.Shared/IProcessor.cs b/Daramkun.DaramRenamer.Engine/IProcessor.cs → Daramkun.DaramRenamer.Shared/IProcessor.cs
diff --git a/...DaramRenamer.Engine/LocalizedAttribute.cs → ...DaramRenamer.Shared/LocalizedAttribute.cs b/...DaramRenamer.Engine/LocalizedAttribute.cs → ...DaramRenamer.Shared/LocalizedAttribute.cs
diff --git a/...aramRenamer.Engine/ProcessorExtensions.cs → ...aramRenamer.Shared/ProcessorExtensions.cs b/...aramRenamer.Engine/ProcessorExtensions.cs → ...aramRenamer.Shared/ProcessorExtensions.cs
@@ -109,37 +109,40 @@ private static MethodInfo GenerateDynamicMethod ( Type type, string methodName,
 			return method;
 		}
 
-		static List<Delegate> delegates;
+		static List<Delegate> delegates = new List<Delegate> ();
 		public static IReadOnlyList<Delegate> Delegates
 		{
 			get
 			{
-				if ( delegates == null)
+				lock ( delegates )
 				{
-					delegates = new List<Delegate> ();
-
-					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<Delegate> ();
+
+						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<string> ( get_renamer_version ) );
+						delegates.Add ( new Func<string, string> ( get_file_content ) );
 					}
-					delegates.Add ( new Func<string> ( get_renamer_version ) );
-					delegates.Add ( new Func<string, string> ( get_file_content ) );
+					return delegates;
 				}
-				return delegates;
 			}
 		}
 

diff --git a/...namer.Engine/Processors/BatchProcessor.cs → ...namer.Shared/Processors/BatchProcessor.cs b/...namer.Engine/Processors/BatchProcessor.cs → ...namer.Shared/Processors/BatchProcessor.cs
@@ -23,20 +23,23 @@ 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
 			{
 				Jint.Engine proceed = engine.Execute ( Script );
 				return proceed.GetCompletionValue ().AsBoolean ();
 			}
-			catch { return false; }
+			catch ( Exception ex )
+			{
+				return false;
+			}
 		}
 	}
 }
diff --git a/...ngine/Processors/Date/AddDateProcessor.cs → ...hared/Processors/Date/AddDateProcessor.cs b/...ngine/Processors/Date/AddDateProcessor.cs → ...hared/Processors/Date/AddDateProcessor.cs
diff --git a/...ne/Processors/Date/DeleteDateProcessor.cs → ...ed/Processors/Date/DeleteDateProcessor.cs b/...ne/Processors/Date/DeleteDateProcessor.cs → ...ed/Processors/Date/DeleteDateProcessor.cs
diff --git a/...tension/AddExtensionAutomatedProcessor.cs → ...tension/AddExtensionAutomatedProcessor.cs b/...tension/AddExtensionAutomatedProcessor.cs → ...tension/AddExtensionAutomatedProcessor.cs
diff --git a/...essors/Extension/AddExtensionProcessor.cs → ...essors/Extension/AddExtensionProcessor.cs b/...essors/Extension/AddExtensionProcessor.cs → ...essors/Extension/AddExtensionProcessor.cs
diff --git a/...s/Extension/CasecastExtensionProcessor.cs → ...s/Extension/CasecastExtensionProcessor.cs b/...s/Extension/CasecastExtensionProcessor.cs → ...s/Extension/CasecastExtensionProcessor.cs
diff --git a/...ors/Extension/DeleteExtensionProcessor.cs → ...ors/Extension/DeleteExtensionProcessor.cs b/...ors/Extension/DeleteExtensionProcessor.cs → ...ors/Extension/DeleteExtensionProcessor.cs
diff --git a/...rs/Extension/ReplaceExtensionProcessor.cs → ...rs/Extension/ReplaceExtensionProcessor.cs b/...rs/Extension/ReplaceExtensionProcessor.cs → ...rs/Extension/ReplaceExtensionProcessor.cs
diff --git a/...rocessors/FilePath/ChangePathProcessor.cs → ...rocessors/FilePath/ChangePathProcessor.cs b/...rocessors/FilePath/ChangePathProcessor.cs → ...rocessors/FilePath/ChangePathProcessor.cs
diff --git a/.../Processors/Filename/CasecastProcessor.cs → .../Processors/Filename/CasecastProcessor.cs b/.../Processors/Filename/CasecastProcessor.cs → .../Processors/Filename/CasecastProcessor.cs
diff --git a/...ocessors/Filename/ConcatenateProcessor.cs → ...ocessors/Filename/ConcatenateProcessor.cs b/...ocessors/Filename/ConcatenateProcessor.cs → ...ocessors/Filename/ConcatenateProcessor.cs
diff --git a/...ocessors/Filename/DeleteBlockProcessor.cs → ...ocessors/Filename/DeleteBlockProcessor.cs b/...ocessors/Filename/DeleteBlockProcessor.cs → ...ocessors/Filename/DeleteBlockProcessor.cs
diff --git a/...ssors/Filename/DeleteFilenameProcessor.cs → ...ssors/Filename/DeleteFilenameProcessor.cs b/...ssors/Filename/DeleteFilenameProcessor.cs → ...ssors/Filename/DeleteFilenameProcessor.cs
diff --git a/...cessors/Filename/ReplacePlainProcessor.cs → ...cessors/Filename/ReplacePlainProcessor.cs b/...cessors/Filename/ReplacePlainProcessor.cs → ...cessors/Filename/ReplacePlainProcessor.cs
diff --git a/...essors/Filename/ReplaceRegexpProcessor.cs → ...essors/Filename/ReplaceRegexpProcessor.cs b/...essors/Filename/ReplaceRegexpProcessor.cs → ...essors/Filename/ReplaceRegexpProcessor.cs
diff --git a/...Processors/Filename/SubstringProcessor.cs → ...Processors/Filename/SubstringProcessor.cs b/...Processors/Filename/SubstringProcessor.cs → ...Processors/Filename/SubstringProcessor.cs
diff --git a/.../Processors/Filename/TrimmingProcessor.cs → .../Processors/Filename/TrimmingProcessor.cs b/.../Processors/Filename/TrimmingProcessor.cs → .../Processors/Filename/TrimmingProcessor.cs
diff --git a/....Engine/Processors/ManualEditProcessor.cs → ....Shared/Processors/ManualEditProcessor.cs b/....Engine/Processors/ManualEditProcessor.cs → ....Shared/Processors/ManualEditProcessor.cs
diff --git a/...cessors/Number/AddIndexNumberProcessor.cs → ...cessors/Number/AddIndexNumberProcessor.cs b/...cessors/Number/AddIndexNumberProcessor.cs → ...cessors/Number/AddIndexNumberProcessor.cs
diff --git a/...s/Number/DeleteWithoutNumbersProcessor.cs → ...s/Number/DeleteWithoutNumbersProcessor.cs b/...s/Number/DeleteWithoutNumbersProcessor.cs → ...s/Number/DeleteWithoutNumbersProcessor.cs
diff --git a/...umber/IncreaseDecreaseNumbersProcessor.cs → ...umber/IncreaseDecreaseNumbersProcessor.cs b/...umber/IncreaseDecreaseNumbersProcessor.cs → ...umber/IncreaseDecreaseNumbersProcessor.cs
diff --git a/...ssors/Number/NumberCountMatchProcessor.cs → ...ssors/Number/NumberCountMatchProcessor.cs b/...ssors/Number/NumberCountMatchProcessor.cs → ...ssors/Number/NumberCountMatchProcessor.cs
diff --git a/...Processors/Tag/AddDocumentTagProcessor.cs → ...Processors/Tag/AddDocumentTagProcessor.cs b/...Processors/Tag/AddDocumentTagProcessor.cs → ...Processors/Tag/AddDocumentTagProcessor.cs
diff --git a/...Engine/Processors/Tag/AddHashProcessor.cs → ...Shared/Processors/Tag/AddHashProcessor.cs b/...Engine/Processors/Tag/AddHashProcessor.cs → ...Shared/Processors/Tag/AddHashProcessor.cs
diff --git a/...ne/Processors/Tag/AddMediaTagProcessor.cs → ...ed/Processors/Tag/AddMediaTagProcessor.cs b/...ne/Processors/Tag/AddMediaTagProcessor.cs → ...ed/Processors/Tag/AddMediaTagProcessor.cs
diff --git 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}