Merge pull request #61 from Terradue/release/2.24.7

Release/2.24.7
Terradue · Aug 5, 2024 · 32bf145 · 32bf145
2 parents 12296b5 + 39cfa62
commit 32bf145
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/src/Stars.Console/Operations/CopyOperation.cs b/src/Stars.Console/Operations/CopyOperation.cs
@@ -349,7 +349,7 @@ private async Task<AssetImportReport> CopyAssetsFromContainer(IDestination desti
                 if (deliveryReport.AssetsExceptions.Count > 0)
                     throw new AggregateException(deliveryReport.AssetsExceptions.Values);
                 // no delivery but exception in quotation
-                if (deliveryReport.AssetsExceptions.Count == 0 && ( deliveryReport.Quotation.AssetsExceptions != null && deliveryReport.Quotation.AssetsExceptions.Count > 0))
+                if (deliveryReport.AssetsExceptions.Count == 0 && (deliveryReport.Quotation.AssetsExceptions != null && deliveryReport.Quotation.AssetsExceptions.Count > 0))
                     throw new AggregateException(deliveryReport.Quotation.AssetsExceptions.Values);
             }
 

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.6</Version>
+    <Version>2.24.7</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/Model/Metadata/Bka/BkaMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs
@@ -62,7 +62,7 @@ public override bool CanProcess(IResource route, IDestination destination)
                 else
                 {
                     BkaMetadata[] metadata = ReadMetadata(metadataAssets).GetAwaiter().GetResult();
-                    return metadata != null;
+                    return metadata != null && metadata.Length > 0;
                 }
             }
             catch (Exception)
@@ -544,7 +544,7 @@ protected virtual IAsset[] GetMetadataAssets(IAssetsContainer container, IEnumer
 
         protected virtual IAsset GetTopZipAsset(IItem item)
         {
-            IAsset zipAsset = FindFirstAssetFromFileNameRegex(item, @".*\.zip");
+            IAsset zipAsset = FindFirstAssetFromFileNameRegex(item, @"^(?!.*(S2A_|S2B_)).*\.zip$");
             return zipAsset;
         }
 
@@ -561,7 +561,7 @@ protected virtual IAsset GetProductZipAsset(IAsset topAsset, IAssetsContainer co
 
         protected virtual IEnumerable<IAsset> GetInnerZipAssets(IAssetsContainer container)
         {
-            IEnumerable<IAsset> zipAssets = FindAssetsFromFileNameRegex(container, @".*\.zip");
+            IEnumerable<IAsset> zipAssets = FindAssetsFromFileNameRegex(container, @"^(?!.*(S2A_|S2B_)).*\.zip$");
             return zipAssets;
         }
 

diff --git a/src/Stars.Data/Model/Metadata/Inpe/InpeMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Inpe/InpeMetadataExtractor.cs
@@ -84,12 +84,12 @@ public override bool CanProcess(IResource route, IDestination destination)
             {
                 IAsset metadataAsset = GetMetadataAsset(item);
                 Schemas.Metadata metadata = ReadMetadata(metadataAsset).GetAwaiter().GetResult();
+                return metadata != null;
 
-                return true;
             }
             catch (Exception e)
             {
-                Console.WriteLine("CAN NOT PROCESS: {0}\n{1}", e.Message, e.StackTrace);
+                //Console.WriteLine("CAN NOT PROCESS: {0}\n{1}", e.Message, e.StackTrace);
                 return false;
             }
         }

diff --git a/src/Stars.Data/Model/Metadata/Saocom1/Saocom1MetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Saocom1/Saocom1MetadataExtractor.cs
@@ -64,6 +64,7 @@ public override bool CanProcess(IResource route, IDestination destination)
                 else
                 {
                     SAOCOM_XMLProduct metadata = ReadMetadata(metadataAsset).GetAwaiter().GetResult();
+                    return metadata != null;
                 }
                 return true;
             }
@@ -696,7 +697,7 @@ protected virtual IAsset GetParametersAsset(IItem item)
         protected virtual IAsset GetZipAsset(IItem item)
         {
             IAsset zipAsset = null;
-            zipAsset = FindFirstAssetFromFileNameRegex(item, @"S.*\.zip");
+            zipAsset = FindFirstAssetFromFileNameRegex(item, @"^(?!.*(S2A_|S2B_))S.*\.zip$");
             return zipAsset;
         }
 

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

diff --git a/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs b/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs
@@ -151,7 +151,7 @@ public async Task<object> PostCollectionToCatalog(ICollection collectionNode, IR
 
             // Get Item from the collection
             var items = collectionNode.GetLinks().Where(l => l.Relationship == "item");
-            if ( items.Any() && catalogPublicationState.GeosquarePublicationModel.SkipCollectionsWithItems == true)
+            if (items.Any() && catalogPublicationState.GeosquarePublicationModel.SkipCollectionsWithItems == true)
             {
                 logger.LogWarning("Skipping collection {0} because it has items", collectionNode);
                 return state;

diff --git a/src/Stars.Services/Store/StacStoreService.cs b/src/Stars.Services/Store/StacStoreService.cs
@@ -313,7 +313,7 @@ private void PrepareStacCollectionForDestination(StacCollectionNode stacCollecti
             else
                 MakeAssetUriRelative(stacCollectionNode, destination);
         }
-        
+
 
         public void PrepareStacItemForDestination(StacItemNode stacItemNode, IDestination destination)
         {
-Original file line number
+Diff line change
@@ Expand Up @@
                 else
                     MakeAssetUriRelative(stacCollectionNode, destination);
             }
             public void PrepareStacItemForDestination(StacItemNode stacItemNode, IDestination destination)
             {
@@ Expand Down @@