diff options
Diffstat (limited to 'MediaBrowser.ServerApplication/App.xaml.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/App.xaml.cs | 154 |
1 files changed, 25 insertions, 129 deletions
diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs index 362dd4bc0..42045257a 100644 --- a/MediaBrowser.ServerApplication/App.xaml.cs +++ b/MediaBrowser.ServerApplication/App.xaml.cs @@ -1,90 +1,20 @@ -using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.Constants; -using MediaBrowser.Common.Implementations.Updates; -using MediaBrowser.Controller; +using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Logging; -using MediaBrowser.Server.Implementations; using MediaBrowser.ServerApplication.Splash; -using Microsoft.Win32; using System; using System.Diagnostics; -using System.IO; -using System.Net.Cache; -using System.Threading; using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; -using System.Windows.Media.Imaging; namespace MediaBrowser.ServerApplication { /// <summary> /// Interaction logic for App.xaml /// </summary> - public partial class App : Application + public partial class App : Application, IApplicationInterface { /// <summary> - /// The single instance mutex - /// </summary> - private static Mutex _singleInstanceMutex; - - /// <summary> - /// Defines the entry point of the application. - /// </summary> - [STAThread] - public static void Main() - { - bool createdNew; - - var runningPath = Process.GetCurrentProcess().MainModule.FileName.Replace(Path.DirectorySeparatorChar.ToString(), string.Empty); - - _singleInstanceMutex = new Mutex(true, @"Local\" + runningPath, out createdNew); - - if (!createdNew) - { - _singleInstanceMutex = null; - return; - } - - // Look for the existence of an update archive - var appPaths = new ServerApplicationPaths(); - var updateArchive = Path.Combine(appPaths.TempUpdatePath, Constants.MbServerPkgName + ".zip"); - if (File.Exists(updateArchive)) - { - // Update is there - execute update - try - { - new ApplicationUpdater().UpdateApplication(MBApplication.MBServer, appPaths, updateArchive); - - // And just let the app exit so it can update - return; - } - catch (Exception e) - { - MessageBox.Show(string.Format("Error attempting to update application.\n\n{0}\n\n{1}", e.GetType().Name, e.Message)); - } - } - - var application = new App(); - - application.Run(); - } - - /// <summary> - /// Gets the instance. - /// </summary> - /// <value>The instance.</value> - public static App Instance - { - get - { - return Current as App; - } - } - - /// <summary> /// Gets or sets the logger. /// </summary> /// <value>The logger.</value> @@ -95,7 +25,7 @@ namespace MediaBrowser.ServerApplication /// </summary> /// <value>The composition root.</value> protected ApplicationHost CompositionRoot { get; set; } - + /// <summary> /// Initializes a new instance of the <see cref="App" /> class. /// </summary> @@ -105,6 +35,11 @@ namespace MediaBrowser.ServerApplication InitializeComponent(); } + public bool IsBackgroundService + { + get { return false; } + } + /// <summary> /// Gets the name of the uninstaller file. /// </summary> @@ -114,63 +49,35 @@ namespace MediaBrowser.ServerApplication get { return "MediaBrowser.Server.Uninstall.exe"; } } - /// <summary> - /// Raises the <see cref="E:System.Windows.Application.Startup" /> event. - /// </summary> - /// <param name="e">A <see cref="T:System.Windows.StartupEventArgs" /> that contains the event data.</param> - protected override void OnStartup(StartupEventArgs e) + public void OnUnhandledException(Exception ex) { - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - LoadKernel(); + Logger.ErrorException("UnhandledException", ex); - SystemEvents.SessionEnding += SystemEvents_SessionEnding; + MessageBox.Show("Unhandled exception: " + ex.Message); } - /// <summary> - /// Handles the UnhandledException event of the CurrentDomain control. - /// </summary> - /// <param name="sender">The source of the event.</param> - /// <param name="e">The <see cref="UnhandledExceptionEventArgs" /> instance containing the event data.</param> - void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) + protected override void OnStartup(StartupEventArgs e) { - var exception = (Exception)e.ExceptionObject; - - Logger.ErrorException("UnhandledException", exception); + base.OnStartup(e); - MessageBox.Show("Unhandled exception: " + exception.Message); - - if (!Debugger.IsAttached) - { - Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception)); - } - } - - /// <summary> - /// Handles the SessionEnding event of the SystemEvents control. - /// </summary> - /// <param name="sender">The source of the event.</param> - /// <param name="e">The <see cref="SessionEndingEventArgs" /> instance containing the event data.</param> - void SystemEvents_SessionEnding(object sender, SessionEndingEventArgs e) - { - // Try to shut down gracefully - Shutdown(); + LoadApplication(); } /// <summary> /// Loads the kernel. /// </summary> - protected async void LoadKernel() + protected async void LoadApplication() { try { - CompositionRoot = new ApplicationHost(); + CompositionRoot = new ApplicationHost(this); Logger = CompositionRoot.LogManager.GetLogger("App"); var splash = new SplashWindow(CompositionRoot.ApplicationVersion); splash.Show(); - + await CompositionRoot.Init(); splash.Hide(); @@ -192,13 +99,18 @@ namespace MediaBrowser.ServerApplication } } + public void ShutdownApplication() + { + Dispatcher.Invoke(Shutdown); + } + /// <summary> /// Raises the <see cref="E:System.Windows.Application.Exit" /> event. /// </summary> /// <param name="e">An <see cref="T:System.Windows.ExitEventArgs" /> that contains the event data.</param> protected override void OnExit(ExitEventArgs e) { - ReleaseMutex(); + MainStartup.ReleaseMutex(); base.OnExit(e); @@ -209,22 +121,6 @@ namespace MediaBrowser.ServerApplication } /// <summary> - /// Releases the mutex. - /// </summary> - private void ReleaseMutex() - { - if (_singleInstanceMutex == null) - { - return; - } - - _singleInstanceMutex.ReleaseMutex(); - _singleInstanceMutex.Close(); - _singleInstanceMutex.Dispose(); - _singleInstanceMutex = null; - } - - /// <summary> /// Opens the dashboard page. /// </summary> /// <param name="page">The page.</param> @@ -281,9 +177,9 @@ namespace MediaBrowser.ServerApplication /// Restarts this instance. /// </summary> /// <exception cref="System.NotImplementedException"></exception> - public void Restart() + public void RestartApplication() { - Dispatcher.Invoke(ReleaseMutex); + Dispatcher.Invoke(MainStartup.ReleaseMutex); CompositionRoot.Dispose(); |