From 74c735dbd0327d67927ffb99413368ce953ba55a Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Wed, 24 May 2023 15:50:09 -0400
Subject: [PATCH 1/4] Fix movies Shuffle button

---
 src/controllers/movies/movies.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 717d197e74..ea71569e35 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -31,11 +31,11 @@ export default function (view, params, tabContent, options) {
     }
 
     function shuffle() {
-        ApiClient.getItem(
-            ApiClient.getCurrentUserId(),
-            params.topParentId
-        ).then((item) => {
-            playbackManager.shuffle(item);
+        isLoading = true;
+        loading.show();
+        const newQuery = { ...query, SortBy: 'Random' };
+        return ApiClient.getItems(ApiClient.getCurrentUserId(), newQuery).then(({ Items }) => {
+            playbackManager.shuffle(Items[0]);
         });
     }
 

From f52ac7a96dd6c633674ada9579197a26e3ea7760 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Tue, 24 Sep 2024 12:43:23 -0400
Subject: [PATCH 2/4] Limit number of results returned since we only use 1

---
 src/controllers/movies/movies.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index ea71569e35..889a95ffb1 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -33,7 +33,7 @@ export default function (view, params, tabContent, options) {
     function shuffle() {
         isLoading = true;
         loading.show();
-        const newQuery = { ...query, SortBy: 'Random' };
+        const newQuery = { ...query, SortBy: 'Random', Limit: 1 };
         return ApiClient.getItems(ApiClient.getCurrentUserId(), newQuery).then(({ Items }) => {
             playbackManager.shuffle(Items[0]);
         });

From bb78451102cffdedaa98a2281c6461ae8bf59307 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Wed, 25 Sep 2024 13:49:41 -0400
Subject: [PATCH 3/4] Update src/controllers/movies/movies.js

Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
---
 src/controllers/movies/movies.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 889a95ffb1..42da3a7142 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -36,6 +36,8 @@ export default function (view, params, tabContent, options) {
         const newQuery = { ...query, SortBy: 'Random', Limit: 1 };
         return ApiClient.getItems(ApiClient.getCurrentUserId(), newQuery).then(({ Items }) => {
             playbackManager.shuffle(Items[0]);
+        }).finally(() => {
+            isLoading = false;
         });
     }
 

From ce4aded6545752fb2a34b7cef23b4f62cfb533d8 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:15:18 -0400
Subject: [PATCH 4/4] Update src/controllers/movies/movies.js

Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
---
 src/controllers/movies/movies.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 42da3a7142..a8eabfce2b 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -33,9 +33,12 @@ export default function (view, params, tabContent, options) {
     function shuffle() {
         isLoading = true;
         loading.show();
-        const newQuery = { ...query, SortBy: 'Random', Limit: 1 };
+        const newQuery = { ...query, SortBy: 'Random', StartIndex: 0, Limit: 300 };
         return ApiClient.getItems(ApiClient.getCurrentUserId(), newQuery).then(({ Items }) => {
-            playbackManager.shuffle(Items[0]);
+            playbackManager.play({
+                items: Items,
+                autoplay: true
+            });
         }).finally(() => {
             isLoading = false;
         });