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.

Sign up for GitHub

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

Find releases past all-filtered-out pages on GitHub #4319

Merged
merged 1 commit into from
Feb 22, 2025
Merged

Find releases past all-filtered-out pages on GitHub #4319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions Netkan/Sources/Github/GithubApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,21 @@ public IEnumerable<GithubRelease> GetAllReleases(GithubRef reference, bool? useP
break;
}
Log.Debug("Parsing JSON...");
var ghReleases = JsonConvert.DeserializeObject<GithubRelease[]>(json)
?.Where(ghRel => ReleaseTypeMatches(usePrerelease, ghRel.PreRelease)
// Skip releases without assets
&& (reference.UseSourceArchive
|| (ghRel.Assets != null
&& ghRel.Assets.Any(reference.FilterMatches))))
// Insurance against GitHub returning them in the wrong order
.OrderByDescending(ghRel => ghRel.PublishedAt)
.ToArray()
?? Array.Empty<GithubRelease>();
if (ghReleases.Length < 1)
var releases = JsonConvert.DeserializeObject<GithubRelease[]>(json)
?? Array.Empty<GithubRelease>();
if (releases.Length < 1)
{
// That's all folks!
break;
}

foreach (var ghRel in ghReleases)
foreach (var ghRel in releases.Where(r => ReleaseTypeMatches(usePrerelease, r.PreRelease)
// Skip releases without assets
&& (reference.UseSourceArchive
|| (r.Assets != null
&& r.Assets.Any(reference.FilterMatches))))
// Insurance against GitHub returning them in the wrong order
.OrderByDescending(r => r.PublishedAt))
{
yield return ghRel;
}
Expand Down
12 changes: 12 additions & 0 deletions Netkan/Sources/Github/GithubRelease.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,17 @@ public sealed class GithubRelease
[JsonProperty("prerelease")]
[DefaultValue(false)]
public bool PreRelease { get; set; } = false;

[JsonIgnore]
public GithubReleaseAsset? SourceArchiveAsset
=> Tag is ModuleVersion ver
? new GithubReleaseAsset()
{
Name = ver.ToString(),
Download = SourceArchive,
Updated = PublishedAt,
Uploader = Author,
}
: null;
}
}
13 changes: 4 additions & 9 deletions Netkan/Transformers/GithubTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,13 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions? opts
bool returnedAny = false;
foreach (var rel in releases)
{
if (ghRef.UseSourceArchive && rel.Tag != null)
if (ghRef.UseSourceArchive
&& rel.Tag != null
&& rel.SourceArchiveAsset is GithubReleaseAsset srcAsset)
{
returnedAny = true;
yield return TransformOne(metadata, metadata.Json(), ghRef, ghRepo, rel,
new GithubReleaseAsset()
{
Name = rel.Tag.ToString(),
Download = rel.SourceArchive,
Updated = rel.PublishedAt,
Uploader = rel.Author,
},
rel.Tag.ToString());
srcAsset, rel.Tag.ToString());
}
else if (ghRef.VersionFromAsset != null && rel.Assets != null)
{
Expand Down