aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Mono
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-03-12 15:28:28 -0400
committerGitHub <noreply@github.com>2017-03-12 15:28:28 -0400
commit7ae1de52b45267e399b6cbbaa423665bb006bf79 (patch)
tree227cb95db1ddc171c078ce9bc6f8f717cc2e9e20 /MediaBrowser.Server.Mono
parent3962361ad9940e0c8b2e6d4aea4fc6b1cdd88553 (diff)
parent5e821947491c07eb65db4653db674af55bc4e90b (diff)
Merge pull request #2523 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Mono')
-rw-r--r--MediaBrowser.Server.Mono/Native/MonoFileSystem.cs5
-rw-r--r--MediaBrowser.Server.Mono/Program.cs7
2 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs b/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs
index a5dc691a75..91c064efec 100644
--- a/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs
+++ b/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs
@@ -1,13 +1,14 @@
using Emby.Common.Implementations.IO;
using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.System;
using Mono.Unix.Native;
namespace MediaBrowser.Server.Mono.Native
{
public class MonoFileSystem : ManagedFileSystem
{
- public MonoFileSystem(ILogger logger, bool supportsAsyncFileStreams, bool enableManagedInvalidFileNameChars, string tempPath)
- : base(logger, supportsAsyncFileStreams, enableManagedInvalidFileNameChars, true, tempPath)
+ public MonoFileSystem(ILogger logger, IEnvironmentInfo environment, string tempPath)
+ : base(logger, environment, tempPath)
{
}
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 649283410f..66851f7e94 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -114,12 +114,11 @@ namespace MediaBrowser.Server.Mono
// Allow all https requests
ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
- var fileSystem = new MonoFileSystem(logManager.GetLogger("FileSystem"), false, false, appPaths.TempDirectory);
- fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
+ var environmentInfo = GetEnvironmentInfo();
- FileSystem = fileSystem;
+ var fileSystem = new MonoFileSystem(logManager.GetLogger("FileSystem"), environmentInfo, appPaths.TempDirectory);
- var environmentInfo = GetEnvironmentInfo();
+ FileSystem = fileSystem;
var imageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, logManager, fileSystem, options, () => _appHost.HttpClient, appPaths);