From 91416cb8a83eadde908e810afea981b6e4bed234 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 25 Jan 2015 16:04:29 -0500 Subject: [PATCH] clean up ffmpeg downloading --- .../FFMpeg/FFMpegDownloader.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs index 58e8e2da8e..406f21b7ec 100644 --- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs +++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs @@ -228,9 +228,9 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg string.Equals(filename, downloadinfo.FFMpegFilename, StringComparison.OrdinalIgnoreCase); })) { - File.Copy(file, Path.Combine(targetFolder, Path.GetFileName(file)), true); - - SetFilePermissions(targetFolder, file); + var targetFile = Path.Combine(targetFolder, Path.GetFileName(file)); + File.Copy(file, targetFile, true); + SetFilePermissions(targetFile); } } finally @@ -239,12 +239,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg } } - private void SetFilePermissions(string targetFolder, string file) + private void SetFilePermissions(string path) { // Linux: File permission to 666, and user's execute bit if (_environment.OperatingSystem == OperatingSystem.Bsd || _environment.OperatingSystem == OperatingSystem.Linux || _environment.OperatingSystem == OperatingSystem.Osx) { - Syscall.chmod(Path.Combine(targetFolder, Path.GetFileName(file)), FilePermissions.DEFFILEMODE | FilePermissions.S_IXUSR); + Syscall.chmod(path, FilePermissions.DEFFILEMODE | FilePermissions.S_IXUSR); } }