Browse Source

clean up ffmpeg downloading

Luke Pulverenti 10 years ago
parent
commit
91416cb8a8
1 changed files with 5 additions and 5 deletions
  1. 5 5
      MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs

+ 5 - 5
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs

@@ -228,9 +228,9 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
                             string.Equals(filename, downloadinfo.FFMpegFilename, StringComparison.OrdinalIgnoreCase);
                             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
             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
             // Linux: File permission to 666, and user's execute bit
             if (_environment.OperatingSystem == OperatingSystem.Bsd || _environment.OperatingSystem == OperatingSystem.Linux || _environment.OperatingSystem == OperatingSystem.Osx)
             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);
             }
             }
         }
         }