diff --git a/MediaBrowser.Installer/Code/Images/mb3logo800.png b/MediaBrowser.Installer/Code/Images/mb3logo800.png
new file mode 100644
index 0000000000..fbc769a6f1
Binary files /dev/null and b/MediaBrowser.Installer/Code/Images/mb3logo800.png differ
diff --git a/MediaBrowser.Installer/MainWindow.xaml b/MediaBrowser.Installer/MainWindow.xaml
index edd5188254..3e040d3e03 100644
--- a/MediaBrowser.Installer/MainWindow.xaml
+++ b/MediaBrowser.Installer/MainWindow.xaml
@@ -2,11 +2,15 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Code="clr-namespace:MediaBrowser.Installer.Code" x:Class="MediaBrowser.Installer.MainWindow"
- Title="Install Media Browser Server" Height="338.057" Width="667.453" ResizeMode="NoResize">
-
-
-
-
-
-
+ Title="Install Media Browser Server" Height="383.481" Width="663.057" ResizeMode="NoResize" WindowStyle="None">
+
+
+
+
+
+
+
+
+
+
diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs
index 5990becce9..5a96c1afbc 100644
--- a/MediaBrowser.Installer/MainWindow.xaml.cs
+++ b/MediaBrowser.Installer/MainWindow.xaml.cs
@@ -1,13 +1,16 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
using System.Net;
using System.Threading.Tasks;
using System.Windows;
using System.Web;
using System.Linq;
+using Ionic.Zip;
using MediaBrowser.Installer.Code;
using ServiceStack.Text;
-using ServiceStack.Text.Json;
+using IWshRuntimeLibrary;
namespace MediaBrowser.Installer
{
@@ -16,15 +19,23 @@ namespace MediaBrowser.Installer
///
public partial class MainWindow : Window
{
- protected PackageVersionClass PackageClass;
- protected Version PackageVersion;
+ protected PackageVersionClass PackageClass = PackageVersionClass.Release;
+ protected Version PackageVersion = new Version(10,0,0,0);
protected string PackageName = "MBServer";
+ protected string RootSuffix = "-Server";
+ protected string TargetExe = "MediaBrowser.ServerApplication.exe";
+ protected string FriendlyName = "Media Browser Server";
+ protected string RootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MediaBrowser-Server");
+
+ protected bool SystemClosing = false;
+
+ protected string TempLocation = Path.Combine(Path.GetTempPath(), "MediaBrowser");
public MainWindow()
{
GetArgs();
InitializeComponent();
- StartInstall();
+ DoInstall();
}
private void btnCancel_Click(object sender, RoutedEventArgs e)
@@ -34,13 +45,24 @@ namespace MediaBrowser.Installer
protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
{
- if (MessageBox.Show("Cancel Installation - Are you sure?", "Cancel", MessageBoxButton.YesNo) == MessageBoxResult.No)
+ if (!SystemClosing && MessageBox.Show("Cancel Installation - Are you sure?", "Cancel", MessageBoxButton.YesNo) == MessageBoxResult.No)
{
e.Cancel = true;
}
+ ClearTempLocation(TempLocation);
base.OnClosing(e);
}
+ protected void SystemClose(string message = null)
+ {
+ if (message != null)
+ {
+ MessageBox.Show(message, "Error");
+ }
+ SystemClosing = true;
+ this.Close();
+ }
+
protected void GetArgs()
{
var args = AppDomain.CurrentDomain.SetupInformation.ActivationArguments;
@@ -53,21 +75,70 @@ namespace MediaBrowser.Installer
// fill in our arguments if there
PackageName = parameters["package"] ?? "MBServer";
PackageClass = (PackageVersionClass)Enum.Parse(typeof(PackageVersionClass), parameters["class"] ?? "Release");
- PackageVersion = new Version(parameters["version"].ValueOrDefault("0.0.0.1"));
+ PackageVersion = new Version(parameters["version"].ValueOrDefault("10.0.0.0"));
+ RootSuffix = parameters["suffix"] ?? "-Server";
+ TargetExe = parameters["target"] ?? "MediaBrowser.ServerApplication.exe";
+ FriendlyName = parameters["name"] ?? PackageName;
+ RootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "MediaBrowser" + RootSuffix);
}
- protected async Task StartInstall()
+ ///
+ /// Execute the install process
+ ///
+ ///
+ protected async Task DoInstall()
{
- lblStatus.Content = "Downloading Server Package...";
+ lblStatus.Content = "Downloading "+FriendlyName+"...";
dlAnimation.StartAnimation();
prgProgress.Value = 0;
prgProgress.Visibility = Visibility.Visible;
+ // Download
var archive = await DownloadPackage();
+ dlAnimation.StopAnimation();
+ prgProgress.Visibility = btnCancel.Visibility = Visibility.Hidden;
+
+ // Extract
+ lblStatus.Content = "Extracting Package...";
+ try
+ {
+ ExtractPackage(archive);
+ }
+ catch (Exception e)
+ {
+ SystemClose("Error Extracting - " + e.GetType().FullName + "\n\n" + e.Message);
+ }
+
+ // Create shortcut
+ var fullPath = Path.Combine(RootPath, "System", TargetExe);
+ try
+ {
+ CreateShortcut(fullPath);
+ }
+ catch (Exception e)
+ {
+ SystemClose("Error Creating Shortcut - "+e.GetType().FullName+"\n\n"+e.Message);
+ }
+
+ // And run
+ try
+ {
+ Process.Start(fullPath);
+ }
+ catch (Exception e)
+ {
+ SystemClose("Error Executing - "+fullPath+ " "+e.GetType().FullName+"\n\n"+e.Message);
+ }
+
+ SystemClose();
}
+ ///
+ /// Download our specified package to an archive in a temp location
+ ///
+ /// The fully qualified name of the downloaded package
protected async Task DownloadPackage()
{
using (var client = new WebClient())
@@ -78,15 +149,89 @@ namespace MediaBrowser.Installer
var json = await client.DownloadStringTaskAsync("http://www.mb3admin.com/admin/service/package/retrieveAll?name="+PackageName);
var packages = JsonSerializer.DeserializeFromString>(json);
- var version = packages[0].versions.Where(v => v.classification == PackageClass).OrderByDescending(v => v.version).FirstOrDefault();
+ var version = packages[0].versions.Where(v => v.classification == PackageClass).OrderByDescending(v => v.version).FirstOrDefault(v => v.version <= PackageVersion);
+ if (version == null)
+ {
+ SystemClose("Could not locate download package. Aborting.");
+ return null;
+ }
+ var archiveFile = Path.Combine(PrepareTempLocation(), version.targetFilename);
+
+ // setup download progress and download the package
+ client.DownloadProgressChanged += DownloadProgressChanged;
+ await client.DownloadFileTaskAsync(version.sourceUrl, archiveFile);
+ return archiveFile;
}
catch (Exception e)
{
- MessageBox.Show(e.Message);
+ SystemClose(e.GetType().FullName + "\n\n" + e.Message);
}
}
return "";
}
+
+ void DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+ {
+ prgProgress.Value = e.ProgressPercentage;
+ }
+
+ ///
+ /// Extract the provided archive to our program root
+ /// It is assumed the archive is a zip file relative to that root (with all necessary sub-folders)
+ ///
+ ///
+ protected void ExtractPackage(string archive)
+ {
+ using (var fileStream = System.IO.File.OpenRead(archive))
+ {
+ using (var zipFile = ZipFile.Read(fileStream))
+ {
+ zipFile.ExtractAll(RootPath, ExtractExistingFileAction.OverwriteSilently);
+ }
+ }
+
+ }
+
+ ///
+ /// Create a shortcut in the current user's start menu
+ /// Only do current user to avoid need for admin elevation
+ ///
+ ///
+ protected void CreateShortcut(string targetExe)
+ {
+ // get path to all users start menu
+ var shell = new WshShell();
+ var startMenu = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Media Browser");
+ if (!Directory.Exists(startMenu)) Directory.CreateDirectory(startMenu);
+ var myShortcut = (IWshShortcut)shell.CreateShortcut(Path.Combine(startMenu, "Media Browser Server.lnk"));
+ myShortcut.TargetPath = targetExe;
+ myShortcut.Description = "Run " + FriendlyName;
+ myShortcut.Save();
+
+ }
+
+ ///
+ /// Prepare a temporary location to download to
+ ///
+ /// The path to the temporary location
+ protected string PrepareTempLocation()
+ {
+ ClearTempLocation(TempLocation);
+ Directory.CreateDirectory(TempLocation);
+ return TempLocation;
+ }
+
+ ///
+ /// Clear out (delete recursively) the supplied temp location
+ ///
+ ///
+ protected void ClearTempLocation(string location)
+ {
+ if (Directory.Exists(location))
+ {
+ Directory.Delete(location, true);
+ }
+ }
}
}
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index f1a366d49b..f845347986 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -172,6 +172,20 @@
+
+
+
+
+
+ {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}
+ 1
+ 0
+ 0
+ tlbimp
+ False
+ True
+
+