Merge pull request #1305 from MediaBrowser/master

merge from master

2 files changed, 10 insertions, 14 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 2105f1a47..6bc1af591 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -68,23 +68,12 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (stream.IsTextSubtitleStream)
             {
-                return InternalTextStreamSupportsExternalStream(stream);
+                return true;
             }
 
             return false;
         }
 
-        private bool InternalTextStreamSupportsExternalStream(MediaStream stream)
-        {
-            // These usually have styles and fonts that won't convert to text very well
-            if (string.Equals(stream.Codec, "ass", StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
         public IEnumerable<MediaStream> GetMediaStreams(string mediaSourceId)
         {
             var list = GetMediaStreams(new MediaStreamQuery
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
index bfa4fe944..05c3db63c 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller;
 
 namespace MediaBrowser.Server.Implementations.ScheduledTasks
 {
@@ -17,13 +18,16 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
+        private readonly IServerApplicationHost _appHost;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PeopleValidationTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        public PeopleValidationTask(ILibraryManager libraryManager)
+        public PeopleValidationTask(ILibraryManager libraryManager, IServerApplicationHost appHost)
         {
             _libraryManager = libraryManager;
+            _appHost = appHost;
         }
 
         /// <summary>
@@ -32,9 +36,12 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
         /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
         public IEnumerable<ITaskTrigger> GetDefaultTriggers()
         {
+            // Randomize the default start hour because this operation can really hammer internet metadata providers
+            var startHour = new Random(_appHost.SystemId.GetHashCode()).Next(0, 8);
+
             return new ITaskTrigger[]
                 {
-                    new DailyTrigger { TimeOfDay = TimeSpan.FromHours(3) },
+                    new DailyTrigger { TimeOfDay = TimeSpan.FromHours(startHour) },
                 };
         }