nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Making auto-update process more robust. Added secondary download attempt and connection error handling.

Browse source
This commit is contained in:
Kevin Pope 2014-08-16 11:18:12 -07:00
parent 23842ae901
commit 4c422cbf20
2 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

56
AboutPage/UpdateControlData.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl
public enum UpdateRequestType { UserRequested, Automatic, FirstTimeEver };
UpdateRequestType updateRequestType;
public enum UpdateStatusStates { MayBeAvailable, CheckingForUpdate, UpdateAvailable, UpdateDownloading, ReadyToInstall, UpToDate };
public enum UpdateStatusStates { MayBeAvailable, CheckingForUpdate, UpdateAvailable, UpdateDownloading, ReadyToInstall, UpToDate, UnableToConnectToServer };
bool WaitingToCompleteTransaction()
{
@ -227,19 +227,31 @@ namespace MatterHackers.MatterControl
SetUpdateStatus(UpdateStatusStates.UpToDate);
}
int downloadAttempts = 0;
string updateFileName;
public void InitiateUpdateDownload()
{
downloadAttempts = 0;
DownloadUpdate();
}
void DownloadUpdate()
{
if (!WaitingToCompleteTransaction())
{
string downloadToken = ApplicationSettings.Instance.get("CurrentBuildToken");
if (downloadToken == null)
{
#if DEBUG
throw new Exception("Build token should not be null");
#endif
//
}
else
{
downloadAttempts++;
SetUpdateStatus(UpdateStatusStates.UpdateDownloading);
string downloadUri = string.Format("https://mattercontrol.appspot.com/downloads/development/{0}", ApplicationSettings.Instance.get("CurrentBuildToken"));
@ -264,7 +276,7 @@ namespace MatterHackers.MatterControl
System.IO.Directory.CreateDirectory(updateFileLocation);
}
string updateFileName = Path.Combine(updateFileLocation, string.Format("{0}.{1}", downloadToken, InstallerExtension));
updateFileName = Path.Combine(updateFileLocation, string.Format("{0}.{1}", downloadToken, InstallerExtension));
webClient = new WebClient();
webClient.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadCompleted);
@ -285,13 +297,41 @@ namespace MatterHackers.MatterControl
UpdateStatusChanged.CallEvents(this, e);
});
}
void DownloadCompleted(object sender, EventArgs e)
void DownloadCompleted(object sender, AsyncCompletedEventArgs e)
{
UiThread.RunOnIdle((state) =>
if (e.Error != null)
{
SetUpdateStatus(UpdateStatusStates.ReadyToInstall);
});
//Delete empty/partially downloaded file
if (System.IO.File.Exists(updateFileName))
{
System.IO.File.Delete(updateFileName);
}
//Try downloading again - one time
if (downloadAttempts == 1)
{
DownloadUpdate();
}
else
{
UiThread.RunOnIdle((state) =>
{
SetUpdateStatus(UpdateStatusStates.UnableToConnectToServer);
});
}
}
else
{
UiThread.RunOnIdle((state) =>
{
SetUpdateStatus(UpdateStatusStates.ReadyToInstall);
});
}
webClient.Dispose();
}

7
AboutPage/UpdateControlView.cs
View file

@ -154,6 +154,13 @@ namespace MatterHackers.MatterControl
checkUpdateLink.Visible = false;
break;
case UpdateControlData.UpdateStatusStates.UnableToConnectToServer:
updateStatusText.Text = "Oops! Unable to connect to server.".Localize();
downloadUpdateLink.Visible = false;
installUpdateLink.Visible = false;
checkUpdateLink.Visible = true;
break;
case UpdateControlData.UpdateStatusStates.UpdateAvailable:
updateStatusText.Text = string.Format("There is a recommended update available.".Localize());
downloadUpdateLink.Visible = true;