Merge branch 'release/2.24.4'

Terradue · Jun 17, 2024 · b2df95d · b2df95d
2 parents 51c2de7 + b70a8ee
commit b2df95d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 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.24.3</Version>
+    <Version>2.24.4</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.3</Version>
+        <Version>2.24.4</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>

diff --git a/src/Stars.Data/ThirdParty/Publication/GeosquarePublicationModel.cs b/src/Stars.Data/ThirdParty/Publication/GeosquarePublicationModel.cs
@@ -120,6 +120,8 @@ internal void UpdateLink(SyndicationLink link, AtomItem item, IAssetsContainer a
         public List<string> AssetsFilters { get; set; }
 
         public bool PublishCollections { get; set; } = false;
+
+        public bool SkipCollectionsWithItems { get; set; } = false;
     }
 
 }
diff --git a/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs b/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs
@@ -149,6 +149,14 @@ public async Task<object> PostCollectionToCatalog(ICollection collectionNode, IR
             GeosquarePublicationState catalogPublicationState = state as GeosquarePublicationState;
             AtomItemNode atomItemNode = null;
 
+            // Get Item from the collection
+            var items = collectionNode.GetLinks().Where(l => l.Relationship == "item");
+            if ( items.Any() && catalogPublicationState.GeosquarePublicationModel.SkipCollectionsWithItems == true)
+            {
+                logger.LogWarning("Skipping collection {0} because it has items", collectionNode);
+                return state;
+            }
+
             // Filter assets
             // Create the asset filters based on the asset filters string from the catalog publication model
             AssetFilters assetFilters = AssetFilters.CreateAssetFilters(catalogPublicationState.GeosquarePublicationModel.AssetsFilters);

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