Fix subscription randomisation in shuffle

girlpunk · Jan 4, 2025 · e2fe01c · e2fe01c
1 parent 0e79abe
commit e2fe01c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/MediaFeeder/MediaFeeder/Components/Pages/Shuffle.razor.cs b/MediaFeeder/MediaFeeder/Components/Pages/Shuffle.razor.cs
@@ -26,17 +26,25 @@ protected override async Task OnInitializedAsync()
         if (FolderId != null)
             _subscriptions = await DataContext.Subscriptions
                 .Where(s => s.ParentFolderId == FolderId)
-                .OrderBy(static s => Guid.NewGuid())
                 .ToListAsync();
         else if (SubscriptionId != null)
             _subscriptions = [await DataContext.Subscriptions.SingleAsync(s => s.Id == SubscriptionId)];
         else
             _subscriptions = await DataContext.Subscriptions
-                .OrderBy(static s => Guid.NewGuid())
                 .ToListAsync();
 
         StateHasChanged();
 
+        // Shuffle the order of the subscriptions
+        var rng = new Random(unchecked(Environment.TickCount * 31 + Environment.CurrentManagedThreadId));
+
+        for (var i = 0; i < _subscriptions.Count; i++)
+        {
+            i--;
+            var k = rng.Next(i + 1);
+            (_subscriptions[k], _subscriptions[i]) = (_subscriptions[i], _subscriptions[k]);
+        }
+
         _videos.Enqueue(
             await DataContext.Videos
                 .Where(v => v.Watched == false && _subscriptions.Contains(v.Subscription))