Merge branch 'release/0.9.2'

Terradue · Jun 9, 2021 · b376ae0 · b376ae0
2 parents 787dd5b + c5a1793
commit b376ae0
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -619,7 +619,32 @@
                 "moduleLoad": false
             }
         },
-
+        {
+            "name": "Copy calibrated",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/src/Stars.Console/bin/Debug/netcoreapp3.1/Stars.dll",
+            "args": [
+                "copy",
+                "https://supervisor.charter.uat.esaportal.eu/catalog/calls/call-100/calibratedDatasets/S2A_MSIL1C_20200615T060641_N0209_R134_T45WWS_20200615T080720-calibrated/S2A_MSIL1C_20200615T060641_N0209_R134_T45WWS_20200615T080720-calibrated.json",
+                "-v",
+                "-af",
+                "red",
+                "-r",
+                "4",
+                "--output",
+                "/tmp/charter"
+            ],
+            "cwd": "${workspaceFolder}/src",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "logging": {
+                "moduleLoad": false
+            }
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

diff --git a/src/Stars.Console/Operations/CopyOperation.cs b/src/Stars.Console/Operations/CopyOperation.cs
@@ -243,7 +243,7 @@ private async Task<object> CopyNode(IResource node, IRouter router, object state
                             throw new AggregateException(deliveryReport.AssetsExceptions.Values);
 
                         if (deliveryReport.ImportedAssets.Count() > 0)
-                            stacItemNode.StacItem.MergeAssets(deliveryReport);
+                            stacItemNode.StacItem.MergeAssets(deliveryReport, true);
                         else continue;
                     }
                     break;

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>netcoreapp3.1;net5.0</TargetFrameworks>
-    <Version>0.9.0</Version>
+    <Version>0.9.2</Version>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
     <AssemblyName>Stars</AssemblyName>

diff --git a/src/Stars.Services/StacResourceExtensions.cs b/src/Stars.Services/StacResourceExtensions.cs
@@ -10,11 +10,13 @@ namespace Terradue.Stars.Services
     public static class StacResourceExtensions
     {
 
-        public static void MergeAssets(this StacItem stacItem, IAssetsContainer assetContainer)
+        public static void MergeAssets(this StacItem stacItem, IAssetsContainer assetContainer, bool removeIfNotInContainer = false)
         {
+            if ( removeIfNotInContainer )
+                stacItem.Assets.Clear();
             foreach (var asset in assetContainer.Assets)
             {
-                if (stacItem.Assets.ContainsKey(asset.Key))
+                if (stacItem.Assets.ContainsKey(asset.Key) )
                 {
                     stacItem.Assets.Remove(asset.Key);
                 }

diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.1</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>0.9.0</Version>
+    <Version>0.9.2</Version>
     <!-- <VersionSuffix>beta.1</VersionSuffix> -->
     <AssemblyName>Terradue.Stars.Services</AssemblyName>
     <PackageId>Terradue.Stars</PackageId>