lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor changes to transcode cleanup scheduled task

Browse Source
This commit is contained in:
dkanada 2019-10-24 10:50:25 +09:00
parent c0d10800ab
commit f3ca37e523
9 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -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,

2
Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

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

2
Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
View File

@ -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)

18
Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
View File

@ -39,7 +39,13 @@ 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() => new List<TaskTriggerInfo>();
public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
{
yield return new TaskTriggerInfo
{
Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks
};
}
/// <summary>
/// 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;
}

18
Emby.Server.Implementations/ServerApplicationPaths.cs
View File

@ -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;
/// <summary>
@ -107,19 +107,19 @@ namespace Emby.Server.Implementations
/// <value>The user configuration directory path.</value>
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;
}

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -167,7 +167,7 @@ namespace MediaBrowser.Api
/// </summary>
private void DeleteEncodedMediaCache()
{
var path = ConfigurationManager.ApplicationPaths.GetTranscodingTempPath();
var path = ConfigurationManager.ApplicationPaths.GetTranscodePath();
if (!Directory.Exists(path))
{

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -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)
{

6
MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs
View File

@ -97,7 +97,7 @@ namespace MediaBrowser.Api.Playback.Hls
public Task<object> 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);
}

4
MediaBrowser.Controller/IServerApplicationPaths.cs
View File

@ -86,7 +86,7 @@ namespace MediaBrowser.Controller
/// Gets the transcoding temporary path.
/// </summary>
/// <value>The transcoding temporary path.</value>
string TranscodingTempPath { get; }
string TranscodePath { get; }
/// <summary>
/// Gets the internal metadata path.
@ -97,6 +97,6 @@ namespace MediaBrowser.Controller
string ArtistsPath { get; }
string GetTranscodingTempPath();
string GetTranscodePath();
}
}