Queue home videos from the same folder

Author: Scorpeg

app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemLauncher.java

@@ -156,11 +156,15 @@ public void launch(final BaseRowItem rowItem, MutableObjectAdapter<Object> adapt
                             break;
                         case Play:
                             //Just play it directly
-                            playbackHelper.getValue().getItemsToPlay(context, baseItem, baseItem.getType() == BaseItemKind.MOVIE, false, new Response<List<BaseItemDto>>() {
+                            final BaseItemDto itemToPlay = baseItem;
+                            playbackHelper.getValue().getItemsToPlay(context, itemToPlay, itemToPlay.getType() == BaseItemKind.MOVIE, false, new Response<List<BaseItemDto>>() {
                                 @Override
                                 public void onResponse(List<BaseItemDto> response) {
                                     if (!isActive()) return;
-                                    playbackLauncher.getValue().launch(context, response);
+                                    int itemPosition = itemToPlay.getType() == BaseItemKind.VIDEO
+                                            ? findItemPosition(response, itemToPlay)
+                                            : 0;
+                                    playbackLauncher.getValue().launch(context, response, null, false, itemPosition);
                                 }
                             });
                             break;
@@ -274,4 +278,14 @@ public void onResponse(BaseItemDto response) {
                 break;
         }
     }
+
+    private int findItemPosition(List<BaseItemDto> items, BaseItemDto selectedItem) {
+        for (int index = 0; index < items.size(); index++) {
+            if (items.get(index).getId().equals(selectedItem.getId())) {
+                return index;
+            }
+        }
+
+        return 0;
+    }
 }

app/src/main/java/org/jellyfin/androidtv/util/sdk/SdkPlaybackHelper.kt

@@ -230,6 +230,20 @@ class SdkPlaybackHelper(
 				}
 			}
 
+			BaseItemKind.VIDEO -> {
+				val parentId = mainItem.parentId
+				if (parentId == null) {
+					getParts(mainItem)
+				} else {
+					val siblingVideos = getVideosInFolder(parentId)
+					if (siblingVideos.any { it.id == mainItem.id } && siblingVideos.size > 1) {
+						siblingVideos
+					} else {
+						getParts(mainItem)
+					}
+				}
+			}
+
 			else -> {
 				val parts = getParts(mainItem)
 				val addIntros = allowIntros && userPreferences[UserPreferences.cinemaModeEnabled]
@@ -248,6 +262,29 @@ class SdkPlaybackHelper(
 		}
 	}
 
+	private suspend fun getVideosInFolder(parentId: UUID): List<BaseItemDto> {
+		val videos = mutableListOf<BaseItemDto>()
+		var totalRecordCount: Int
+
+		do {
+			val response by api.itemsApi.getItems(
+				parentId = parentId,
+				isMissing = false,
+				includeItemTypes = listOf(BaseItemKind.VIDEO),
+				sortBy = listOf(ItemSortBy.SORT_NAME),
+				startIndex = videos.size,
+				limit = ITEM_QUERY_LIMIT,
+				fields = ItemRepository.itemFields,
+			)
+
+			totalRecordCount = response.totalRecordCount
+			if (response.items.isEmpty()) break
+			videos += response.items
+		} while (videos.size < totalRecordCount)
+
+		return videos
+	}
+
 	private suspend fun getParts(item: BaseItemDto): List<BaseItemDto> = buildList {
 		add(item)