Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
LukePulverenti 2013-03-13 18:33:17 -04:00
commit f9dd970bf8
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs
View File

@ -21,10 +21,15 @@ namespace MediaBrowser.Common.Implementations.Updates
// Use our installer passing it the specific archive // Use our installer passing it the specific archive
// We need to copy to a temp directory and execute it there // We need to copy to a temp directory and execute it there
var source = Path.Combine(appPaths.ProgramSystemPath, UpdaterExe); var source = Path.Combine(appPaths.ProgramSystemPath, UpdaterExe);
var target = Path.Combine(Path.GetTempPath(), UpdaterExe); var tempUpdater = Path.Combine(Path.GetTempPath(), UpdaterExe);
var product = app == MBApplication.MBTheater ? "mbt" : "server"; var product = app == MBApplication.MBTheater ? "mbt" : "server";
File.Copy(source, target, true); File.Copy(source, tempUpdater, true);
Process.Start(target, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false", product, archive, Process.GetCurrentProcess().Id)); // Our updater needs SS and ionic
source = Path.Combine(appPaths.ProgramSystemPath, "ServiceStack.Text.dll");
File.Copy(source, Path.Combine(Path.GetTempPath(), "ServiceStack.Text.dll"), true);
source = Path.Combine(appPaths.ProgramSystemPath, "Ionic.Zip.dll");
File.Copy(source, Path.Combine(Path.GetTempPath(), "Ionic.Zip.dll"), true);
Process.Start(tempUpdater, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false", product, archive, Process.GetCurrentProcess().Id));
// That's it. The installer will do the work once we exit // That's it. The installer will do the work once we exit
} }

18
MediaBrowser.Installer/MainWindow.xaml.cs
View File

@ -37,11 +37,18 @@ namespace MediaBrowser.Installer
protected WebClient MainClient = new WebClient(); protected WebClient MainClient = new WebClient();
public MainWindow() public MainWindow()
{
try
{ {
GetArgs(); GetArgs();
InitializeComponent(); InitializeComponent();
DoInstall(Archive); DoInstall(Archive);
} }
catch (Exception e)
{
MessageBox.Show("Error: " + e.Message + " \n\n" + e.StackTrace);
}
}
private void btnCancel_Click(object sender, RoutedEventArgs e) private void btnCancel_Click(object sender, RoutedEventArgs e)
{ {
@ -90,7 +97,6 @@ namespace MediaBrowser.Installer
args[nameValue[0]] = nameValue[1]; args[nameValue[0]] = nameValue[1];
} }
} }
Archive = args.GetValueOrDefault("archive", null); Archive = args.GetValueOrDefault("archive", null);
if (args.GetValueOrDefault("pismo","true") == "false") InstallPismo = false; if (args.GetValueOrDefault("pismo","true") == "false") InstallPismo = false;
@ -113,6 +119,8 @@ namespace MediaBrowser.Installer
} }
} }
//MessageBox.Show(string.Format("Called with args: product: {0} archive: {1} caller: {2}", product, Archive, callerId));
switch (product.ToLower()) switch (product.ToLower())
{ {
case "mbt": case "mbt":
@ -143,8 +151,8 @@ namespace MediaBrowser.Installer
lblStatus.Text = string.Format("Installing {0}...", FriendlyName); lblStatus.Text = string.Format("Installing {0}...", FriendlyName);
// Determine Package version // Determine Package version
var version = await GetPackageVersion(); var version = archive == null ? await GetPackageVersion() : null;
ActualVersion = version.version; ActualVersion = version != null ? version.version : new Version(3,0);
// Now try and shut down the server if that is what we are installing and it is running // Now try and shut down the server if that is what we are installing and it is running
var procs = Process.GetProcessesByName("mediabrowser.serverapplication"); var procs = Process.GetProcessesByName("mediabrowser.serverapplication");
@ -168,9 +176,9 @@ namespace MediaBrowser.Installer
} }
catch (WebException e) catch (WebException e)
{ {
if (e.GetStatus() == HttpStatusCode.NotFound || e.Message.StartsWith("Unable to connect",StringComparison.OrdinalIgnoreCase)) return; // just wasn't running if (e.Status == WebExceptionStatus.Timeout || e.Message.StartsWith("Unable to connect",StringComparison.OrdinalIgnoreCase)) return; // just wasn't running
MessageBox.Show("Error shutting down server. Please be sure it is not running before hitting OK.\n\n" + e.GetStatus() + "\n\n" + e.Message); MessageBox.Show("Error shutting down server. Please be sure it is not running before hitting OK.\n\n" + e.Status + "\n\n" + e.Message);
} }
} }
} }