Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.24.7 #61

Merged
merged 4 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Stars.Console/Operations/CopyOperation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Console/Terradue.Stars.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Stars.Data/Model/Metadata/Inpe/InpeMetadataExtractor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Data/Terradue.Stars.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Data/ThirdParty/Publication/GeosquareService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Services/Store/StacStoreService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ private void PrepareStacCollectionForDestination(StacCollectionNode stacCollecti
else
MakeAssetUriRelative(stacCollectionNode, destination);
}


public void PrepareStacItemForDestination(StacItemNode stacItemNode, IDestination destination)
{
Expand Down
Loading