From 1b5999a1bc11ee386131e4bbce561896c0e1bced Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Tue, 25 Feb 2020 17:01:57 +0100
Subject: Open the Swagger API page on server start if not hosting the static
 web content

---
 Emby.Server.Implementations/Browser/BrowserLauncher.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'Emby.Server.Implementations/Browser')

diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
index f5da0d018..b17c2b270 100644
--- a/Emby.Server.Implementations/Browser/BrowserLauncher.cs
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -29,6 +29,16 @@ namespace Emby.Server.Implementations.Browser
             OpenDashboardPage("index.html", appHost);
         }
 
+        /// <summary>
+        /// Opens the swagger API page.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenSwaggerPage(IServerApplicationHost appHost)
+        {
+            var url = appHost.GetLocalApiUrl("localhost") + "/swagger/index.html";
+            OpenUrl(appHost, url);
+        }
+
         /// <summary>
         /// Opens the URL.
         /// </summary>
-- 
cgit v1.2.3


From a9c1ff91193d8f645225ee9f7001370fe304ae8d Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 15 Mar 2020 13:00:34 +0100
Subject: Remove unnecessary method in BrowserLauncher

---
 Emby.Server.Implementations/Browser/BrowserLauncher.cs | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'Emby.Server.Implementations/Browser')

diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
index b17c2b270..752650ae1 100644
--- a/Emby.Server.Implementations/Browser/BrowserLauncher.cs
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -8,25 +8,14 @@ namespace Emby.Server.Implementations.Browser
     /// </summary>
     public static class BrowserLauncher
     {
-        /// <summary>
-        /// Opens the dashboard page.
-        /// </summary>
-        /// <param name="page">The page.</param>
-        /// <param name="appHost">The app host.</param>
-        private static void OpenDashboardPage(string page, IServerApplicationHost appHost)
-        {
-            var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
-
-            OpenUrl(appHost, url);
-        }
-
         /// <summary>
         /// Opens the web client.
         /// </summary>
         /// <param name="appHost">The app host.</param>
         public static void OpenWebApp(IServerApplicationHost appHost)
         {
-            OpenDashboardPage("index.html", appHost);
+            var url = appHost.GetLocalApiUrl("localhost") + "/web/index.html";
+            OpenUrl(appHost, url);
         }
 
         /// <summary>
-- 
cgit v1.2.3


From a67e32f8ecd46dfe2193ab3c81160bc830cd9349 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 15 Mar 2020 13:14:57 +0100
Subject: Clean up and document BrowserLauncher correctly

---
 .../Browser/BrowserLauncher.cs                     | 28 ++++++++++------------
 MediaBrowser.Controller/IServerApplicationHost.cs  |  5 ++++
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'Emby.Server.Implementations/Browser')

diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
index 752650ae1..96096e142 100644
--- a/Emby.Server.Implementations/Browser/BrowserLauncher.cs
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -1,21 +1,21 @@
 using System;
 using MediaBrowser.Controller;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Browser
 {
     /// <summary>
-    /// Class BrowserLauncher.
+    /// Assists in opening application URLs in an external browser.
     /// </summary>
     public static class BrowserLauncher
     {
         /// <summary>
-        /// Opens the web client.
+        /// Opens the home page of the web client.
         /// </summary>
         /// <param name="appHost">The app host.</param>
         public static void OpenWebApp(IServerApplicationHost appHost)
         {
-            var url = appHost.GetLocalApiUrl("localhost") + "/web/index.html";
-            OpenUrl(appHost, url);
+            TryOpenUrl(appHost, "/web/index.html");
         }
 
         /// <summary>
@@ -24,27 +24,25 @@ namespace Emby.Server.Implementations.Browser
         /// <param name="appHost">The app host.</param>
         public static void OpenSwaggerPage(IServerApplicationHost appHost)
         {
-            var url = appHost.GetLocalApiUrl("localhost") + "/swagger/index.html";
-            OpenUrl(appHost, url);
+            TryOpenUrl(appHost, "/swagger/index.html");
         }
 
         /// <summary>
-        /// Opens the URL.
+        /// Opens the specified URL in an external browser window. Any exceptions will be logged, but ignored.
         /// </summary>
-        /// <param name="appHost">The application host instance.</param>
+        /// <param name="appHost">The application host.</param>
         /// <param name="url">The URL.</param>
-        private static void OpenUrl(IServerApplicationHost appHost, string url)
+        private static void TryOpenUrl(IServerApplicationHost appHost, string url)
         {
             try
             {
-                appHost.LaunchUrl(url);
+                string baseUrl = appHost.GetLocalApiUrl("localhost");
+                appHost.LaunchUrl(baseUrl + url);
             }
-            catch (NotSupportedException)
-            {
-
-            }
-            catch (Exception)
+            catch (Exception ex)
             {
+                var logger = appHost.Resolve<ILogger>();
+                logger?.LogError(ex, "Failed to open browser window with URL {URL}", url);
             }
         }
     }
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 25f0905eb..608ffc61c 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -82,6 +82,11 @@ namespace MediaBrowser.Controller
         /// <returns>The local API URL.</returns>
         string GetLocalApiUrl(IPAddress address);
 
+        /// <summary>
+        /// Open a URL in an external browser window.
+        /// </summary>
+        /// <param name="url">The URL to open.</param>
+        /// <exception cref="NotSupportedException"><see cref="CanLaunchWebBrowser"/> is false.</exception>
         void LaunchUrl(string url);
 
         void EnableLoopback(string appName);
-- 
cgit v1.2.3