Prepare fixing .NET UTC parse error (Z is being ignored)

nexus-main · Mar 13, 2024 · cfb0f6b · cfb0f6b
1 parent cfc5560
commit cfb0f6b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/src/Nexus.Sources.StructuredFile/StructuredFileDataSource.cs b/src/Nexus.Sources.StructuredFile/StructuredFileDataSource.cs
@@ -721,7 +721,16 @@ async Task IDataSource.ReadAsync(
 
         // get all candidate folders
         var candidateFolders = fileSource.PathSegments.Length >= 1
-            ? GetCandidateFolders(rootPath, default, begin, end, fileSource, fileSource.PathSegments, cancellationToken)
+
+            ? GetCandidateFolders(
+                rootPath, 
+                default, 
+                begin, 
+                end, 
+                fileSource, 
+                fileSource.PathSegments, 
+                cancellationToken)
+
             : new List<(string, DateTime)>() { (rootPath, default) };
 
         return candidateFolders.SelectMany(currentFolder =>
@@ -731,7 +740,11 @@ async Task IDataSource.ReadAsync(
             var candidateFiles = filePaths
                 .Select(filePath =>
                 {
-                    var success = TryGetFileBeginByPath(filePath, fileSource, out var fileBegin, folderBegin: currentFolder.DateTime);
+                    var success = TryGetFileBeginByPath(
+                        filePath, 
+                        fileSource, 
+                        out var fileBegin, 
+                        folderBegin: currentFolder.DateTime);
 
                     return (success, filePath, fileBegin);
                 })
@@ -952,7 +965,7 @@ private static DateTime GetFolderBegin_AnyKind(string filePath, FileSource fileS
         var folderBegin = default(DateTime);
 
         var pathSegments = filePath
-                        .Split('/', '\\');
+            .Split('/', '\\');
 
         pathSegments = pathSegments
             .Skip(pathSegments.Length - fileSource.PathSegments.Length - 1)

diff --git a/tests/Nexus.Sources.StructuredFile.Tests/DATABASES/K/DATA/2020-01-01T00-00-00Z.dat b/tests/Nexus.Sources.StructuredFile.Tests/DATABASES/K/DATA/2020-01-01T00-00-00Z.dat
diff --git a/tests/Nexus.Sources.StructuredFile.Tests/DATABASES/K/config.json b/tests/Nexus.Sources.StructuredFile.Tests/DATABASES/K/config.json
@@ -0,0 +1,14 @@
+{
+  "/A/B/C": {
+    "default": [
+      {
+        "PathSegments": [
+          "'DATA'"
+        ],
+        "FileTemplate": "yyyy-MM-ddTHH-mm-ssZ'.dat'",
+        "FilePeriod": "1.00:00:00",
+        "UtcOffset": "00:00:00"
+      }
+    ]
+  }
+}
diff --git a/tests/Nexus.Sources.StructuredFile.Tests/Nexus.Sources.StructuredFile.Tests.csproj b/tests/Nexus.Sources.StructuredFile.Tests/Nexus.Sources.StructuredFile.Tests.csproj
@@ -12,6 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Nexus.Extensibility" Version="2.0.0-beta.15" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Nexus.Sources.StructuredFile.Tests/StructuredFileDataSourceTests.cs b/tests/Nexus.Sources.StructuredFile.Tests/StructuredFileDataSourceTests.cs
@@ -49,6 +49,7 @@ public async Task CanProvideFirstFile()
     [InlineData("DATABASES/H", "2019-12-31T12-00-00Z", "2020-01-02T00-20-00Z")]
     [InlineData("DATABASES/I", "2019-12-31T23-55-00Z", "2020-01-01T00-15-00Z")]
     [InlineData("DATABASES/J", "2020-01-01T00-00-00Z", "2020-01-05T00-00-00Z")]
+    [InlineData("DATABASES/K", "2020-01-01T00-00-00Z", "2020-01-02T00-00-00Z")]
     public async Task CanProvideTimeRange(string root, string expectedBeginString, string expectedEndString)
     {
         var expectedBegin = DateTime.ParseExact(expectedBeginString, "yyyy-MM-ddTHH-mm-ssZ", null, DateTimeStyles.AdjustToUniversal);