2
0
Эх сурвалжийг харах

rename some missed variables and fix warnings

dkanada 5 жил өмнө
parent
commit
b1f9b03b17

+ 7 - 5
Emby.Server.Implementations/ApplicationHost.cs

@@ -456,7 +456,7 @@ namespace Emby.Server.Implementations
         public string Name => ApplicationProductName;
 
         /// <summary>
-        /// Creates an instance of type and resolves all constructor dependencies
+        /// Creates an instance of type and resolves all constructor dependencies.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
@@ -464,7 +464,7 @@ namespace Emby.Server.Implementations
             => ActivatorUtilities.CreateInstance(_serviceProvider, type);
 
         /// <summary>
-        /// Creates an instance of type and resolves all constructor dependencies
+        /// Creates an instance of type and resolves all constructor dependencies.
         /// </summary>
         /// /// <typeparam name="T">The type.</typeparam>
         /// <returns>T.</returns>
@@ -512,11 +512,12 @@ namespace Emby.Server.Implementations
         /// <inheritdoc />
         public IReadOnlyCollection<T> GetExports<T>(bool manageLifetime = true)
         {
+            // Convert to list so this isn't executed for each iteration
             var parts = GetExportTypes<T>()
                 .Select(CreateInstanceSafe)
                 .Where(i => i != null)
                 .Cast<T>()
-                .ToList(); // Convert to list so this isn't executed for each iteration
+                .ToList();
 
             if (manageLifetime)
             {
@@ -1418,7 +1419,7 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Gets the system status.
         /// </summary>
-        /// <param name="cancellationToken">The cancellation token</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>SystemInfo.</returns>
         public async Task<SystemInfo> GetSystemInfo(CancellationToken cancellationToken)
         {
@@ -1446,7 +1447,7 @@ namespace Emby.Server.Implementations
                 CanSelfRestart = CanSelfRestart,
                 CanLaunchWebBrowser = CanLaunchWebBrowser,
                 HasUpdateAvailable = HasUpdateAvailable,
-                TranscodingTempPath = ApplicationPaths.TranscodePath,
+                TranscodePath = ApplicationPaths.TranscodePath,
                 ServerName = FriendlyName,
                 LocalAddress = localAddress,
                 SupportsLibraryMonitor = true,
@@ -1847,6 +1848,7 @@ namespace Emby.Server.Implementations
     internal class CertificateInfo
     {
         public string Path { get; set; }
+
         public string Password { get; set; }
     }
 }

+ 2 - 2
Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs

@@ -91,9 +91,9 @@ namespace Emby.Server.Implementations.Configuration
         {
             var encodingConfig = this.GetConfiguration<EncodingOptions>("encoding");
 
-            ((ServerApplicationPaths)ApplicationPaths).TranscodePath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
+            ((ServerApplicationPaths)ApplicationPaths).TranscodePath = string.IsNullOrEmpty(encodingConfig.TranscodePath) ?
                 null :
-                Path.Combine(encodingConfig.TranscodingTempPath, "transcodes");
+                Path.Combine(encodingConfig.TranscodePath, "transcodes");
         }
 
         protected override void OnNamedConfigurationUpdated(string key, object configuration)

+ 2 - 8
Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs

@@ -39,13 +39,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// Creates the triggers that define when the task will run
         /// </summary>
         /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            yield return new TaskTriggerInfo
-            {
-                Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks
-            };
-        }
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers() => new List<TaskTriggerInfo>();
 
         /// <summary>
         /// Returns the task to be executed
@@ -154,7 +148,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 
         public bool IsHidden => false;
 
-        public bool IsEnabled => true;
+        public bool IsEnabled => false;
 
         public bool IsLogged => true;
     }

+ 2 - 2
Emby.Server.Implementations/ServerApplicationPaths.cs

@@ -10,7 +10,7 @@ namespace Emby.Server.Implementations
     /// </summary>
     public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
     {
-        private string _defaultTranscodingTempPath;
+        private string _defaultTranscodePath;
         private string _transcodePath;
         private string _internalMetadataPath;
 
@@ -107,7 +107,7 @@ namespace Emby.Server.Implementations
         /// <value>The user configuration directory path.</value>
         public string UserConfigurationDirectoryPath => Path.Combine(ConfigurationDirectoryPath, "users");
 
-        public string DefaultTranscodePath => _defaultTranscodingTempPath ?? (_defaultTranscodingTempPath = Path.Combine(ProgramDataPath, "transcodes"));
+        public string DefaultTranscodePath => _defaultTranscodePath ?? (_defaultTranscodePath = Path.Combine(ProgramDataPath, "transcodes"));
 
         public string TranscodePath
         {

+ 2 - 2
MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs

@@ -40,10 +40,10 @@ namespace MediaBrowser.MediaEncoding.Configuration
             var oldEncodingConfig = (EncodingOptions)oldConfig;
             var newEncodingConfig = (EncodingOptions)newConfig;
 
-            var newPath = newEncodingConfig.TranscodingTempPath;
+            var newPath = newEncodingConfig.TranscodePath;
 
             if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(oldEncodingConfig.TranscodingTempPath ?? string.Empty, newPath))
+                && !string.Equals(oldEncodingConfig.TranscodePath ?? string.Empty, newPath))
             {
                 // Validate
                 if (!Directory.Exists(newPath))

+ 1 - 1
MediaBrowser.Model/Configuration/EncodingOptions.cs

@@ -3,7 +3,7 @@ namespace MediaBrowser.Model.Configuration
     public class EncodingOptions
     {
         public int EncodingThreadCount { get; set; }
-        public string TranscodingTempPath { get; set; }
+        public string TranscodePath { get; set; }
         public double DownMixAudioBoost { get; set; }
         public bool EnableThrottling { get; set; }
         public int ThrottleDelaySeconds { get; set; }

+ 1 - 1
MediaBrowser.Model/System/SystemInfo.cs

@@ -113,7 +113,7 @@ namespace MediaBrowser.Model.System
         /// Gets or sets the transcoding temporary path.
         /// </summary>
         /// <value>The transcoding temporary path.</value>
-        public string TranscodingTempPath { get; set; }
+        public string TranscodePath { get; set; }
 
         /// <summary>
         /// Gets or sets the HTTP server port number.