From f3ca37e523bcfc52bbc6527d195d389f7ee053c8 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 24 Oct 2019 10:50:25 +0900 Subject: [PATCH 1/3] minor changes to transcode cleanup scheduled task --- Emby.Server.Implementations/ApplicationHost.cs | 2 +- .../ServerConfigurationManager.cs | 2 +- .../LiveTv/TunerHosts/LiveStream.cs | 2 +- .../Tasks/DeleteTranscodeFileTask.cs | 18 ++++++++++++------ .../ServerApplicationPaths.cs | 18 +++++++++--------- MediaBrowser.Api/ApiEntryPoint.cs | 2 +- .../Playback/BaseStreamingService.cs | 2 +- .../Playback/Hls/HlsSegmentService.cs | 6 +++--- .../IServerApplicationPaths.cs | 4 ++-- 9 files changed, 31 insertions(+), 25 deletions(-) diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index fef461b9a..6bd5995f9 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1446,7 +1446,7 @@ namespace Emby.Server.Implementations CanSelfRestart = CanSelfRestart, CanLaunchWebBrowser = CanLaunchWebBrowser, HasUpdateAvailable = HasUpdateAvailable, - TranscodingTempPath = ApplicationPaths.TranscodingTempPath, + TranscodingTempPath = ApplicationPaths.TranscodePath, ServerName = FriendlyName, LocalAddress = localAddress, SupportsLibraryMonitor = true, diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs index c7f92b80b..fe705cbe2 100644 --- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs +++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs @@ -91,7 +91,7 @@ namespace Emby.Server.Implementations.Configuration { var encodingConfig = this.GetConfiguration("encoding"); - ((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ? + ((ServerApplicationPaths)ApplicationPaths).TranscodePath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ? null : Path.Combine(encodingConfig.TranscodingTempPath, "transcodes"); } diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs index d12c96392..2ea171031 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs @@ -68,7 +68,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts protected void SetTempFilePath(string extension) { - TempFilePath = Path.Combine(AppPaths.GetTranscodingTempPath(), UniqueId + "." + extension); + TempFilePath = Path.Combine(AppPaths.GetTranscodePath(), UniqueId + "." + extension); } public virtual Task Open(CancellationToken openCancellationToken) diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs index c343a7d48..d1c083e6b 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs @@ -39,7 +39,13 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks /// Creates the triggers that define when the task will run /// /// IEnumerable{BaseTaskTrigger}. - public IEnumerable GetDefaultTriggers() => new List(); + public IEnumerable GetDefaultTriggers() + { + yield return new TaskTriggerInfo + { + Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks + }; + } /// /// Returns the task to be executed @@ -54,7 +60,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks try { - DeleteTempFilesFromDirectory(cancellationToken, ApplicationPaths.TranscodingTempPath, minDateModified, progress); + DeleteTempFilesFromDirectory(cancellationToken, ApplicationPaths.TranscodePath, minDateModified, progress); } catch (DirectoryNotFoundException) { @@ -138,17 +144,17 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks } } - public string Name => "Transcoding temp cleanup"; + public string Name => "Transcode file cleanup"; - public string Description => "Deletes transcoding temp files older than 24 hours."; + public string Description => "Deletes transcode files more than 24 hours old."; public string Category => "Maintenance"; - public string Key => "DeleteTranscodingTempFiles"; + public string Key => "DeleteTranscodeFiles"; public bool IsHidden => false; - public bool IsEnabled => false; + public bool IsEnabled => true; public bool IsLogged => true; } diff --git a/Emby.Server.Implementations/ServerApplicationPaths.cs b/Emby.Server.Implementations/ServerApplicationPaths.cs index 46195cc74..e9119e76c 100644 --- a/Emby.Server.Implementations/ServerApplicationPaths.cs +++ b/Emby.Server.Implementations/ServerApplicationPaths.cs @@ -11,7 +11,7 @@ namespace Emby.Server.Implementations public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths { private string _defaultTranscodingTempPath; - private string _transcodingTempPath; + private string _transcodePath; private string _internalMetadataPath; /// @@ -107,19 +107,19 @@ namespace Emby.Server.Implementations /// The user configuration directory path. public string UserConfigurationDirectoryPath => Path.Combine(ConfigurationDirectoryPath, "users"); - public string DefaultTranscodingTempPath => _defaultTranscodingTempPath ?? (_defaultTranscodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp")); + public string DefaultTranscodePath => _defaultTranscodingTempPath ?? (_defaultTranscodingTempPath = Path.Combine(ProgramDataPath, "transcodes")); - public string TranscodingTempPath + public string TranscodePath { - get => _transcodingTempPath ?? (_transcodingTempPath = DefaultTranscodingTempPath); - set => _transcodingTempPath = value; + get => _transcodePath ?? (_transcodePath = DefaultTranscodePath); + set => _transcodePath = value; } - public string GetTranscodingTempPath() + public string GetTranscodePath() { - var path = TranscodingTempPath; + var path = TranscodePath; - if (!string.Equals(path, DefaultTranscodingTempPath, StringComparison.OrdinalIgnoreCase)) + if (!string.Equals(path, DefaultTranscodePath, StringComparison.OrdinalIgnoreCase)) { try { @@ -136,7 +136,7 @@ namespace Emby.Server.Implementations } } - path = DefaultTranscodingTempPath; + path = DefaultTranscodePath; Directory.CreateDirectory(path); return path; } diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index a5d65a716..a962b0240 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -167,7 +167,7 @@ namespace MediaBrowser.Api /// private void DeleteEncodedMediaCache() { - var path = ConfigurationManager.ApplicationPaths.GetTranscodingTempPath(); + var path = ConfigurationManager.ApplicationPaths.GetTranscodePath(); if (!Directory.Exists(path)) { diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 7bfe0e0ce..c7104c950 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -141,7 +141,7 @@ namespace MediaBrowser.Api.Playback var filename = data.GetMD5().ToString("N", CultureInfo.InvariantCulture); var ext = outputFileExtension.ToLowerInvariant(); - var folder = ServerConfigurationManager.ApplicationPaths.TranscodingTempPath; + var folder = ServerConfigurationManager.ApplicationPaths.TranscodePath; if (EnableOutputInSubFolder) { diff --git a/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs b/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs index 6a2c7ae03..7487f2b64 100644 --- a/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs +++ b/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs @@ -97,7 +97,7 @@ namespace MediaBrowser.Api.Playback.Hls public Task Get(GetHlsPlaylistLegacy request) { var file = request.PlaylistId + Path.GetExtension(Request.PathInfo); - file = Path.Combine(_appPaths.TranscodingTempPath, file); + file = Path.Combine(_appPaths.TranscodePath, file); return GetFileResult(file, file); } @@ -116,7 +116,7 @@ namespace MediaBrowser.Api.Playback.Hls { var file = request.SegmentId + Path.GetExtension(Request.PathInfo); - var transcodeFolderPath = _config.ApplicationPaths.TranscodingTempPath; + var transcodeFolderPath = _config.ApplicationPaths.TranscodePath; file = Path.Combine(transcodeFolderPath, file); var normalizedPlaylistId = request.PlaylistId; @@ -136,7 +136,7 @@ namespace MediaBrowser.Api.Playback.Hls { // TODO: Deprecate with new iOS app var file = request.SegmentId + Path.GetExtension(Request.PathInfo); - file = Path.Combine(_appPaths.TranscodingTempPath, file); + file = Path.Combine(_appPaths.TranscodePath, file); return ResultFactory.GetStaticFileResult(Request, file, FileShareMode.ReadWrite); } diff --git a/MediaBrowser.Controller/IServerApplicationPaths.cs b/MediaBrowser.Controller/IServerApplicationPaths.cs index 15d7e9f62..127a31329 100644 --- a/MediaBrowser.Controller/IServerApplicationPaths.cs +++ b/MediaBrowser.Controller/IServerApplicationPaths.cs @@ -86,7 +86,7 @@ namespace MediaBrowser.Controller /// Gets the transcoding temporary path. /// /// The transcoding temporary path. - string TranscodingTempPath { get; } + string TranscodePath { get; } /// /// Gets the internal metadata path. @@ -97,6 +97,6 @@ namespace MediaBrowser.Controller string ArtistsPath { get; } - string GetTranscodingTempPath(); + string GetTranscodePath(); } } From b1f9b03b17fd0930da5913d14ec5e7a4ed8ca6af Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 11 Nov 2019 02:24:05 +0900 Subject: [PATCH 2/3] rename some missed variables and fix warnings --- Emby.Server.Implementations/ApplicationHost.cs | 12 +++++++----- .../Configuration/ServerConfigurationManager.cs | 4 ++-- .../ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs | 10 ++-------- .../ServerApplicationPaths.cs | 4 ++-- .../Configuration/EncodingConfigurationFactory.cs | 4 ++-- MediaBrowser.Model/Configuration/EncodingOptions.cs | 2 +- MediaBrowser.Model/System/SystemInfo.cs | 2 +- 7 files changed, 17 insertions(+), 21 deletions(-) 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. From 37eed8cf1f024b8de19c851fd353322d706c2b27 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 21 Nov 2019 21:51:17 +0900 Subject: [PATCH 3/3] revert settings to their old names --- Emby.Server.Implementations/ApplicationHost.cs | 2 +- .../Configuration/ServerConfigurationManager.cs | 4 ++-- .../EntryPoints/LibraryChangedNotifier.cs | 13 ++++++++----- .../Configuration/EncodingConfigurationFactory.cs | 4 ++-- MediaBrowser.Model/Configuration/EncodingOptions.cs | 2 +- MediaBrowser.Model/System/SystemInfo.cs | 6 +++--- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 9adbe9034..3a607aa54 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1447,7 +1447,7 @@ namespace Emby.Server.Implementations CanSelfRestart = CanSelfRestart, CanLaunchWebBrowser = CanLaunchWebBrowser, HasUpdateAvailable = HasUpdateAvailable, - TranscodePath = ApplicationPaths.TranscodePath, + TranscodingTempPath = ApplicationPaths.TranscodePath, ServerName = FriendlyName, LocalAddress = localAddress, SupportsLibraryMonitor = true, diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs index 2bd1b4361..fe705cbe2 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.TranscodePath) ? + ((ServerApplicationPaths)ApplicationPaths).TranscodePath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ? null : - Path.Combine(encodingConfig.TranscodePath, "transcodes"); + Path.Combine(encodingConfig.TranscodingTempPath, "transcodes"); } protected override void OnNamedConfigurationUpdated(string key, object configuration) diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs index 9c0db2cf5..7bef2ae58 100644 --- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs +++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs @@ -21,7 +21,7 @@ namespace Emby.Server.Implementations.EntryPoints public class LibraryChangedNotifier : IServerEntryPoint { /// - /// The _library manager + /// The library manager. /// private readonly ILibraryManager _libraryManager; @@ -30,7 +30,7 @@ namespace Emby.Server.Implementations.EntryPoints private readonly ILogger _logger; /// - /// The _library changed sync lock + /// The library changed sync lock. /// private readonly object _libraryChangedSyncLock = new object(); @@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.EntryPoints private Timer LibraryUpdateTimer { get; set; } /// - /// The library update duration + /// The library update duration. /// private const int LibraryUpdateDuration = 30000; @@ -188,8 +188,11 @@ namespace Emby.Server.Implementations.EntryPoints { if (LibraryUpdateTimer == null) { - LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration, - Timeout.Infinite); + LibraryUpdateTimer = new Timer( + LibraryUpdateTimerCallback, + null, + LibraryUpdateDuration, + Timeout.Infinite); } else { diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs index 857add4cb..bb806ee55 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.TranscodePath; + var newPath = newEncodingConfig.TranscodingTempPath; if (!string.IsNullOrWhiteSpace(newPath) - && !string.Equals(oldEncodingConfig.TranscodePath ?? string.Empty, newPath)) + && !string.Equals(oldEncodingConfig.TranscodingTempPath ?? string.Empty, newPath)) { // Validate if (!Directory.Exists(newPath)) diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 795ef1736..9ae10d980 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 TranscodePath { get; set; } + public string TranscodingTempPath { 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 2e5e65690..7014a5c87 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -110,10 +110,10 @@ namespace MediaBrowser.Model.System public string InternalMetadataPath { get; set; } /// - /// Gets or sets the transcoding temporary path. + /// Gets or sets the transcode path. /// - /// The transcoding temporary path. - public string TranscodePath { get; set; } + /// The transcode path. + public string TranscodingTempPath { get; set; } /// /// Gets or sets the HTTP server port number.