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

use existing font when possible

Browse Source
This commit is contained in:
Luke Pulverenti 2013-08-27 22:31:49 -04:00
parent 191c6e695b
commit 13198a687d
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@ -236,26 +236,49 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
if (!File.Exists(fontFile)) if (!File.Exists(fontFile))
{ {
var tempFile = await _httpClient.GetTempFile(new HttpRequestOptions await DownloadFontFile(fontsDirectory, fontFilename).ConfigureAwait(false);
{ }
Url = FontUrl,
Progress = new Progress<double>()
});
_zipClient.ExtractAll(tempFile, fontsDirectory, true); await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false);
}
private async Task DownloadFontFile(string fontsDirectory, string fontFilename)
{
var existingFile = Directory
.EnumerateFiles(_appPaths.ProgramDataPath, fontFilename, SearchOption.AllDirectories)
.FirstOrDefault();
if (existingFile != null)
{
try try
{ {
File.Delete(tempFile); File.Copy(existingFile, Path.Combine(fontsDirectory, fontFilename), true);
return;
} }
catch (IOException ex) catch (IOException ex)
{ {
// Log this, but don't let it fail the operation // Log this, but don't let it fail the operation
_logger.ErrorException("Error deleting temp file {0}", ex, tempFile); _logger.ErrorException("Error copying file", ex);
} }
} }
await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false); var tempFile = await _httpClient.GetTempFile(new HttpRequestOptions
{
Url = FontUrl,
Progress = new Progress<double>()
});
_zipClient.ExtractAll(tempFile, fontsDirectory, true);
try
{
File.Delete(tempFile);
}
catch (IOException ex)
{
// Log this, but don't let it fail the operation
_logger.ErrorException("Error deleting temp file {0}", ex, tempFile);
}
} }
private async Task WriteFontConfigFile(string fontsDirectory) private async Task WriteFontConfigFile(string fontsDirectory)