Updated dependencies (Landsat USGS search by ID and TAR archive issue)

Terradue · Oct 2, 2024 · 33ca6e2 · 33ca6e2
1 parent 8e13424
commit 33ca6e2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj
@@ -33,7 +33,7 @@
         <PackageReference Include="MimeTypes" Version="2.0.2" />
         <PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.48.*"/>
         <PackageReference Include="Terradue.OpenSearch.Asf" Version="1.4.*" />
-        <PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.7.*" />
+        <PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.8.0" />
         <PackageReference Include="Terradue.OpenSearch.GeoJson" Version="1.4.5" />
         <PackageReference Include="Terradue.GeoJson" Version="1.12.1" />
         <PackageReference Include="MaxRev.Gdal.Core" Version="3.3.3.110" />
@@ -54,9 +54,12 @@
     <!--<ItemGroup>
         <ProjectReference Include="../../../terradue.opensearch.scihub/Terradue.OpenSearch.SciHub/Terradue.OpenSearch.SciHub.csproj" />
     </ItemGroup>-->
-    <!-- <ItemGroup>
+    <!--<ItemGroup>
+        <ProjectReference Include="../../../terradue.opensearch.asf/Terradue.OpenSearch.Asf/Terradue.OpenSearch.Asf.csproj" />
+    </ItemGroup>-->
+    <!--<ItemGroup>
         <ProjectReference Include="../../../terradue.opensearch.usgs/Terradue.OpenSearch.Usgs/Terradue.OpenSearch.Usgs.csproj" />
-    </ItemGroup> -->
+    </ItemGroup>-->
     <ItemGroup>
         <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
         <None Include="..\..\docs\logo\Stars_logo.png" Pack="true" PackagePath="" />

diff --git a/src/Stars.Services/Processing/Archive.cs b/src/Stars.Services/Processing/Archive.cs
@@ -19,6 +19,7 @@ namespace Terradue.Stars.Services.Processing
     public abstract class Archive : ILocatable
     {
         public static readonly Dictionary<string, ArchiveType> ArchiveFileExtensions = new Dictionary<string, ArchiveType>() {
+            { ".tar", ArchiveType.Tar },
             { ".tar.gz", ArchiveType.TarGzip },
             { ".tgz",  ArchiveType.TarGzip },
             { ".tar.Z",   ArchiveType.TarGzip },
@@ -48,6 +49,8 @@ internal static async Task<Archive> Read(IAsset asset, ILogger logger, IResource
             {
                 case ArchiveType.Zip:
                     return new ZipArchiveAsset(asset, logger, resourceServiceProvider, fileSystem);
+                case ArchiveType.Tar:
+                    return new TarArchiveAsset(asset, resourceServiceProvider, logger);
                 case ArchiveType.TarGzip:
                     return new TarGzipArchive(asset, resourceServiceProvider, logger);
                 case ArchiveType.Gzip:

diff --git a/src/Stars.Services/Processing/ArchiveType.cs b/src/Stars.Services/Processing/ArchiveType.cs
@@ -8,6 +8,7 @@ public enum ArchiveType
     {
         None,
         Compress,
+        Tar,
         TarGzip,
         TarBzip2,
         Zip,
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ public enum ArchiveType @@
         {
             None,
             Compress,
+            Tar,
             TarGzip,
             TarBzip2,
             Zip,
@@ Expand Down @@