diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-20 21:59:26 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-20 21:59:26 -0400 |
| commit | 192cbe34aa23fe3aa4f75500cc34c6cec2a30965 (patch) | |
| tree | 783da8550361e2076f8ac76f364bc3bb131d9f6e /MediaBrowser.Server.Startup.Common/FFMpeg | |
| parent | 2d6954f5206cf1c07660108018ff3432dd1c9f05 (diff) | |
fix user data queries
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/FFMpeg')
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs index fc74d1f25d..2c393ff29b 100644 --- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs +++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegLoader.cs @@ -24,7 +24,6 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg private readonly IZipClient _zipClient; private readonly IFileSystem _fileSystem; private readonly NativeEnvironment _environment; - private readonly Assembly _ownerAssembly; private readonly FFMpegInstallInfo _ffmpegInstallInfo; private readonly string[] _fontUrls = @@ -32,7 +31,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/ARIALUNI.7z" }; - public FFMpegLoader(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IZipClient zipClient, IFileSystem fileSystem, NativeEnvironment environment, Assembly ownerAssembly, FFMpegInstallInfo ffmpegInstallInfo) + public FFMpegLoader(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IZipClient zipClient, IFileSystem fileSystem, NativeEnvironment environment, FFMpegInstallInfo ffmpegInstallInfo) { _logger = logger; _appPaths = appPaths; @@ -40,7 +39,6 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg _zipClient = zipClient; _fileSystem = fileSystem; _environment = environment; - _ownerAssembly = ownerAssembly; _ffmpegInstallInfo = ffmpegInstallInfo; } @@ -99,14 +97,8 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg } else { - // Older version found. - // Start with that. Download new version in the background. - var newPath = versionedDirectoryPath; - Task.Run(() => DownloadFFMpegInBackground(downloadInfo, newPath)); - info = existingVersion; versionedDirectoryPath = Path.GetDirectoryName(info.EncoderPath); - excludeFromDeletions.Add(versionedDirectoryPath); } } |
