aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
diff options
context:
space:
mode:
authorabeloin <alexandre.beloin@gmail.com>2013-12-25 14:26:49 -0500
committerabeloin <alexandre.beloin@gmail.com>2013-12-25 14:26:49 -0500
commit68cf16416ba4fb88293b2bdac9867c5534fd7357 (patch)
treeb3cccf82125c474c759e97f3fa215efb8d15893c /MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
parentbb5e6fdcad9e92b58b754075b8df2387590aeaaf (diff)
Linux fixes:
-Copy PropertyChanged.Fody.dll to Tools/Fody in MediaBrowser.Model.csproj -Check if root for WebSocketServer.FlashAccessPolicyEnabled (port < 1024) -Check resolution value !=0 before SetResolution -Catch _userManager.RefreshUsersMetadata exception when running MB3 for the first time -Fix _appHost.Init() missing argument -FFmpeg: set default and execute permission(766) to ffmpeg and ffprobe -FFmpeg: Detect the OS type and download the correct version -Rename MediaBrowser.WebDashboard/dashboard-ui/scripts/Itemdetailpage.js to itemdetailpage.js
Diffstat (limited to 'MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs')
-rw-r--r--MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
index d257ff362..1e99c4eb0 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
@@ -12,6 +12,9 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+#if __MonoCS__
+using Mono.Unix.Native;
+#endif
namespace MediaBrowser.ServerApplication.FFMpeg
{
@@ -147,6 +150,13 @@ namespace MediaBrowser.ServerApplication.FFMpeg
}))
{
File.Copy(file, Path.Combine(targetFolder, Path.GetFileName(file)), true);
+ #if __MonoCS__
+ //Linux: File permission to 666, and user's execute bit
+ if (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX)
+ {
+ Syscall.chmod(Path.Combine(targetFolder, Path.GetFileName(file)), FilePermissions.DEFFILEMODE | FilePermissions.S_IXUSR);
+ }
+ #endif
}
}
finally