From f8dd02bb66d2f243515d295b4d256a4c74f433ca Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 11 Nov 2016 02:30:03 -0500 Subject: [PATCH] update LibraryMonitor --- .../IO/LibraryMonitor.cs | 6 +++--- Emby.Server.Core/project.json | 1 + MediaBrowser.Server.Startup.Common/ApplicationHost.cs | 1 + .../MediaBrowser.Server.Startup.Common.csproj | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) rename {MediaBrowser.Server.Startup.Common => Emby.Server.Core}/IO/LibraryMonitor.cs (99%) diff --git a/MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs b/Emby.Server.Core/IO/LibraryMonitor.cs similarity index 99% rename from MediaBrowser.Server.Startup.Common/IO/LibraryMonitor.cs rename to Emby.Server.Core/IO/LibraryMonitor.cs index 153df6026b..6ed096f441 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 8e120c8a11..d5f274858e 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 0646c71fda..f427f9f567 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 4bbd86060e..3b391b236c 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 @@ -