zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fixed loader issue for SilentInstaller;

Browse source 
- Updated file version to 1.2.1.1;
This commit is contained in:
ptsurbeleu 2012-05-06 14:28:25 -07:00
parent af8e0ed935
commit 6ff01b5adf
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel.Installer/Sources/VersionInfo.cs
View file

@ -37,5 +37,5 @@ using System.Reflection;
[assembly: AssemblyCompany("Outercurve Foundation")] [assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")] [assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.1.0")] [assembly: AssemblyVersion("1.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.0")] [assembly: AssemblyFileVersion("1.2.1.1")]
[assembly: AssemblyInformationalVersion("1.2.1")] [assembly: AssemblyInformationalVersion("1.2.1")]

4
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Loader.cs
View file

@ -80,7 +80,7 @@ namespace WebsitePanel.Installer.Core
private WebClient fileLoader; private WebClient fileLoader;
public BitlyLoader(string remoteFile) internal BitlyLoader(string remoteFile)
: base(remoteFile) : base(remoteFile)
{ {
InitFileLoader(); InitFileLoader();
@ -175,7 +175,7 @@ namespace WebsitePanel.Installer.Core
public event EventHandler<LoaderEventArgs<Int32>> ProgressChanged; public event EventHandler<LoaderEventArgs<Int32>> ProgressChanged;
public event EventHandler<EventArgs> OperationCompleted; public event EventHandler<EventArgs> OperationCompleted;
public Loader(string remoteFile) internal Loader(string remoteFile)
{ {
this.remoteFile = remoteFile; this.remoteFile = remoteFile;
} }

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
View file

Binary file not shown.

18
WebsitePanel.Installer/Sources/WebsitePanel.SilentInstaller/Program.cs
View file

@ -337,10 +337,13 @@ namespace WebsitePanel.SilentInstaller
string installerPath = Utils.GetDbString(row["InstallerPath"]); string installerPath = Utils.GetDbString(row["InstallerPath"]);
string installerType = Utils.GetDbString(row["InstallerType"]); string installerType = Utils.GetDbString(row["InstallerType"]);
// Get appropriate loader to download the app distributive
var loader = LoaderFactory.CreateFileLoader(fileName);
// Mimic synchronous download process for the console app
AutoResetEvent autoEvent = new AutoResetEvent(false);
try try
{ {
// download installer
var loader = new Loader(fileName);
// //
loader.OperationCompleted += new EventHandler<EventArgs>((object sender, EventArgs e) => loader.OperationCompleted += new EventHandler<EventArgs>((object sender, EventArgs e) =>
{ {
@ -374,25 +377,26 @@ namespace WebsitePanel.SilentInstaller
Log.WriteEnd("Installer finished"); Log.WriteEnd("Installer finished");
// Remove temporary directory // Remove temporary directory
FileUtils.DeleteTempDirectory(); FileUtils.DeleteTempDirectory();
// We are done
autoEvent.Set();
}); });
// TODO: Add cleanup for events.
loader.OperationFailed += new EventHandler<LoaderEventArgs<Exception>>(loader_OperationFailed); loader.OperationFailed += new EventHandler<LoaderEventArgs<Exception>>(loader_OperationFailed);
loader.ProgressChanged += new EventHandler<LoaderEventArgs<int>>(loader_ProgressChanged); loader.ProgressChanged += new EventHandler<LoaderEventArgs<int>>(loader_ProgressChanged);
loader.StatusChanged += new EventHandler<LoaderEventArgs<string>>(loader_StatusChanged); loader.StatusChanged += new EventHandler<LoaderEventArgs<string>>(loader_StatusChanged);
// //
loader.LoadAppDistributive(); loader.LoadAppDistributive();
// Wait until the download is complete
autoEvent.WaitOne();
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.WriteError("Installer error", ex); Log.WriteError("Installer error", ex);
//AppContext.AppForm.ShowError(ex);
} }
finally finally
{ {
//this.componentSettingsXml = null; autoEvent.Set();
//this.componentCode = null;
} }
} }
static void loader_StatusChanged(object sender, LoaderEventArgs<string> e) static void loader_StatusChanged(object sender, LoaderEventArgs<string> e)