Merge branch 'release/2.25.1'

Terradue · Aug 13, 2024 · 492281e · 492281e
2 parents f93c8ac + c3c86e2
commit 492281e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>2.25.0</Version> 
+    <Version>2.25.1</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj
@@ -4,7 +4,7 @@
         <ProjectName>Terradue.Stars.Data</ProjectName>
         <Title>Terradue.Stars.Data</Title>
         <Description>Collection of data Plugins for Terradue.Stars</Description>
-        <Version>2.25.0</Version>
+        <Version>2.25.1</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>
@@ -51,12 +51,12 @@
             <PrivateAssets>all</PrivateAssets>
         </ProjectReference>
     </ItemGroup>
+    <!--<ItemGroup>
+        <ProjectReference Include="../../../terradue.opensearch.scihub/Terradue.OpenSearch.SciHub/Terradue.OpenSearch.SciHub.csproj" />
+    </ItemGroup>-->
     <!-- <ItemGroup>
-    <ProjectReference Include="../../../../sugar/Terradue.OpenSearch.SciHub/Terradue.OpenSearch.SciHub/Terradue.OpenSearch.SciHub.csproj" />
-  </ItemGroup> -->
-    <!-- <ItemGroup>
-    <ProjectReference Include="../../../../sugar/Terradue.OpenSearch.Usgs/Terradue.OpenSearch.Usgs/Terradue.OpenSearch.Usgs.csproj" />
-  </ItemGroup> -->
+        <ProjectReference Include="../../../terradue.opensearch.usgs/Terradue.OpenSearch.Usgs/Terradue.OpenSearch.Usgs.csproj" />
+    </ItemGroup> -->
     <ItemGroup>
         <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
         <None Include="..\..\docs\logo\Stars_logo.png" Pack="true" PackagePath="" />

diff --git a/src/Stars.Services/Resources/DefaultResourceServiceProvider.cs b/src/Stars.Services/Resources/DefaultResourceServiceProvider.cs
@@ -88,9 +88,22 @@ public async Task<IStreamResource> CreateStreamResourceAsync(IResource resource,
                 try
                 {
                     // First try head request
-                    using (var headResponse = await client.SendAsync(new HttpRequestMessage(HttpMethod.Head, resource.Uri), ct))
+                    using (var hr = await client.SendAsync(new HttpRequestMessage(HttpMethod.Head, resource.Uri), ct))
                     {
+                        HttpResponseMessage headResponse = hr;
                         contentHeaders = new HttpCachedHeaders(headResponse);
+                        // Handle response error, but retry with a one-byte range in case of "Method not allowed" status code
+                        /*if (headResponse.StatusCode == System.Net.HttpStatusCode.MethodNotAllowed)
+                        {
+                            //"Range: bytes=0-0
+                            HttpRequestMessage message = new HttpRequestMessage(HttpMethod.Get, resource.Uri);
+                            message.Headers.Range = new System.Net.Http.Headers.RangeHeaderValue(0, 0);
+                            using (var hr2 = await client.SendAsync(message, ct))
+                            {
+                                contentHeaders = new HttpCachedHeaders(headResponse);
+                                headResponse = hr2;
+                            }
+                        }*/
                         headResponse.EnsureSuccessStatusCode();
                     }
                 }

diff --git a/src/Stars.Services/Supplier/Carrier/CarrierManager.cs b/src/Stars.Services/Supplier/Carrier/CarrierManager.cs
@@ -91,7 +91,7 @@ public async Task<IDeliveryQuotation> GetAssetsDeliveryQuotationsAsync(IAssetsCo
                         }
                         catch (Exception e)
                         {
-                            logger.LogWarning("Cannot quote delivery for asset {0} with url {2} : {1}", asset.Key, e.Message, possibleAsset.Uri);
+                            logger.LogWarning("Cannot quote delivery for asset {0} with url {1} : {2}", asset.Key, possibleAsset.Uri, e.Message);
                             logger.LogDebug(e.StackTrace);
                             assetsExceptions.Add(asset.Key, e);
                         }

diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>Terradue.Stars</Title>
     <Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
-    <Version>2.25.0</Version>
+    <Version>2.25.1</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <AssemblyName>Terradue.Stars.Services</AssemblyName>