Merge pull request #1109 from MediaBrowser/dev

3.0.5621.3

4 files changed, 81 insertions, 13 deletions

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 03c69901e..b0db9fb98 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -259,9 +259,6 @@
     </BundleResource>

     <BundleResource Include="Resources\appicon.icns" />

     <BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\.DS_Store">

-      <Link>Resources\dashboard-ui\.DS_Store</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">

       <Link>Resources\dashboard-ui\about.html</Link>

     </BundleResource>

@@ -301,9 +298,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\connectlogin.html">

       <Link>Resources\dashboard-ui\connectlogin.html</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\cordovaindex.html">

-      <Link>Resources\dashboard-ui\cordovaindex.html</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboard.html">

       <Link>Resources\dashboard-ui\dashboard.html</Link>

     </BundleResource>

@@ -658,9 +652,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizarduser.html">

       <Link>Resources\dashboard-ui\wizarduser.html</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\.DS_Store">

-      <Link>Resources\dashboard-ui\css\.DS_Store</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css">

       <Link>Resources\dashboard-ui\css\card.css</Link>

     </BundleResource>

@@ -1306,6 +1297,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvchannels.js">

       <Link>Resources\dashboard-ui\scripts\livetvchannels.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvcomponents.js">

+      <Link>Resources\dashboard-ui\scripts\livetvcomponents.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvguide.js">

       <Link>Resources\dashboard-ui\scripts\livetvguide.js</Link>

     </BundleResource>

@@ -1471,9 +1465,15 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\pluginspage.js">

       <Link>Resources\dashboard-ui\scripts\pluginspage.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\queryfilters.js">

+      <Link>Resources\dashboard-ui\scripts\queryfilters.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\ratingdialog.js">

       <Link>Resources\dashboard-ui\scripts\ratingdialog.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\registrationservices.js">

+      <Link>Resources\dashboard-ui\scripts\registrationservices.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\remotecontrol.js">

       <Link>Resources\dashboard-ui\scripts\remotecontrol.js</Link>

     </BundleResource>

@@ -1666,6 +1666,21 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\events.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\events.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\chromecast.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\chromecast.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\connectsdk.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\connectsdk.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\generaldevice.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\generaldevice.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\imagestore.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\imagestore.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\registrationservices.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\registrationservices.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\remotecontrols.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\remotecontrols.js</Link>

     </BundleResource>

diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index b4184f3b1..0802b97b9 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -146,6 +146,39 @@ namespace MediaBrowser.Server.Mac
 			MenuBarIcon.Instance.Terminate ();
 		}
 
+        public static void Restart()
+        {
+            _logger.Info("Disposing app host");
+            AppHost.Dispose();
+
+            _logger.Info("Starting new instance");
+
+            var args = Environment.GetCommandLineArgs()
+				.Skip(1)
+                .Select(NormalizeCommandLineArgument);
+
+            var commandLineArgsString = string.Join(" ", args.ToArray());
+			var module = Environment.GetCommandLineArgs().First();
+
+			_logger.Info ("Executable: {0}", module);
+			_logger.Info ("Arguments: {0}", commandLineArgsString);
+
+            Process.Start(module, commandLineArgsString);
+
+            _logger.Info("AppController.Terminate");
+            MenuBarIcon.Instance.Terminate();
+        }
+
+        private static string NormalizeCommandLineArgument(string arg)
+        {
+            if (arg.IndexOf(" ", StringComparison.OrdinalIgnoreCase) == -1)
+            {
+                return arg;
+            }
+
+            return "\"" + arg + "\"";
+        }
+
 		/// <summary>
 		/// Handles the UnhandledException event of the CurrentDomain control.
 		/// </summary>
diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
index 9821f49dd..57610dfc2 100644
--- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
@@ -19,16 +19,16 @@ namespace MediaBrowser.Server.Mac
         /// <summary>
         /// Restarts this instance.
         /// </summary>
-        public void Restart()
+        public virtual void Restart()
         {
-            
+            throw new NotImplementedException();
         }
 
         /// <summary>
         /// Determines whether this instance [can self restart].
         /// </summary>
         /// <returns><c>true</c> if this instance [can self restart]; otherwise, <c>false</c>.</returns>
-        public bool CanSelfRestart
+        public virtual bool CanSelfRestart
         {
             get
             {
diff --git a/MediaBrowser.Server.Mac/Native/NativeApp.cs b/MediaBrowser.Server.Mac/Native/NativeApp.cs
index f7c2dd4c9..4515be051 100644
--- a/MediaBrowser.Server.Mac/Native/NativeApp.cs
+++ b/MediaBrowser.Server.Mac/Native/NativeApp.cs
@@ -13,7 +13,27 @@ namespace MediaBrowser.Server.Mac
 		public override void Shutdown()
 		{
 			MainClass.Shutdown();
-		}
+        }
+
+        /// <summary>
+        /// Determines whether this instance [can self restart].
+        /// </summary>
+        /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
+        public override bool CanSelfRestart
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Restarts this instance.
+        /// </summary>
+        public override void Restart()
+        {
+            MainClass.Restart();
+        }
 	}
 }