Merge branch 'release/2.24.1'

Terradue · Jun 4, 2024 · 186c828 · 186c828
2 parents fe1ba0d + e7f17f3
commit 186c828
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [2.24.0](https://github.com/Terradue/Stars/compare/2.23.0...2.24.0)
+## [2.24.1](https://github.com/Terradue/Stars/compare/2.24.0...2.24.1)
+
+### Commits
+
+- Refactor StacStoreService to improve asset URI handling in collection [`78358a5`](https://github.com/Terradue/Stars/commit/78358a5e23252b92c562b277561af6354d1d1bab)
+
+## [2.24.0](https://github.com/Terradue/Stars/compare/2.23.0...2.24.0) - 2024-06-04
 
 ### Commits
 

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.24.0</Version>
+    <Version>2.24.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.24.0</Version>
+        <Version>2.24.1</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>

diff --git a/src/Stars.Services/Store/StacStoreService.cs b/src/Stars.Services/Store/StacStoreService.cs
@@ -152,7 +152,7 @@ public async Task<StacItemNode> StoreItemNodeAtDestinationAsync(StacItemNode sta
 
         public async Task<StacCollectionNode> StoreCollectionNodeAtDestinationAsync(StacCollectionNode stacCollectionNode, IDestination destination, CancellationToken ct)
         {
-            PrepareStacCatalogueForDestination(stacCollectionNode, destination);
+            PrepareStacCollectionForDestination(stacCollectionNode, destination);
             return await _stacRouter.RouteAsync(await StoreResourceAtDestinationAsync(stacCollectionNode, destination, ct), ct) as StacCollectionNode;
         }
 
@@ -305,6 +305,16 @@ private void PrepareStacCatalogueForDestination(StacCatalogNode stacCatalogNode,
             PrepareStacNodeForDestination(stacCatalogNode, destination);
         }
 
+        private void PrepareStacCollectionForDestination(StacCollectionNode stacCollectionNode, IDestination destination)
+        {
+            PrepareStacNodeForDestination(stacCollectionNode, destination);
+            if (storeOptions.AbsoluteAssetsUrl)
+                MakeAssetUriAbsolute(stacCollectionNode, destination);
+            else
+                MakeAssetUriRelative(stacCollectionNode, destination);
+        }
+
+
         public void PrepareStacItemForDestination(StacItemNode stacItemNode, IDestination destination)
         {
             PrepareStacNodeForDestination(stacItemNode, destination);
@@ -327,6 +337,16 @@ private void MakeAssetUriAbsolute(StacItemNode stacItemNode, IDestination destin
             }
         }
 
+        private void MakeAssetUriAbsolute(StacCollectionNode stacCollectionNode, IDestination destination)
+        {
+            MakeAssetUriRelative(stacCollectionNode, destination);
+            foreach (var asset in stacCollectionNode.StacCollection.Assets)
+            {
+                if (asset.Value.Uri.IsAbsoluteUri) continue;
+                asset.Value.Uri = new Uri(MapToFrontUri(destination.Uri), asset.Value.Uri);
+            }
+        }
+
         private void MakeAssetUriRelative(StacItemNode stacItemNode, IDestination destination)
         {
             foreach (var asset in stacItemNode.StacItem.Assets)
@@ -356,6 +376,35 @@ private void MakeAssetUriRelative(StacItemNode stacItemNode, IDestination destin
             }
         }
 
+        private void MakeAssetUriRelative(StacCollectionNode stacCollectionNode, IDestination destination)
+        {
+            foreach (var asset in stacCollectionNode.StacCollection.Assets)
+            {
+                if (!asset.Value.Uri.IsAbsoluteUri) continue;
+                // 0. make sure the uri is not outside of the root catalog
+                var relativeUri = RootCatalogDestination.Uri.MakeRelativeUri(asset.Value.Uri);
+                if (relativeUri.IsAbsoluteUri || relativeUri.ToString().StartsWith("../"))
+                    continue;
+                // 1. Check the asset uri can be relative to destination itself
+                relativeUri = destination.Uri.MakeRelativeUri(asset.Value.Uri);
+                if (!relativeUri.IsAbsoluteUri)
+                {
+                    asset.Value.Uri = relativeUri;
+                    continue;
+                }
+                // 1. Check the asset uri can be relative to root catalog
+                relativeUri = RootCatalogDestination.Uri.MakeRelativeUri(asset.Value.Uri);
+                if (relativeUri.IsAbsoluteUri) continue;
+                Uri absoluteUri = new Uri(RootCatalogNode.Uri, relativeUri);
+                relativeUri = stacCollectionNode.Uri.MakeRelativeUri(asset.Value.Uri);
+                if (!relativeUri.IsAbsoluteUri)
+                {
+                    asset.Value.Uri = relativeUri;
+                    continue;
+                }
+            }
+        }
+
         public async Task<IAssetsContainer> GetAssetsInFolderAsync(string relPath, CancellationToken ct)
         {
             return await resourceServiceProvider.GetAssetsInFolderAsync(new GenericResource(new Uri(RootCatalogDestination.Uri, relPath)), ct);

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.24.0</Version>
+    <Version>2.24.1</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <AssemblyName>Terradue.Stars.Services</AssemblyName>