diff --git a/Adaptation/DEP08CEPIEPSILON.Tests.csproj b/Adaptation/DEP08CEPIEPSILON.Tests.csproj
index 1cc10b0..f825df1 100644
--- a/Adaptation/DEP08CEPIEPSILON.Tests.csproj
+++ b/Adaptation/DEP08CEPIEPSILON.Tests.csproj
@@ -49,23 +49,23 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
NU1701
-
-
+
+
-
-
+
+
diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs
index 464ef0b..4b6f3fc 100644
--- a/Adaptation/Shared/FileRead.cs
+++ b/Adaptation/Shared/FileRead.cs
@@ -489,6 +489,43 @@ public class FileRead : Properties.IFileRead
}
}
+ protected static void NestExistingFiles(FileConnectorConfiguration fileConnectorConfiguration)
+ {
+ if (!fileConnectorConfiguration.IncludeSubDirectories.Value)
+ {
+ string[] matches = GetMatches(fileConnectorConfiguration);
+ if (matches is not null && matches.Length > 0)
+ {
+ string fileName;
+ string nestedDirectory = Path.Combine(fileConnectorConfiguration.SourceFileLocation, DateTime.Now.Ticks.ToString());
+ if (!Directory.Exists(nestedDirectory))
+ _ = Directory.CreateDirectory(nestedDirectory);
+ foreach (string match in matches)
+ {
+ fileName = Path.GetFileName(match);
+ File.Move(match, Path.Combine(nestedDirectory, fileName));
+ }
+ }
+ }
+ }
+
+ protected static string[] GetMatches(FileConnectorConfiguration fileConnectorConfiguration)
+ {
+ string[] segments;
+ string[] results = null;
+ foreach (string subSourceFileFilter in fileConnectorConfiguration.SourceFileFilters)
+ {
+ segments = subSourceFileFilter.Split('\\');
+ if (fileConnectorConfiguration.IncludeSubDirectories.Value)
+ results = Directory.GetFiles(fileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.AllDirectories);
+ else
+ results = Directory.GetFiles(fileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.TopDirectoryOnly);
+ if (results.Length != 0)
+ break;
+ }
+ return results;
+ }
+
protected Tuple> ReExtract(IFileRead fileRead, List headerNames, Dictionary keyValuePairs)
{
Tuple> results;
@@ -496,18 +533,7 @@ public class FileRead : Properties.IFileRead
results = null;
else
{
- string[] segments;
- string[] matches = null;
- foreach (string subSourceFileFilter in _FileConnectorConfiguration.SourceFileFilters)
- {
- segments = subSourceFileFilter.Split('\\');
- if (_FileConnectorConfiguration.IncludeSubDirectories.Value)
- matches = Directory.GetFiles(_FileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.AllDirectories);
- else
- matches = Directory.GetFiles(_FileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.TopDirectoryOnly);
- if (matches.Length != 0)
- break;
- }
+ string[] matches = GetMatches(_FileConnectorConfiguration);
if (matches is null || matches.Length == 0)
results = null;
else
diff --git a/Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/DEP08CEPIEPSILON.cs b/Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/DEP08CEPIEPSILON.cs
index d8ed20e..b3f4b69 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/DEP08CEPIEPSILON.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Production/v2.57.0/DEP08CEPIEPSILON.cs
@@ -1,4 +1,4 @@
-#if v2_57_0
+#if true
using Adaptation._Tests.Shared;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/Adaptation/_Tests/Extract/Production/v2.57.0/DEP08CEPIEPSILON.cs b/Adaptation/_Tests/Extract/Production/v2.57.0/DEP08CEPIEPSILON.cs
index be19199..986dfe6 100644
--- a/Adaptation/_Tests/Extract/Production/v2.57.0/DEP08CEPIEPSILON.cs
+++ b/Adaptation/_Tests/Extract/Production/v2.57.0/DEP08CEPIEPSILON.cs
@@ -1,4 +1,4 @@
-#if v2_57_0
+#if true
using Adaptation._Tests.Shared;
using Adaptation.Shared;
using Adaptation.Shared.Methods;
diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs
index dad8ffe..8a341d4 100644
--- a/Adaptation/_Tests/Shared/AdaptationTesting.cs
+++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs
@@ -974,8 +974,8 @@ public class AdaptationTesting : ISMTP
}
if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder))
{
- if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder))
- _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder);
+ if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder.Split('|')[0]))
+ _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder.Split('|')[0]);
}
}
catch (IOException ex)