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

Code Reviews

Browse Source
This commit is contained in:
Paul Betts
2016-04-20 10:32:08 -07:00
parent 7b294a9c69
commit e7aaab5f84
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Squirrel/ReleaseEntry.cs
View File

@@ -115,7 +115,7 @@ namespace Squirrel
string filename = m.Groups[2].Value;
// Split the base URL and the filename if an URI is provided,
// Split the base URL and the filename if an URI is provided,
// throws if a path is provided
string baseUrl = null;
string query = null;
@@ -137,7 +137,7 @@ namespace Squirrel
query = uri.Query;
}
}
if (filename.IndexOfAny(Path.GetInvalidFileNameChars()) > -1) {
throw new Exception("Filename can either be an absolute HTTP[s] URL, *or* a file name");
}
@@ -150,6 +150,9 @@ namespace Squirrel
public bool IsStagingMatch(Guid? userId)
{
// A "Staging match" is when a user falls into the affirmative
// bucket - i.e. if the staging is at 10%, this user is the one out
// of ten case.
if (!StagingPercentage.HasValue) return true;
if (!userId.HasValue) return false;

18
src/Squirrel/UpdateManager.CheckForUpdates.cs
View File

@@ -23,7 +23,7 @@ namespace Squirrel
public async Task<UpdateInfo> CheckForUpdate(
string localReleaseFile,
string updateUrlOrPath,
bool ignoreDeltaUpdates = false,
bool ignoreDeltaUpdates = false,
Action<int> progress = null,
IFileDownloader urlDownloader = null)
{
@@ -45,11 +45,11 @@ namespace Squirrel
string releaseFile;
var latestLocalRelease = localReleases.Count() > 0 ?
localReleases.MaxBy(x => x.Version).First() :
var latestLocalRelease = localReleases.Count() > 0 ?
localReleases.MaxBy(x => x.Version).First() :
default(ReleaseEntry);
// Fetch the remote RELEASES file, whether it's a local dir or an
// Fetch the remote RELEASES file, whether it's a local dir or an
// HTTP URL
if (Utility.IsHttpUrl(updateUrlOrPath)) {
if (updateUrlOrPath.EndsWith("/")) {
@@ -89,7 +89,7 @@ namespace Squirrel
if (!Directory.Exists(updateUrlOrPath)) {
var message = String.Format(
"The directory {0} does not exist, something is probably broken with your application",
"The directory {0} does not exist, something is probably broken with your application",
updateUrlOrPath);
throw new Exception(message);
@@ -98,7 +98,7 @@ namespace Squirrel
var fi = new FileInfo(Path.Combine(updateUrlOrPath, "RELEASES"));
if (!fi.Exists) {
var message = String.Format(
"The file {0} does not exist, something is probably broken with your application",
"The file {0} does not exist, something is probably broken with your application",
fi.FullName);
this.Log().Warn(message);
@@ -118,7 +118,7 @@ namespace Squirrel
}
var ret = default(UpdateInfo);
var remoteReleases = ReleaseEntry.ParseReleaseFileAndApplyStaging(releaseFile, stagingId);
var remoteReleases = ReleaseEntry.ParseReleaseFileAndApplyStaging(releaseFile, stagingId);
progress(66);
if (!remoteReleases.Any()) {
@@ -126,7 +126,7 @@ namespace Squirrel
}
ret = determineUpdateInfo(localReleases, remoteReleases, ignoreDeltaUpdates);
progress(100);
return ret;
}
@@ -192,7 +192,7 @@ namespace Squirrel
this.Log().Info("Using existing staging user ID: {0}", ret.ToString());
return ret;
} catch (Exception ex) {
this.Log().InfoException("Couldn't read staging user ID, creating a blank one", ex);
this.Log().DebugException("Couldn't read staging user ID, creating a blank one", ex);
}
var prng = new Random();