Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run SimpleFileSource fallback in a task to prevent UI lockup

Browse Source
This commit is contained in:
Caelan Sayler
2024-03-07 15:04:23 +00:00
parent e497a3d5ae
commit 60b525a22e
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Velopack/Sources/SimpleFileSource.cs
View File

@@ -34,27 +34,33 @@ namespace Velopack.Sources
// if a feed exists in the folder, let's use that.
var feedLoc = Path.Combine(BaseDirectory.FullName, Utility.GetVeloReleaseIndexName(channel));
if (File.Exists(feedLoc)) {
logger.Debug($"Found local file feed at '{feedLoc}'.");
return Task.FromResult(VelopackAssetFeed.FromJson(File.ReadAllText(feedLoc)));
}
// if not, we can try to iterate the packages, hopefully this is not a remote/network folder!
var list = new List<VelopackAsset>();
foreach (var pkg in Directory.EnumerateFiles(BaseDirectory.FullName, "*.nupkg")) {
try {
var zip = new ZipPackage(pkg);
var asset = VelopackAsset.FromZipPackage(zip);
if (asset?.Version != null) {
if (channel == null || zip?.Channel == null || zip?.Channel == channel) {
list.Add(asset);
} else {
logger.Warn($"Skipping local package '{pkg}' because it is not in the '{channel}' channel.");
logger.Warn($"No local feed found at '{feedLoc}', will search for *.nupkg in directory '{BaseDirectory.FullName}'.");
return Task.Run(() => {
// if not, we can try to iterate the packages, hopefully this is not a remote/network folder!
var list = new List<VelopackAsset>();
foreach (var pkg in Directory.EnumerateFiles(BaseDirectory.FullName, "*.nupkg")) {
try {
var zip = new ZipPackage(pkg);
var asset = VelopackAsset.FromZipPackage(zip);
if (asset?.Version != null) {
if (channel == null || zip?.Channel == null || zip?.Channel == channel) {
logger.Debug($"Read package '{pkg}' with version '{asset.Version}' in channel '{zip?.Channel}'.");
list.Add(asset);
} else {
logger.Warn($"Skipping local package '{pkg}' because it is not in the '{channel}' channel.");
}
}
} catch (Exception ex) {
logger.Warn(ex, $"Error while reading local package '{pkg}'.");
}
} catch (Exception ex) {
logger.Warn(ex, $"Error while reading local package '{pkg}'.");
}
}
return Task.FromResult(new VelopackAssetFeed { Assets = list.ToArray() });
return new VelopackAssetFeed { Assets = list.ToArray() };
});
}
/// <inheritdoc />