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

1 files changed, 10 insertions, 41 deletions

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index dc4baf298..1b5bd8440 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -14,6 +14,7 @@ using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
@@ -58,6 +59,7 @@ using MediaBrowser.Server.Implementations.Activity;
 using MediaBrowser.Server.Implementations.Channels;
 using MediaBrowser.Server.Implementations.Collections;
 using MediaBrowser.Server.Implementations.Configuration;
+using MediaBrowser.Server.Implementations.Connect;
 using MediaBrowser.Server.Implementations.Drawing;
 using MediaBrowser.Server.Implementations.Dto;
 using MediaBrowser.Server.Implementations.EntryPoints;
@@ -184,6 +186,7 @@ namespace MediaBrowser.ServerApplication
         /// <value>The media encoder.</value>
         private IMediaEncoder MediaEncoder { get; set; }
 
+        private IConnectManager ConnectManager { get; set; }
         private ISessionManager SessionManager { get; set; }
 
         private ILiveTvManager LiveTvManager { get; set; }
@@ -309,13 +312,6 @@ namespace MediaBrowser.ServerApplication
                 saveConfig = true;
             }
 
-            if (ServerConfigurationManager.Configuration.NotificationOptions != null)
-            {
-                ServerConfigurationManager.SaveConfiguration("notifications", ServerConfigurationManager.Configuration.NotificationOptions);
-                ServerConfigurationManager.Configuration.NotificationOptions = null;
-                saveConfig = true;
-            }
-
             if (ServerConfigurationManager.Configuration.LiveTvOptions != null)
             {
                 ServerConfigurationManager.SaveConfiguration("livetv", ServerConfigurationManager.Configuration.LiveTvOptions);
@@ -330,13 +326,6 @@ namespace MediaBrowser.ServerApplication
                 saveConfig = true;
             }
 
-            if (ServerConfigurationManager.Configuration.SubtitleOptions != null)
-            {
-                ServerConfigurationManager.SaveConfiguration("subtitles", ServerConfigurationManager.Configuration.SubtitleOptions);
-                ServerConfigurationManager.Configuration.SubtitleOptions = null;
-                saveConfig = true;
-            }
-
             if (saveConfig)
             {
                 ServerConfigurationManager.SaveConfiguration();
@@ -471,6 +460,12 @@ namespace MediaBrowser.ServerApplication
             DtoService = new DtoService(Logger, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager);
             RegisterSingleInstance(DtoService);
 
+            var encryptionManager = new EncryptionManager();
+            RegisterSingleInstance<IEncryptionManager>(encryptionManager);
+
+            ConnectManager = new ConnectManager(LogManager.GetLogger("Connect"), ApplicationPaths, JsonSerializer, encryptionManager, HttpClient, this, ServerConfigurationManager);
+            RegisterSingleInstance(ConnectManager);
+
             SessionManager = new SessionManager(UserDataManager, ServerConfigurationManager, Logger, UserRepository, LibraryManager, UserManager, musicManager, DtoService, ImageProcessor, ItemRepository, JsonSerializer, this, HttpClient, AuthenticationRepository);
             RegisterSingleInstance(SessionManager);
 
@@ -512,8 +507,6 @@ namespace MediaBrowser.ServerApplication
             NotificationManager = new NotificationManager(LogManager, UserManager, ServerConfigurationManager);
             RegisterSingleInstance(NotificationManager);
 
-            RegisterSingleInstance<IEncryptionManager>(new EncryptionManager());
-
             SubtitleManager = new SubtitleManager(LogManager.GetLogger("SubtitleManager"), FileSystemManager, LibraryMonitor, LibraryManager, ItemRepository);
             RegisterSingleInstance(SubtitleManager);
 
@@ -951,7 +944,7 @@ namespace MediaBrowser.ServerApplication
                 OperatingSystem = Environment.OSVersion.ToString(),
                 CanSelfRestart = CanSelfRestart,
                 CanSelfUpdate = CanSelfUpdate,
-                WanAddress = GetWanAddress(),
+                WanAddress = ConnectManager.WanApiAddress,
                 HasUpdateAvailable = HasUpdateAvailable,
                 SupportsAutoRunAtStartup = SupportsAutoRunAtStartup,
                 TranscodingTempPath = ApplicationPaths.TranscodingTempPath,
@@ -1004,30 +997,6 @@ namespace MediaBrowser.ServerApplication
             get { return ServerConfigurationManager.Configuration.HttpServerPortNumber; }
         }
 
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-        private string GetWanAddress()
-        {
-            var ip = ServerConfigurationManager.Configuration.WanDdns;
-
-            if (string.IsNullOrWhiteSpace(ip))
-            {
-                ip = WanAddressEntryPoint.WanAddress;
-            }
-
-            if (!string.IsNullOrEmpty(ip))
-            {
-                if (!ip.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
-                    !ip.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
-                {
-                    ip = "http://" + ip;
-                }
-
-                return ip + ":" + ServerConfigurationManager.Configuration.HttpServerPortNumber.ToString(_usCulture);
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// Gets the mac address.
         /// </summary>