Skip to content

Commit 766ee5b

Browse files
committed
Merge branch 'release/2.25.5'
2 parents 3015332 + 0d265b1 commit 766ee5b

25 files changed

+3240
-27
lines changed

src/Stars.Console/Operations/CopyOperation.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Threading.Tasks;
1111
using McMaster.Extensions.CommandLineUtils;
1212
using Microsoft.Extensions.DependencyInjection;
13+
using Microsoft.Extensions.Logging;
1314
using Newtonsoft.Json;
1415
using Stac;
1516
using Terradue.Stars.Interface;
@@ -192,7 +193,7 @@ private async Task<object> CopyItemAsync(IItem item, IRouter router, object stat
192193
throw new InvalidDataException(string.Format("Impossible to translate item {0} into STAC.", item.Uri));
193194
}
194195

195-
logger.Output(string.Format("Copy item {0} from {1}", stacItemNode.Id, item.Uri));
196+
logger.LogInformation(string.Format("Copy item {0} from {1}", stacItemNode.Id, item.Uri));
196197

197198
// We update the destination in case a new router updated the route
198199
IDestination destination = operationState.CurrentDestination.To(stacItemNode);
@@ -224,14 +225,14 @@ private async Task<object> CopyItemAsync(IItem item, IRouter router, object stat
224225
IResource supplierNode = null;
225226
try
226227
{
227-
logger.Output(string.Format("[{0}] Searching for {1}", supplier.Value.Id, stacItemNode.Uri.ToString()));
228+
logger.LogInformation(string.Format("[{0}] Searching for {1}", supplier.Value.Id, stacItemNode.Uri.ToString()));
228229
supplierNode = await supplier.Value.SearchForAsync(stacItemNode, ct);
229230
if (supplierNode == null && supplierNode is not IAssetsContainer)
230231
{
231-
logger.Output(string.Format("[{0}] --> no supply possible", supplier.Value.Id));
232+
logger.LogInformation(string.Format("[{0}] --> no supply possible", supplier.Value.Id));
232233
continue;
233234
}
234-
logger.Output(string.Format("[{0}] resource found at {1} [{2}]", supplier.Value.Id, supplierNode.Uri, supplierNode.ContentType));
235+
logger.LogInformation(string.Format("[{0}] resource found at {1} [{2}]", supplier.Value.Id, supplierNode.Uri, supplierNode.ContentType));
235236
}
236237
catch (Exception e)
237238
{
@@ -281,7 +282,7 @@ private async Task<object> CopyCollectionAsync(ICollection collection, IRouter r
281282
throw new InvalidDataException(string.Format("Impossible to translate item {0} into STAC.", collection.Uri));
282283
}
283284

284-
logger.Output(string.Format("Copy collection {0} from {1}", stacCollectionNode.Id, collection.Uri));
285+
logger.LogInformation(string.Format("Copy collection {0} from {1}", stacCollectionNode.Id, collection.Uri));
285286

286287
// We update the destination in case a new router updated the route
287288
IDestination destination = operationState.CurrentDestination.To(stacCollectionNode);

src/Stars.Console/Terradue.Stars.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFrameworks>net6.0</TargetFrameworks>
5-
<Version>2.25.4</Version>
5+
<Version>2.25.5</Version>
66
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
77
<Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
88
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

src/Stars.Data.Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20220320_112827_SN20_L1_SR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
"roles": [
381381
"visual"
382382
],
383-
"title": "3-Band Visual",
383+
"title": "3-Band Visual (L3)",
384384
"href": "data/Flood_Mozambique-product/rasters/20220320_112827_SN20_L3_SR_MS_0.tif",
385385
"eo:bands": [
386386
{

src/Stars.Data.Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20231030_200817_SN29_L1_SR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
"roles": [
376376
"visual"
377377
],
378-
"title": "3-Band Visual",
378+
"title": "3-Band Visual (L3)",
379379
"href": "data/Landslide_Storm_Hurricane_in_Mexico_6-product/rasters/20231030_200817_SN29_L3_SR_MS_0.tif",
380380
"eo:bands": [
381381
{

src/Stars.Data.Tests/Resources/SATELLOGIC/NEWSAT/MetadataExtractorsTests_20240314_172620_SN30_L1_SR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
"roles": [
180180
"visual"
181181
],
182-
"title": "3-Band Visual",
182+
"title": "3-Band Visual (L3)",
183183
"href": "data/20240314_172620_SN30_L1_SR/20240314_172620_SN30_L3_SR_MS_0.tif",
184184
"eo:bands": [
185185
{

0 commit comments

Comments
 (0)