2.7
This commit is contained in:
parent
97448ac5fb
commit
5f2e2abdc6
|
|
@ -75,47 +75,49 @@
|
||||||
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
|
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
|
||||||
this.pictureBox2.Image = global::ARCHBLOXBootstrapper.Properties.Resources.archblox;
|
this.pictureBox2.Image = global::ARCHBLOXBootstrapper.Properties.Resources.archblox;
|
||||||
this.pictureBox2.InitialImage = global::ARCHBLOXBootstrapper.Properties.Resources.archblox;
|
this.pictureBox2.InitialImage = global::ARCHBLOXBootstrapper.Properties.Resources.archblox;
|
||||||
this.pictureBox2.Location = new System.Drawing.Point(3, 6);
|
this.pictureBox2.Location = new System.Drawing.Point(18, 17);
|
||||||
this.pictureBox2.Name = "pictureBox2";
|
this.pictureBox2.Name = "pictureBox2";
|
||||||
this.pictureBox2.Size = new System.Drawing.Size(46, 46);
|
this.pictureBox2.Size = new System.Drawing.Size(35, 42);
|
||||||
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||||
this.pictureBox2.TabIndex = 0;
|
this.pictureBox2.TabIndex = 0;
|
||||||
this.pictureBox2.TabStop = false;
|
this.pictureBox2.TabStop = false;
|
||||||
//
|
//
|
||||||
// label2
|
// label2
|
||||||
//
|
//
|
||||||
this.label2.AutoSize = true;
|
this.label2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||||
this.label2.Location = new System.Drawing.Point(55, 6);
|
this.label2.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
|
||||||
|
this.label2.Location = new System.Drawing.Point(58, 18);
|
||||||
this.label2.Name = "label2";
|
this.label2.Name = "label2";
|
||||||
this.label2.Size = new System.Drawing.Size(132, 14);
|
this.label2.Size = new System.Drawing.Size(237, 21);
|
||||||
this.label2.TabIndex = 1;
|
this.label2.TabIndex = 1;
|
||||||
this.label2.Text = "Checking for updates...";
|
this.label2.Text = "Checking for updates...";
|
||||||
|
this.label2.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
|
||||||
//
|
//
|
||||||
// progressBar2
|
// progressBar2
|
||||||
//
|
//
|
||||||
this.progressBar2.Location = new System.Drawing.Point(55, 29);
|
this.progressBar2.Location = new System.Drawing.Point(58, 51);
|
||||||
this.progressBar2.MarqueeAnimationSpeed = 10;
|
this.progressBar2.MarqueeAnimationSpeed = 10;
|
||||||
this.progressBar2.Name = "progressBar2";
|
this.progressBar2.Name = "progressBar2";
|
||||||
this.progressBar2.Size = new System.Drawing.Size(217, 23);
|
this.progressBar2.Size = new System.Drawing.Size(287, 26);
|
||||||
this.progressBar2.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
|
this.progressBar2.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
|
||||||
this.progressBar2.TabIndex = 2;
|
this.progressBar2.TabIndex = 2;
|
||||||
//
|
//
|
||||||
// ARCHBLOX
|
// ARCHBLOX
|
||||||
//
|
//
|
||||||
this.ClientSize = new System.Drawing.Size(286, 59);
|
this.ClientSize = new System.Drawing.Size(352, 136);
|
||||||
this.Controls.Add(this.progressBar2);
|
this.Controls.Add(this.progressBar2);
|
||||||
this.Controls.Add(this.label2);
|
this.Controls.Add(this.label2);
|
||||||
this.Controls.Add(this.pictureBox2);
|
this.Controls.Add(this.pictureBox2);
|
||||||
|
this.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
this.MaximizeBox = false;
|
this.MaximizeBox = false;
|
||||||
this.MinimizeBox = false;
|
this.MinimizeBox = false;
|
||||||
this.Name = "ARCHBLOX";
|
this.Name = "ARCHBLOX";
|
||||||
this.Text = "ARCHBLOX Installer";
|
this.Text = "ARCHBLOX Studio";
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
this.PerformLayout();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
26
Form2.cs
26
Form2.cs
|
|
@ -14,6 +14,7 @@ namespace ARCHBLOXBootstrapper
|
||||||
{
|
{
|
||||||
// set up variables
|
// set up variables
|
||||||
public bool IsCompleted = false;
|
public bool IsCompleted = false;
|
||||||
|
public bool exitafterarg = false;
|
||||||
public bool DontEvenBother = false;
|
public bool DontEvenBother = false;
|
||||||
private static WebClient wc = new WebClient();
|
private static WebClient wc = new WebClient();
|
||||||
private static ManualResetEvent handle = new ManualResetEvent(true);
|
private static ManualResetEvent handle = new ManualResetEvent(true);
|
||||||
|
|
@ -33,14 +34,27 @@ namespace ARCHBLOXBootstrapper
|
||||||
public ARCHBLOX()
|
public ARCHBLOX()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
// check for an internet connection first
|
||||||
|
try
|
||||||
|
{
|
||||||
|
wc.DownloadData("http://archblox.com/studio/version.txt");
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
MessageBox.Show("An error occoured while starting ARCHBLOX Studio\n\nDetails: HttpOpenRequest failed for GET http://archblox.com/studio/version.txt, Error ID: 6", "ARCHBLOX", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
Environment.Exit(0);
|
||||||
|
}
|
||||||
// setup paths
|
// setup paths
|
||||||
byte[] raw = wc.DownloadData("https://archblox.com/studio/version.txt");
|
byte[] raw = wc.DownloadData("http://archblox.com/studio/version.txt");
|
||||||
string webData = Encoding.UTF8.GetString(raw);
|
string webData = Encoding.UTF8.GetString(raw);
|
||||||
string version_string = webData;
|
string version_string = webData;
|
||||||
string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Studio\", @"Versions\");
|
string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Studio\", @"Versions\");
|
||||||
string clientPath = Path.Combine(folderPath, version_string + @"\");
|
string clientPath = Path.Combine(folderPath, version_string + @"\");
|
||||||
string filePath = Path.Combine(clientPath, Path.GetFileName(@"https://archblox.com/client/" + version_string + ".zip"));
|
string filePath = Path.Combine(clientPath, Path.GetFileName(@"http://archblox.com/client/" + version_string + ".zip"));
|
||||||
string studioPath = Path.Combine(clientPath, "ArchbloxStudio.exe");
|
string studioPath = Path.Combine(clientPath, "ArchbloxStudio.exe");
|
||||||
|
ARCHBLOXProtocol.ARCHBLOXURIProtocol.Register();
|
||||||
|
CreateShortcut();
|
||||||
|
// TODO: Make studio place launching URI.
|
||||||
if (Directory.Exists(clientPath) & System.IO.File.Exists(studioPath))
|
if (Directory.Exists(clientPath) & System.IO.File.Exists(studioPath))
|
||||||
{
|
{
|
||||||
// studio exists, create shortcut and launch studio
|
// studio exists, create shortcut and launch studio
|
||||||
|
|
@ -69,14 +83,12 @@ namespace ARCHBLOXBootstrapper
|
||||||
wc.DownloadProgressChanged += Client_DownloadProgressChanged;
|
wc.DownloadProgressChanged += Client_DownloadProgressChanged;
|
||||||
wc.DownloadFileCompleted += Client_DownloadFileCompleted;
|
wc.DownloadFileCompleted += Client_DownloadFileCompleted;
|
||||||
progressBar2.Style = ProgressBarStyle.Marquee;
|
progressBar2.Style = ProgressBarStyle.Marquee;
|
||||||
wc.DownloadProgressChanged += Client_DownloadProgressChanged;
|
|
||||||
wc.DownloadFileCompleted += Client_DownloadFileCompleted;
|
|
||||||
if (DontEvenBother == false)
|
if (DontEvenBother == false)
|
||||||
{
|
{
|
||||||
// install studio
|
// install studio
|
||||||
label2.Text = "Configuring ARCHBLOX...";
|
label2.Text = "Configuring ARCHBLOX...";
|
||||||
Directory.CreateDirectory(clientPath);
|
Directory.CreateDirectory(clientPath);
|
||||||
wc.DownloadFileAsync(new Uri(@"https://archblox.com/studio/" + version_string + ".zip"), filePath);
|
wc.DownloadFileAsync(new Uri(@"http://archblox.com/studio/" + version_string + ".zip"), filePath);
|
||||||
progressBar2.Style = ProgressBarStyle.Blocks;
|
progressBar2.Style = ProgressBarStyle.Blocks;
|
||||||
handle.WaitOne();
|
handle.WaitOne();
|
||||||
} else
|
} else
|
||||||
|
|
@ -97,12 +109,12 @@ namespace ARCHBLOXBootstrapper
|
||||||
{
|
{
|
||||||
// the download has completed, extract.zip, create shortcut and launch!
|
// the download has completed, extract.zip, create shortcut and launch!
|
||||||
IsCompleted = true;
|
IsCompleted = true;
|
||||||
byte[] raw = wc.DownloadData("https://archblox.com/studio/version.txt");
|
byte[] raw = wc.DownloadData("http://archblox.com/studio/version.txt");
|
||||||
string webData = Encoding.UTF8.GetString(raw);
|
string webData = Encoding.UTF8.GetString(raw);
|
||||||
string version_string = webData;
|
string version_string = webData;
|
||||||
string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Studio\", @"Versions\");
|
string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Studio\", @"Versions\");
|
||||||
string clientPath = Path.Combine(folderPath, version_string + @"\");
|
string clientPath = Path.Combine(folderPath, version_string + @"\");
|
||||||
string filePath = Path.Combine(clientPath, Path.GetFileName(@"https://archblox.com/studio/" + version_string + ".zip"));
|
string filePath = Path.Combine(clientPath, Path.GetFileName(@"http://archblox.com/studio/" + version_string + ".zip"));
|
||||||
string studioPath = Path.Combine(clientPath, "ArchbloxStudio.exe");
|
string studioPath = Path.Combine(clientPath, "ArchbloxStudio.exe");
|
||||||
ZipFile.ExtractToDirectory(filePath, clientPath);
|
ZipFile.ExtractToDirectory(filePath, clientPath);
|
||||||
System.IO.File.Delete(filePath);
|
System.IO.File.Delete(filePath);
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,18 @@ namespace ARCHBLOXBootstrapper
|
||||||
/// The main entry point for the application.
|
/// The main entry point for the application.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[STAThread]
|
[STAThread]
|
||||||
static void Main()
|
static void Main(string[] args)
|
||||||
{
|
{
|
||||||
Application.SetHighDpiMode(HighDpiMode.SystemAware);
|
Application.SetHighDpiMode(HighDpiMode.SystemAware);
|
||||||
Application.EnableVisualStyles();
|
Application.EnableVisualStyles();
|
||||||
Application.SetCompatibleTextRenderingDefault(false);
|
Application.SetCompatibleTextRenderingDefault(false);
|
||||||
|
if (args.Length > 0)
|
||||||
|
{
|
||||||
|
foreach (string s in args)
|
||||||
|
{
|
||||||
|
ARCHBLOXProtocol.SharedVariables.Arguments = s;
|
||||||
|
}
|
||||||
|
}
|
||||||
Application.Run(new ARCHBLOX());
|
Application.Run(new ARCHBLOX());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,43 @@
|
||||||
|
using System;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using System.Security.Permissions;
|
||||||
|
using Microsoft.Win32;
|
||||||
|
using System.Text;
|
||||||
|
using System.Net;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace ARCHBLOXProtocol
|
||||||
|
{
|
||||||
|
class SharedVariables
|
||||||
|
{
|
||||||
|
public static string Arguments = "";
|
||||||
|
};
|
||||||
|
internal static class ARCHBLOXURIProtocol
|
||||||
|
{
|
||||||
|
private static RegistryKey softwareClasses = Registry.CurrentUser.OpenSubKey("Software").OpenSubKey("Classes", true);
|
||||||
|
|
||||||
|
internal static void Register()
|
||||||
|
{
|
||||||
|
// credit to p0s0 for helping me with this
|
||||||
|
if (softwareClasses.OpenSubKey("archbloxstudio") == null) {} else { softwareClasses.DeleteSubKeyTree("archbloxstudio"); }
|
||||||
|
RegistryKey key = softwareClasses.CreateSubKey("archbloxstudio", true);
|
||||||
|
key.SetValue("", "URL: archbloxstudio Protocol");
|
||||||
|
key.SetValue("URL Protocol", "");
|
||||||
|
|
||||||
|
RegistryKey key1 = key.CreateSubKey("DefaultIcon", true);
|
||||||
|
key1.SetValue("", ARCHBLOXBootstrapper.Extensions.GetExecutablePath());
|
||||||
|
|
||||||
|
RegistryKey key2 = key.CreateSubKey("shell", true);
|
||||||
|
RegistryKey key3 = key2.CreateSubKey("open", true);
|
||||||
|
|
||||||
|
RegistryKey key4 = key3.CreateSubKey("command", true);
|
||||||
|
key4.SetValue("", "\"" + ARCHBLOXBootstrapper.Extensions.GetExecutablePath() + "\" %1");
|
||||||
|
|
||||||
|
key.Close();
|
||||||
|
key1.Close();
|
||||||
|
key2.Close();
|
||||||
|
key3.Close();
|
||||||
|
key4.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue