empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto updates: Fixed issue with MesenUpdater being started twice + Added Sha1 hash check

Browse source
This commit is contained in:
Souryo 2016-02-10 18:58:13 -05:00
parent 1647f0c8c0
commit 2e7191d9c0
4 changed files with 76 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
GUI.NET/Forms/frmMain.cs
View file

@ -1052,10 +1052,14 @@ namespace Mesen.GUI.Forms
Version currentVersion = new Version(InteropEmu.GetMesenVersion());
Version latestVersion = new Version(xmlDoc.SelectSingleNode("VersionInfo/LatestVersion").InnerText);
string changeLog = xmlDoc.SelectSingleNode("VersionInfo/ChangeLog").InnerText;
string fileHash = xmlDoc.SelectSingleNode("VersionInfo/Sha1Hash").InnerText;
if(latestVersion > currentVersion) {
this.BeginInvoke((MethodInvoker)(() => {
frmUpdatePrompt frmUpdate = new frmUpdatePrompt(currentVersion, latestVersion, changeLog);
frmUpdate.ShowDialog(null, this);
frmUpdatePrompt frmUpdate = new frmUpdatePrompt(currentVersion, latestVersion, changeLog, fileHash);
if(frmUpdate.ShowDialog(null, this) == DialogResult.OK) {
Application.Exit();
}
}));
} else if(displayResult) {
MessageBox.Show("You are running the latest version of Mesen.", "Mesen", MessageBoxButtons.OK, MessageBoxIcon.Information);

1
GUI.NET/Forms/frmUpdatePrompt.Designer.cs generated
View file

@ -161,6 +161,7 @@
this.btnUpdate.TabIndex = 0;
this.btnUpdate.Text = "Update";
this.btnUpdate.UseVisualStyleBackColor = true;
this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
//
// frmUpdatePrompt
//

31
GUI.NET/Forms/frmUpdatePrompt.cs
View file

@ -6,6 +6,7 @@ using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@ -15,10 +16,14 @@ namespace Mesen.GUI.Forms
{
public partial class frmUpdatePrompt : BaseForm
{
public frmUpdatePrompt(Version currentVersion, Version latestVersion, string changeLog)
private string _fileHash;
public frmUpdatePrompt(Version currentVersion, Version latestVersion, string changeLog, string fileHash)
{
InitializeComponent();
_fileHash = fileHash;
lblCurrentVersionString.Text = currentVersion.ToString();
lblLatestVersionString.Text = latestVersion.ToString();
txtChangelog.Text = changeLog.Replace("\n", Environment.NewLine);
@ -31,10 +36,8 @@ namespace Mesen.GUI.Forms
btnUpdate.Focus();
}
protected override void OnFormClosed(FormClosedEventArgs e)
private void btnUpdate_Click(object sender, EventArgs e)
{
base.OnFormClosed(e);
if(DialogResult == DialogResult.OK) {
string destFilePath = Process.GetCurrentProcess().MainModule.FileName;
string srcFilePath = Path.Combine(ConfigManager.DownloadFolder, "Mesen." + lblLatestVersionString.Text + ".exe");
string backupFilePath = Path.Combine(ConfigManager.BackupFolder, "Mesen." + lblCurrentVersionString.Text + ".exe");
@ -43,11 +46,29 @@ namespace Mesen.GUI.Forms
if(!string.IsNullOrWhiteSpace(srcFilePath)) {
frmDownloadProgress frmDownload = new frmDownloadProgress("http://www.mesen.ca/Services/GetLatestVersion.php?a=download&&p=win", srcFilePath);
if(frmDownload.ShowDialog() == DialogResult.OK) {
FileInfo fileInfo = new FileInfo(srcFilePath);
if(fileInfo.Length > 0 && GetSha1Hash(srcFilePath) == _fileHash) {
Process.Start(updateHelper, string.Format("\"{0}\" \"{1}\" \"{2}\"", srcFilePath, destFilePath, backupFilePath));
Application.Exit();
} else {
//Download failed, mismatching hashes
MessageBox.Show("Download failed - the file appears to be corrupted. Please visit the Mesen website to download the latest version manually.", "Mesen", MessageBoxButtons.OK, MessageBoxIcon.Error);
DialogResult = DialogResult.Cancel;
}
}
}
}
private string GetSha1Hash(string filename)
{
using(SHA1Managed sha1 = new SHA1Managed()) {
byte[] hash = sha1.ComputeHash(File.ReadAllBytes(filename));
var sb = new StringBuilder(hash.Length * 2);
foreach(byte b in hash) {
sb.Append(b.ToString("x2"));
}
return sb.ToString();
}
}
}
}

4
UpdateHelper/Program.cs
View file

@ -13,6 +13,7 @@ namespace MesenUpdater
{
static void Main(string[] args)
{
if(args.Length > 2) {
string srcFile = args[0];
string destFile = args[1];
string backupDestFile = args[2];
@ -53,6 +54,9 @@ namespace MesenUpdater
}
}
Process.Start(destFile);
} else {
MessageBox.Show("Please run Mesen directly to update.", "Mesen");
}
}
}
}