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

Add update name pattern matching

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-07-27 00:32:06 -06:00
parent 308619b01a
commit 3af47ab395
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/AppScaffolding/LibationScaffolding.cs
View File

@ -309,10 +309,10 @@ namespace AppScaffolding
LibraryCommands.BookUserDefinedItemCommitted += (_, books) => SearchEngineCommands.UpdateBooks(books); LibraryCommands.BookUserDefinedItemCommitted += (_, books) => SearchEngineCommands.UpdateBooks(books);
} }
public static UpgradeProperties GetLatestRelease() public static UpgradeProperties GetLatestRelease(string regexpattern = ".*")
{ {
// timed out // timed out
var latest = getLatestRelease(TimeSpan.FromSeconds(10)); var latest = getLatestRelease(TimeSpan.FromSeconds(10), regexpattern);
if (latest is null) if (latest is null)
return null; return null;
@ -337,11 +337,11 @@ 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) private static Octokit.Release getLatestRelease(TimeSpan timeout, string regexpattern)
{ {
try try
{ {
var task = System.Threading.Tasks.Task.Run(() => getLatestRelease()); var task = System.Threading.Tasks.Task.Run(() => getLatestRelease(regexpattern));
if (task.Wait(timeout)) if (task.Wait(timeout))
return task.Result; return task.Result;
@ -353,13 +353,15 @@ namespace AppScaffolding
} }
return null; return null;
} }
private static Octokit.Release getLatestRelease() private static Octokit.Release getLatestRelease(string regexpattern)
{ {
var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation")); var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
// https://octokitnet.readthedocs.io/en/latest/releases/ // https://octokitnet.readthedocs.io/en/latest/releases/
var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult(); var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
var latest = releases.First(r => !r.Draft && !r.Prerelease);
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)));
return latest; return latest;
} }
} }

2
Source/LibationWinForms/Program.cs
View File

@ -170,7 +170,7 @@ namespace LibationWinForms
try try
{ {
upgradeProperties = AppScaffolding.LibationScaffolding.GetLatestRelease(); upgradeProperties = AppScaffolding.LibationScaffolding.GetLatestRelease(@"Libation\.\d+\.\d+\.\d+-win.zip");
if (upgradeProperties is null) if (upgradeProperties is null)
return; return;
} }