From f2abd8ba39eefd5397eb3f0e327efbca8d8ecd0f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 1 Jun 2015 10:49:23 -0400 Subject: update live tv database --- MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs') diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs index 491549d64..ef2888e4a 100644 --- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs +++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs @@ -84,7 +84,7 @@ namespace MediaBrowser.Server.Implementations.IO // This is an arbitraty amount of time, but delay it because file system writes often trigger events after RemoveTempIgnore has been called. // Seeing long delays in some situations, especially over the network, sometimes up to 45 seconds // But if we make this delay too high, we risk missing legitimate changes - await Task.Delay(10000).ConfigureAwait(false); + await Task.Delay(15000).ConfigureAwait(false); string val; _tempIgnoredPaths.TryRemove(path, out val); -- cgit v1.2.3 From 2771dd62891813c481c95ce662dd4b4678151689 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Jun 2015 01:30:14 -0400 Subject: add js local asset manager --- MediaBrowser.Api/Playback/MediaInfoService.cs | 2 +- MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs | 6 +++--- MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs') diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs index 72d4961cd..0b7b50134 100644 --- a/MediaBrowser.Api/Playback/MediaInfoService.cs +++ b/MediaBrowser.Api/Playback/MediaInfoService.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.Api.Playback } [Route("/Playback/BitrateTest", "GET")] - public class GetBitrateTestBytes : IReturn + public class GetBitrateTestBytes { [ApiMember(Name = "Size", Description = "Size", IsRequired = true, DataType = "int", ParameterType = "query", Verb = "GET")] public long Size { get; set; } diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs index ef2888e4a..ba5d10eef 100644 --- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs +++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs @@ -81,10 +81,10 @@ namespace MediaBrowser.Server.Implementations.IO throw new ArgumentNullException("path"); } - // This is an arbitraty amount of time, but delay it because file system writes often trigger events after RemoveTempIgnore has been called. + // This is an arbitraty amount of time, but delay it because file system writes often trigger events long after the file was actually written to. // Seeing long delays in some situations, especially over the network, sometimes up to 45 seconds - // But if we make this delay too high, we risk missing legitimate changes - await Task.Delay(15000).ConfigureAwait(false); + // But if we make this delay too high, we risk missing legitimate changes, such as user adding a new file, or hand-editing metadata + await Task.Delay(20000).ConfigureAwait(false); string val; _tempIgnoredPaths.TryRemove(path, out val); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index a4a5b672e..71f1f3415 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -117,6 +117,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest -- cgit v1.2.3 From 4cf456925f489c435704950d619ac206443e8698 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 14 Jun 2015 13:55:42 -0400 Subject: adjust default setting for library monitor --- .../MediaBrowser.Model.Portable.csproj | 3 +++ .../MediaBrowser.Model.net35.csproj | 3 +++ MediaBrowser.Model/Configuration/AutoOnOff.cs | 10 ++++++++++ .../Configuration/ServerConfiguration.cs | 6 +++--- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + .../IO/LibraryMonitor.cs | 19 ++++++++++++++++++- SharedVersion.cs | 2 +- 7 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 MediaBrowser.Model/Configuration/AutoOnOff.cs (limited to 'MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs') diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index a2fb14517..3238e79b7 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -182,6 +182,9 @@ Configuration\AccessSchedule.cs + + Configuration\AutoOnOff.cs + Configuration\BaseApplicationConfiguration.cs diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 0cb8e5ca2..be7277607 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -147,6 +147,9 @@ Configuration\AccessSchedule.cs + + Configuration\AutoOnOff.cs + Configuration\BaseApplicationConfiguration.cs diff --git a/MediaBrowser.Model/Configuration/AutoOnOff.cs b/MediaBrowser.Model/Configuration/AutoOnOff.cs new file mode 100644 index 000000000..e911a0ff1 --- /dev/null +++ b/MediaBrowser.Model/Configuration/AutoOnOff.cs @@ -0,0 +1,10 @@ + +namespace MediaBrowser.Model.Configuration +{ + public enum AutoOnOff + { + Auto, + Enabled, + Disabled + } +} diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index ec9e6e10f..f1d6bbcae 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -187,7 +187,6 @@ namespace MediaBrowser.Model.Configuration public bool EnableAutomaticRestart { get; set; } - public bool EnableRealtimeMonitor { get; set; } public PathSubstitution[] PathSubstitutions { get; set; } public string ServerName { get; set; } @@ -210,6 +209,8 @@ namespace MediaBrowser.Model.Configuration public bool DenyIFrameEmbedding { get; set; } + public AutoOnOff EnableLibraryMonitor { get; set; } + /// /// Initializes a new instance of the class. /// @@ -236,6 +237,7 @@ namespace MediaBrowser.Model.Configuration // 5 minutes MinResumeDurationSeconds = 300; + EnableLibraryMonitor = AutoOnOff.Auto; RealtimeLibraryMonitorDelay = 40; EnableInternetProviders = true; @@ -253,8 +255,6 @@ namespace MediaBrowser.Model.Configuration SeasonZeroDisplayName = "Specials"; - EnableRealtimeMonitor = true; - UICulture = "en-us"; PeopleMetadataOptions = new PeopleMetadataOptions(); diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index df3cd15f6..3daacdd73 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -96,6 +96,7 @@ + diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs index ba5d10eef..d6a1be962 100644 --- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs +++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs @@ -3,6 +3,7 @@ using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Logging; using MediaBrowser.Server.Implementations.ScheduledTasks; using Microsoft.Win32; @@ -147,9 +148,25 @@ namespace MediaBrowser.Server.Implementations.IO Start(); } + private bool EnableLibraryMonitor + { + get + { + switch (ConfigurationManager.Configuration.EnableLibraryMonitor) + { + case AutoOnOff.Auto: + return Environment.OSVersion.Platform == PlatformID.Win32NT; + case AutoOnOff.Enabled: + return true; + default: + return false; + } + } + } + public void Start() { - if (ConfigurationManager.Configuration.EnableRealtimeMonitor) + if (EnableLibraryMonitor) { StartInternal(); } diff --git a/SharedVersion.cs b/SharedVersion.cs index d1f70ad19..0478d2aae 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5641.2")] +[assembly: AssemblyVersion("3.0.5641.3")] -- cgit v1.2.3