diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 6bd5995f9..9adbe9034 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -456,7 +456,7 @@ namespace Emby.Server.Implementations
public string Name => ApplicationProductName;
///
- /// Creates an instance of type and resolves all constructor dependencies
+ /// Creates an instance of type and resolves all constructor dependencies.
///
/// The type.
/// System.Object.
@@ -464,7 +464,7 @@ namespace Emby.Server.Implementations
=> ActivatorUtilities.CreateInstance(_serviceProvider, type);
///
- /// Creates an instance of type and resolves all constructor dependencies
+ /// Creates an instance of type and resolves all constructor dependencies.
///
/// /// The type.
/// T.
@@ -512,11 +512,12 @@ namespace Emby.Server.Implementations
///
public IReadOnlyCollection GetExports(bool manageLifetime = true)
{
+ // Convert to list so this isn't executed for each iteration
var parts = GetExportTypes()
.Select(CreateInstanceSafe)
.Where(i => i != null)
.Cast()
- .ToList(); // Convert to list so this isn't executed for each iteration
+ .ToList();
if (manageLifetime)
{
@@ -1418,7 +1419,7 @@ namespace Emby.Server.Implementations
///
/// Gets the system status.
///
- /// The cancellation token
+ /// The cancellation token.
/// SystemInfo.
public async Task 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; }
}
}
diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
index fe705cbe2..2bd1b4361 100644
--- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -91,9 +91,9 @@ namespace Emby.Server.Implementations.Configuration
{
var encodingConfig = this.GetConfiguration("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)
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
index d1c083e6b..200649ba9 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/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
///
/// IEnumerable{BaseTaskTrigger}.
- public IEnumerable GetDefaultTriggers()
- {
- yield return new TaskTriggerInfo
- {
- Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks
- };
- }
+ public IEnumerable GetDefaultTriggers() => new List();
///
/// 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;
}
diff --git a/Emby.Server.Implementations/ServerApplicationPaths.cs b/Emby.Server.Implementations/ServerApplicationPaths.cs
index e9119e76c..87de9804a 100644
--- a/Emby.Server.Implementations/ServerApplicationPaths.cs
+++ b/Emby.Server.Implementations/ServerApplicationPaths.cs
@@ -10,7 +10,7 @@ namespace Emby.Server.Implementations
///
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
/// The user configuration directory path.
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
{
diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
index bb806ee55..857add4cb 100644
--- a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
+++ b/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))
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 9ae10d980..795ef1736 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/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; }
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 3f73cc4e0..2e5e65690 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -113,7 +113,7 @@ namespace MediaBrowser.Model.System
/// Gets or sets the transcoding temporary path.
///
/// The transcoding temporary path.
- public string TranscodingTempPath { get; set; }
+ public string TranscodePath { get; set; }
///
/// Gets or sets the HTTP server port number.