up
This commit is contained in:
@@ -19,7 +19,7 @@ internal sealed record UbuntuCursor(
|
||||
|
||||
public static UbuntuCursor Empty { get; } = new(null, EmptyIds, EmptyGuidList, EmptyGuidList, EmptyCache);
|
||||
|
||||
public static UbuntuCursor FromBson(DocumentObject? document)
|
||||
public static UbuntuCursor FromDocument(DocumentObject? document)
|
||||
{
|
||||
if (document is null || document.ElementCount == 0)
|
||||
{
|
||||
@@ -168,7 +168,7 @@ internal sealed record UbuntuCursor(
|
||||
{
|
||||
if (element.Value is DocumentObject entryDoc)
|
||||
{
|
||||
cache[element.Name] = UbuntuFetchCacheEntry.FromBson(entryDoc);
|
||||
cache[element.Name] = UbuntuFetchCacheEntry.FromDocument(entryDoc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ internal sealed record UbuntuFetchCacheEntry(string? ETag, DateTimeOffset? LastM
|
||||
public static UbuntuFetchCacheEntry FromDocument(StorageContracts.StorageDocument document)
|
||||
=> new(document.Etag, document.LastModified);
|
||||
|
||||
public static UbuntuFetchCacheEntry FromBson(DocumentObject document)
|
||||
public static UbuntuFetchCacheEntry FromDocument(DocumentObject document)
|
||||
{
|
||||
if (document is null || document.ElementCount == 0)
|
||||
{
|
||||
|
||||
@@ -144,7 +144,7 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
["ubuntu.published"] = notice.Published.ToString("O")
|
||||
};
|
||||
|
||||
var dtoDocument = ToBson(notice);
|
||||
var dtoDocument = ToDocument(notice);
|
||||
var sha256 = ComputeNoticeHash(dtoDocument);
|
||||
|
||||
var documentId = existing?.Id ?? Guid.NewGuid();
|
||||
@@ -217,7 +217,7 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
UbuntuNoticeDto notice;
|
||||
try
|
||||
{
|
||||
notice = FromBson(dto.Payload);
|
||||
notice = FromDocument(dto.Payload);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -409,7 +409,7 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
private async Task<UbuntuCursor> GetCursorAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
var state = await _stateRepository.TryGetAsync(SourceName, cancellationToken).ConfigureAwait(false);
|
||||
return state is null ? UbuntuCursor.Empty : UbuntuCursor.FromBson(state.Cursor);
|
||||
return state is null ? UbuntuCursor.Empty : UbuntuCursor.FromDocument(state.Cursor);
|
||||
}
|
||||
|
||||
private async Task UpdateCursorAsync(UbuntuCursor cursor, CancellationToken cancellationToken)
|
||||
@@ -420,12 +420,12 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
|
||||
private string ComputeNoticeHash(DocumentObject document)
|
||||
{
|
||||
var bytes = document.ToBson();
|
||||
var bytes = document.ToDocument();
|
||||
var hash = _hash.ComputeHash(bytes, HashAlgorithms.Sha256);
|
||||
return Convert.ToHexString(hash).ToLowerInvariant();
|
||||
}
|
||||
|
||||
private static DocumentObject ToBson(UbuntuNoticeDto notice)
|
||||
private static DocumentObject ToDocument(UbuntuNoticeDto notice)
|
||||
{
|
||||
var packages = new DocumentArray();
|
||||
foreach (var package in notice.Packages)
|
||||
@@ -473,7 +473,7 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
};
|
||||
}
|
||||
|
||||
private static UbuntuNoticeDto FromBson(DocumentObject document)
|
||||
private static UbuntuNoticeDto FromDocument(DocumentObject document)
|
||||
{
|
||||
var noticeId = document.GetValue("noticeId", string.Empty).AsString;
|
||||
var published = document.TryGetValue("published", out var publishedValue)
|
||||
@@ -488,8 +488,8 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
var title = document.GetValue("title", noticeId).AsString;
|
||||
var summary = document.GetValue("summary", string.Empty).AsString;
|
||||
|
||||
var cves = document.TryGetValue("cves", out var cveArray) && cveArray is DocumentArray cveBson
|
||||
? cveBson.OfType<DocumentValue>()
|
||||
var cves = document.TryGetValue("cves", out var cveArray) && cveArray is DocumentArray cveArr
|
||||
? cveArr.OfType<DocumentValue>()
|
||||
.Select(static value => value?.ToString())
|
||||
.Where(static value => !string.IsNullOrWhiteSpace(value))
|
||||
.Select(static value => value!)
|
||||
@@ -497,9 +497,9 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
: Array.Empty<string>();
|
||||
|
||||
var packages = new List<UbuntuReleasePackageDto>();
|
||||
if (document.TryGetValue("packages", out var packageArray) && packageArray is DocumentArray packageBson)
|
||||
if (document.TryGetValue("packages", out var packageArray) && packageArray is DocumentArray packageArr)
|
||||
{
|
||||
foreach (var element in packageBson.OfType<DocumentObject>())
|
||||
foreach (var element in packageArr.OfType<DocumentObject>())
|
||||
{
|
||||
packages.Add(new UbuntuReleasePackageDto(
|
||||
Release: element.GetValue("release", string.Empty).AsString,
|
||||
@@ -511,9 +511,9 @@ public sealed class UbuntuConnector : IFeedConnector
|
||||
}
|
||||
|
||||
var references = new List<UbuntuReferenceDto>();
|
||||
if (document.TryGetValue("references", out var referenceArray) && referenceArray is DocumentArray referenceBson)
|
||||
if (document.TryGetValue("references", out var referenceArray) && referenceArray is DocumentArray referenceArr)
|
||||
{
|
||||
foreach (var element in referenceBson.OfType<DocumentObject>())
|
||||
foreach (var element in referenceArr.OfType<DocumentObject>())
|
||||
{
|
||||
var url = element.GetValue("url", string.Empty).AsString;
|
||||
if (string.IsNullOrWhiteSpace(url))
|
||||
|
||||
Reference in New Issue
Block a user