update stream sorting

3 files changed, 5 insertions, 18 deletions

diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
index a9affe1ec..5474892e8 100644
--- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
@@ -268,8 +268,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
                         originalImage.CurrentImage.CompressionQuality = quality;
 
                         originalImage.SaveImage(cacheFilePath);
-
-                        return cacheFilePath;
                     }
                 }
                 else
@@ -286,8 +284,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
                             wand.CurrentImage.CompressionQuality = quality;
 
                             wand.SaveImage(cacheFilePath);
-
-                            return cacheFilePath;
                         }
                     }
                 }
@@ -296,6 +292,8 @@ namespace MediaBrowser.Server.Implementations.Drawing
             {
                 semaphore.Release();
             }
+
+            return cacheFilePath;
         }
 
         private ImageFormat GetOutputFormat(ImageFormat requestedFormat)
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
index 6fb02358e..eac0cd96d 100644
--- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
@@ -223,8 +223,8 @@ namespace MediaBrowser.Server.Implementations.Photos
 
         protected virtual List<BaseItem> GetFinalItems(List<BaseItem> items, int limit)
         {
-            // Rotate the images no more than once per week
-            var random = new Random(GetWeekOfYear()).Next();
+            // Rotate the images once every 7 days
+            var random = DateTime.Now.DayOfYear % 7;
 
             return items
                 .OrderBy(i => (random + "" + items.IndexOf(i)).GetMD5())
@@ -233,18 +233,6 @@ namespace MediaBrowser.Server.Implementations.Photos
                 .ToList();
         }
 
-        private int GetWeekOfYear()
-        {
-            return DateTime.Now.Second;
-            var usCulture = new CultureInfo("en-US");
-            var weekNo = usCulture.Calendar.GetWeekOfYear(
-                            DateTime.Now,
-                            usCulture.DateTimeFormat.CalendarWeekRule,
-                            usCulture.DateTimeFormat.FirstDayOfWeek);
-
-            return weekNo;
-        }
-
         public int Order
         {
             get
diff --git a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
index 9dbffa922..966129f4b 100644
--- a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
+++ b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
@@ -51,6 +51,7 @@ namespace MediaBrowser.Server.Implementations.Udp
 
             AddMessageResponder("who is MediaBrowserServer?", RespondToV1Message);
             AddMessageResponder("who is MediaBrowserServer_v2?", RespondToV2Message);
+            AddMessageResponder("who is EmbyServer_v2?", RespondToV2Message);
         }
 
         private void AddMessageResponder(string message, Action<string> responder)