tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix release getter

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-07-28 17:06:12 -06:00
parent 433974323c
commit 47729bf7b0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/AppScaffolding/LibationScaffolding.cs
View File

@ -320,8 +320,9 @@ namespace AppScaffolding
public static UpgradeProperties GetLatestRelease(ReleaseIdentifier releaseID = ReleaseIdentifier.WindowsClassic) public static UpgradeProperties GetLatestRelease(ReleaseIdentifier releaseID = ReleaseIdentifier.WindowsClassic)
{ {
// timed out // timed out
var latest = getLatestRelease(TimeSpan.FromSeconds(10), releaseID); (var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10), releaseID);
if (latest is null)
if (latest is null || zip is null)
return null; return null;
var latestVersionString = latest.TagName.Trim('v'); var latestVersionString = latest.TagName.Trim('v');
@ -333,7 +334,7 @@ namespace AppScaffolding
return null; return null;
// we have an update // we have an update
var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
var zipUrl = zip?.BrowserDownloadUrl; var zipUrl = zip?.BrowserDownloadUrl;
Log.Logger.Information("Update available: {@DebugInfo}", new Log.Logger.Information("Update available: {@DebugInfo}", new
@ -345,7 +346,7 @@ namespace AppScaffolding
return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease); return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
} }
private static Octokit.Release getLatestRelease(TimeSpan timeout, ReleaseIdentifier releaseID) private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout, ReleaseIdentifier releaseID)
{ {
try try
{ {
@ -359,9 +360,9 @@ namespace AppScaffolding
{ {
Log.Logger.Error(aggEx, "Checking for new version too often"); Log.Logger.Error(aggEx, "Checking for new version too often");
} }
return null; return (null, null);
} }
private static async System.Threading.Tasks.Task<Octokit.Release> getLatestRelease(ReleaseIdentifier releaseID) private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease(ReleaseIdentifier releaseID)
{ {
var ownerAccount = "rmcrackan"; var ownerAccount = "rmcrackan";
var repoName = "Libation"; var repoName = "Libation";
@ -377,8 +378,8 @@ namespace AppScaffolding
var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName); var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName);
var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase); var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
var latest = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name))); var latestRelease = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
return latest; return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
} }
} }