michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support configurable transcoding temporary path

Browse Source
This commit is contained in:
Luke Pulverenti 2014-01-11 13:58:50 -05:00
parent ef8b02d285
commit 7f57ef0689
9 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -71,7 +71,7 @@ namespace MediaBrowser.Api
/// </summary>
private void DeleteEncodedMediaCache()
{
foreach (var file in Directory.EnumerateFiles(AppPaths.EncodedMediaCachePath)
foreach (var file in Directory.EnumerateFiles(AppPaths.TranscodingTempPath)
.Where(i => EntityResolutionHelper.VideoFileExtensions.Contains(Path.GetExtension(i)))
.ToList())
{

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

@ -122,7 +122,7 @@ namespace MediaBrowser.Api.Playback
/// <returns>System.String.</returns>
protected virtual string GetOutputFilePath(StreamState state)
{
var folder = ServerConfigurationManager.ApplicationPaths.EncodedMediaCachePath;
var folder = ServerConfigurationManager.ApplicationPaths.TranscodingTempPath;
var outputFileExtension = GetOutputFileExtension(state);

2
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
View File

@ -31,7 +31,7 @@ namespace MediaBrowser.Api.Playback.Hls
protected override string GetOutputFilePath(StreamState state)
{
var folder = ServerConfigurationManager.ApplicationPaths.EncodedMediaCachePath;
var folder = ServerConfigurationManager.ApplicationPaths.TranscodingTempPath;
var outputFileExtension = GetOutputFileExtension(state);

2
MediaBrowser.Api/Playback/Hls/HlsSegmentResponseFilter.cs
View File

@ -42,7 +42,7 @@ namespace MediaBrowser.Api.Playback.Hls
Logger.Info("OnEndRequest " + playlistId);
var normalizedPlaylistId = playlistId.Replace("-low", string.Empty);
foreach (var playlist in Directory.EnumerateFiles(ApplicationPaths.EncodedMediaCachePath, "*.m3u8")
foreach (var playlist in Directory.EnumerateFiles(ApplicationPaths.TranscodingTempPath, "*.m3u8")
.Where(i => i.IndexOf(normalizedPlaylistId, StringComparison.OrdinalIgnoreCase) != -1)
.ToList())
{

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

@ -89,7 +89,7 @@ namespace MediaBrowser.Api.Playback.Hls
var file = request.PlaylistId + Path.GetExtension(Request.PathInfo);
file = Path.Combine(_appPaths.EncodedMediaCachePath, file);
file = Path.Combine(_appPaths.TranscodingTempPath, file);
return ResultFactory.GetStaticFileResult(Request, file, FileShare.ReadWrite);
}
@ -108,7 +108,7 @@ namespace MediaBrowser.Api.Playback.Hls
{
var file = request.SegmentId + Path.GetExtension(Request.PathInfo);
file = Path.Combine(_appPaths.EncodedMediaCachePath, file);
file = Path.Combine(_appPaths.TranscodingTempPath, file);
OnBeginRequest(request.PlaylistId);
@ -124,7 +124,7 @@ namespace MediaBrowser.Api.Playback.Hls
{
var file = request.SegmentId + Path.GetExtension(Request.PathInfo);
file = Path.Combine(_appPaths.EncodedMediaCachePath, file);
file = Path.Combine(_appPaths.TranscodingTempPath, file);
return ResultFactory.GetStaticFileResult(Request, file, FileShare.ReadWrite);
}
@ -137,7 +137,7 @@ namespace MediaBrowser.Api.Playback.Hls
{
var normalizedPlaylistId = playlistId.Replace("-low", string.Empty);
foreach (var playlist in Directory.EnumerateFiles(_appPaths.EncodedMediaCachePath, "*.m3u8")
foreach (var playlist in Directory.EnumerateFiles(_appPaths.TranscodingTempPath, "*.m3u8")
.Where(i => i.IndexOf(normalizedPlaylistId, StringComparison.OrdinalIgnoreCase) != -1)
.ToList())
{

6
MediaBrowser.Controller/IServerApplicationPaths.cs
View File

@ -95,10 +95,10 @@ namespace MediaBrowser.Controller
string UserConfigurationDirectoryPath { get; }
/// <summary>
/// Gets the FF MPEG stream cache path.
/// Gets the transcoding temporary path.
/// </summary>
/// <value>The FF MPEG stream cache path.</value>
string EncodedMediaCachePath { get; }
/// <value>The transcoding temporary path.</value>
string TranscodingTempPath { get; }
/// <summary>
/// Gets the downloaded images data path.

1
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -220,6 +220,7 @@ namespace MediaBrowser.Model.Configuration
public MetadataOptions BookOptions { get; set; }
public bool EnableDebugEncodingLogging { get; set; }
public string TranscodingTempPath { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.

32
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -60,6 +60,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
protected override void OnConfigurationUpdated()
{
UpdateItemsByNamePath();
UpdateTranscodingTempPath();
base.OnConfigurationUpdated();
}
@ -74,6 +75,16 @@ namespace MediaBrowser.Server.Implementations.Configuration
Configuration.ItemsByNamePath;
}
/// <summary>
/// Updates the transcoding temporary path.
/// </summary>
private void UpdateTranscodingTempPath()
{
((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(Configuration.TranscodingTempPath) ?
null :
Configuration.TranscodingTempPath;
}
/// <summary>
/// Replaces the configuration.
/// </summary>
@ -84,6 +95,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
var newConfig = (ServerConfiguration) newConfiguration;
ValidateItemByNamePath(newConfig);
ValidateTranscodingTempPath(newConfig);
base.ReplaceConfiguration(newConfiguration);
}
@ -107,5 +119,25 @@ namespace MediaBrowser.Server.Implementations.Configuration
}
}
}
/// <summary>
/// Validates the transcoding temporary path.
/// </summary>
/// <param name="newConfig">The new configuration.</param>
/// <exception cref="DirectoryNotFoundException"></exception>
private void ValidateTranscodingTempPath(ServerConfiguration newConfig)
{
var newPath = newConfig.TranscodingTempPath;
if (!string.IsNullOrWhiteSpace(newPath)
&& !string.Equals(Configuration.TranscodingTempPath ?? string.Empty, newPath))
{
// Validate
if (!Directory.Exists(newPath))
{
throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
}
}
}
}
}

13
MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
View File

@ -200,15 +200,16 @@ namespace MediaBrowser.Server.Implementations
}
}
/// <summary>
/// Gets the FF MPEG stream cache path.
/// </summary>
/// <value>The FF MPEG stream cache path.</value>
public string EncodedMediaCachePath
private string _transcodingTempPath;
public string TranscodingTempPath
{
get
{
return Path.Combine(CachePath, "encoded-media");
return _transcodingTempPath ?? (_transcodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp"));
}
set
{
_transcodingTempPath = value;
}
}