Merge pull request #1453 from Bond-009/cleanup2

Improve main code flow

1 files changed, 35 insertions, 21 deletions

diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 049dd761b..91752a16d 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -34,7 +34,6 @@ namespace Jellyfin.Server
         private static readonly ILoggerFactory _loggerFactory = new SerilogLoggerFactory();
         private static ILogger _logger;
         private static bool _restartOnShutdown;
-        private static IConfiguration appConfig;
 
         public static Task Main(string[] args)
         {
@@ -76,7 +75,7 @@ namespace Jellyfin.Server
             // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
             Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
 
-            appConfig = await CreateConfiguration(appPaths).ConfigureAwait(false);
+            IConfiguration appConfig = await CreateConfiguration(appPaths).ConfigureAwait(false);
 
             CreateLogger(appConfig, appPaths);
 
@@ -116,8 +115,6 @@ namespace Jellyfin.Server
 
             ApplicationHost.LogEnvironmentInfo(_logger, appPaths);
 
-            SQLitePCL.Batteries_V2.Init();
-
             // Increase the max http request limit
             // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others.
             ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit);
@@ -129,20 +126,20 @@ namespace Jellyfin.Server
             ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
 #pragma warning restore CA5359
 
-            var fileSystem = new ManagedFileSystem(_loggerFactory, appPaths);
+            SQLitePCL.Batteries_V2.Init();
 
             using (var appHost = new CoreAppHost(
                 appPaths,
                 _loggerFactory,
                 options,
-                fileSystem,
+                new ManagedFileSystem(_loggerFactory.CreateLogger<ManagedFileSystem>(), appPaths),
                 new NullImageEncoder(),
                 new NetworkManager(_loggerFactory),
                 appConfig))
             {
                 await appHost.InitAsync(new ServiceCollection()).ConfigureAwait(false);
 
-                appHost.ImageProcessor.ImageEncoder = GetImageEncoder(fileSystem, appPaths, appHost.LocalizationManager);
+                appHost.ImageProcessor.ImageEncoder = GetImageEncoder(appPaths, appHost.LocalizationManager);
 
                 await appHost.RunStartupTasksAsync().ConfigureAwait(false);
 
@@ -165,7 +162,7 @@ namespace Jellyfin.Server
 
         /// <summary>
         /// Create the data, config and log paths from the variety of inputs(command line args,
-        /// environment variables) or decide on what default to use.  For Windows it's %AppPath%
+        /// environment variables) or decide on what default to use. For Windows it's %AppPath%
         /// for everything else the XDG approach is followed:
         /// https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
         /// </summary>
@@ -187,7 +184,9 @@ namespace Jellyfin.Server
                 if (string.IsNullOrEmpty(dataDir))
                 {
                     // LocalApplicationData follows the XDG spec on unix machines
-                    dataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "jellyfin");
+                    dataDir = Path.Combine(
+                        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                        "jellyfin");
                 }
             }
 
@@ -206,20 +205,26 @@ namespace Jellyfin.Server
 
                 if (string.IsNullOrEmpty(configDir))
                 {
-                    if (options.DataDir != null || Directory.Exists(Path.Combine(dataDir, "config")) || RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    if (options.DataDir != null
+                        || Directory.Exists(Path.Combine(dataDir, "config"))
+                        || RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     {
                         // Hang config folder off already set dataDir
                         configDir = Path.Combine(dataDir, "config");
                     }
                     else
                     {
-                        // $XDG_CONFIG_HOME defines the base directory relative to which user specific configuration files should be stored.
+                        // $XDG_CONFIG_HOME defines the base directory relative to which
+                        // user specific configuration files should be stored.
                         configDir = Environment.GetEnvironmentVariable("XDG_CONFIG_HOME");
 
-                        // If $XDG_CONFIG_HOME is either not set or empty, a default equal to $HOME /.config should be used.
+                        // If $XDG_CONFIG_HOME is either not set or empty,
+                        // a default equal to $HOME /.config should be used.
                         if (string.IsNullOrEmpty(configDir))
                         {
-                            configDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".config");
+                            configDir = Path.Combine(
+                                Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                                ".config");
                         }
 
                         configDir = Path.Combine(configDir, "jellyfin");
@@ -247,13 +252,17 @@ namespace Jellyfin.Server
                     }
                     else
                     {
-                        // $XDG_CACHE_HOME defines the base directory relative to which user specific non-essential data files should be stored.
+                        // $XDG_CACHE_HOME defines the base directory relative to which
+                        // user specific non-essential data files should be stored.
                         cacheDir = Environment.GetEnvironmentVariable("XDG_CACHE_HOME");
 
-                        // If $XDG_CACHE_HOME is either not set or empty, a default equal to $HOME/.cache should be used.
+                        // If $XDG_CACHE_HOME is either not set or empty,
+                        // a default equal to $HOME/.cache should be used.
                         if (string.IsNullOrEmpty(cacheDir))
                         {
-                            cacheDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".cache");
+                            cacheDir = Path.Combine(
+                                Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                                ".cache");
                         }
 
                         cacheDir = Path.Combine(cacheDir, "jellyfin");
@@ -362,17 +371,22 @@ namespace Jellyfin.Server
         }
 
         private static IImageEncoder GetImageEncoder(
-            IFileSystem fileSystem,
             IApplicationPaths appPaths,
             ILocalizationManager localizationManager)
         {
             try
             {
-                return new SkiaEncoder(_loggerFactory, appPaths, fileSystem, localizationManager);
+                // Test if the native lib is available
+                SkiaEncoder.TestSkia();
+
+                return new SkiaEncoder(
+                    _loggerFactory.CreateLogger<SkiaEncoder>(),
+                    appPaths,
+                    localizationManager);
             }
             catch (Exception ex)
             {
-                _logger.LogInformation(ex, "Skia not available. Will fallback to NullIMageEncoder.");
+                _logger.LogWarning(ex, "Skia not available. Will fallback to NullIMageEncoder.");
             }
 
             return new NullImageEncoder();
@@ -386,7 +400,7 @@ namespace Jellyfin.Server
 
             if (string.IsNullOrWhiteSpace(module))
             {
-                module = Environment.GetCommandLineArgs().First();
+                module = Environment.GetCommandLineArgs()[0];
             }
 
             string commandLineArgsString;
@@ -398,7 +412,7 @@ namespace Jellyfin.Server
             else
             {
                 commandLineArgsString = string.Join(
-                    " ",
+                    ' ',
                     Environment.GetCommandLineArgs().Skip(1).Select(NormalizeCommandLineArgument));
             }