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

Merge pull request #1934 from dkanada/transcode

Browse Source 
Minor changes to transcode cleanup scheduled task
This commit is contained in:
Bond-009 2019-11-21 16:18:46 +01:00 committed by GitHub
commit d868a8da6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.TranscodingTempPath,
TranscodingTempPath = 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
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");
}

13
Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@ -21,7 +21,7 @@ namespace Emby.Server.Implementations.EntryPoints
public class LibraryChangedNotifier : IServerEntryPoint
{
/// <summary>
/// The _library manager
/// The library manager.
/// </summary>
private readonly ILibraryManager _libraryManager;
@ -30,7 +30,7 @@ namespace Emby.Server.Implementations.EntryPoints
private readonly ILogger _logger;
/// <summary>
/// The _library changed sync lock
/// The library changed sync lock.
/// </summary>
private readonly object _libraryChangedSyncLock = new object();
@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.EntryPoints
private Timer LibraryUpdateTimer { get; set; }
/// <summary>
/// The library update duration
/// The library update duration.
/// </summary>
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
{

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)

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

@ -54,7 +54,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
try
{
DeleteTempFilesFromDirectory(cancellationToken, ApplicationPaths.TranscodingTempPath, minDateModified, progress);
DeleteTempFilesFromDirectory(cancellationToken, ApplicationPaths.TranscodePath, minDateModified, progress);
}
catch (DirectoryNotFoundException)
{
@ -138,13 +138,13 @@ 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;

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

@ -10,8 +10,8 @@ namespace Emby.Server.Implementations
/// </summary>
public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
{
private string _defaultTranscodingTempPath;
private string _transcodingTempPath;
private string _defaultTranscodePath;
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 => _defaultTranscodePath ?? (_defaultTranscodePath = 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();
}
}

4
MediaBrowser.Model/System/SystemInfo.cs
View File

@ -110,9 +110,9 @@ namespace MediaBrowser.Model.System
public string InternalMetadataPath { get; set; }
/// <summary>
/// Gets or sets the transcoding temporary path.
/// Gets or sets the transcode path.
/// </summary>
/// <value>The transcoding temporary path.</value>
/// <value>The transcode path.</value>
public string TranscodingTempPath { get; set; }
/// <summary>