diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-11 02:30:03 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-11 02:30:03 -0500 |
| commit | f8dd02bb66d2f243515d295b4d256a4c74f433ca (patch) | |
| tree | ce85fe9a517a10a4b0ac7ae265ee2e03cb4ba89f | |
| parent | 00cbadea2c5ea8c717808fb4e8b11004509dc379 (diff) | |
update LibraryMonitor
| -rw-r--r-- | Emby.Server.Core/IO/LibraryMonitor.cs (renamed from MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs) | 6 | ||||
| -rw-r--r-- | Emby.Server.Core/project.json | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/ApplicationHost.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs b/Emby.Server.Core/IO/LibraryMonitor.cs index 153df6026..6ed096f44 100644 --- a/MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs +++ b/Emby.Server.Core/IO/LibraryMonitor.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Emby.Server.Implementations.IO; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; @@ -14,8 +13,9 @@ using MediaBrowser.Model.Logging; using MediaBrowser.Model.System; using MediaBrowser.Model.Tasks; using MediaBrowser.Model.Threading; +using Emby.Server.Implementations.IO; -namespace MediaBrowser.Server.Startup.Common.IO +namespace Emby.Server.Core.IO { public class LibraryMonitor : ILibraryMonitor { @@ -293,7 +293,7 @@ namespace MediaBrowser.Server.Startup.Common.IO IncludeSubdirectories = true }; - if (Environment.OSVersion.Platform == PlatformID.Win32NT) + if (_environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows) { newWatcher.InternalBufferSize = 32767; } diff --git a/Emby.Server.Core/project.json b/Emby.Server.Core/project.json index 8e120c8a1..d5f274858 100644 --- a/Emby.Server.Core/project.json +++ b/Emby.Server.Core/project.json @@ -40,6 +40,7 @@ "NETStandard.Library": "1.6.0", "System.AppDomain": "2.0.11", "System.Globalization.Extensions": "4.0.1", + "System.IO.FileSystem.Watcher": "4.0.0", "MediaBrowser.Model": { "target": "project" }, diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 0646c71fd..f427f9f56 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -92,6 +92,7 @@ using Emby.Server.Core.Configuration; using Emby.Server.Core.Data; using Emby.Server.Core.Devices; using Emby.Server.Core.FFMpeg; +using Emby.Server.Core.IO; using Emby.Server.Core.Localization; using Emby.Server.Core.Migrations; using Emby.Server.Core.Notifications; diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj index 4bbd86060..3b391b236 100644 --- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj +++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj @@ -115,7 +115,6 @@ <Compile Include="Cryptography\X520Attributes.cs" /> <Compile Include="HttpServerFactory.cs" /> <Compile Include="INativeApp.cs" /> - <Compile Include="IO\LibraryMonitor.cs" /> <Compile Include="IO\MemoryStreamProvider.cs" /> <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" /> <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\ReportBlock.cs" /> |