Queue home videos from the same folder

When playing a standalone home video item, load sibling videos from the same parent folder and start playback at the selected item.
Skip Next Up and controls overlays during automatic transitions between queued home videos so they play consecutively without interruption.

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/ui/playback/PlaybackController.java

@@ -85,6 +85,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
     protected VideoOptions mCurrentOptions;
     private int mDefaultAudioIndex = -1;
     protected boolean burningSubs = false;
+    private boolean suppressOverlayOnNextPlayback = false;
 
     // The server does not update the subtitle delivery method when alwaysBurnInSubtitleWhenTranscoding
     // is set, so we need to assume subs are burned in when transcoding with the option enabled.
@@ -454,6 +455,11 @@ protected void play(long position, @Nullable Integer forcedSubtitleIndex) {
                     return;
                 }
 
+                if (suppressOverlayOnNextPlayback) {
+                    mFragment.leanbackOverlayFragment.setShouldShowOverlay(false);
+                    mFragment.leanbackOverlayFragment.hideOverlay();
+                }
+
                 // make sure item isn't missing
                 if (item.getLocationType() == LocationType.VIRTUAL) {
                     if (hasNextItem()) {
@@ -1195,7 +1201,8 @@ private void itemComplete() {
         Timber.i("Moving to next queue item. Index: %s", (mCurrentIndex + 1));
         boolean stillWatchingEnabled = userPreferences.getValue().get(UserPreferences.Companion.getStillWatchingBehavior()) != StillWatchingBehavior.DISABLED;
         boolean nextUpEnabled = userPreferences.getValue().get(UserPreferences.Companion.getNextUpBehavior()) != NextUpBehavior.DISABLED;
-        if ((stillWatchingEnabled || nextUpEnabled) && curItem.getType() != BaseItemKind.TRAILER) {
+        boolean showPlaybackPrompt = curItem.getType() != BaseItemKind.TRAILER && curItem.getType() != BaseItemKind.VIDEO;
+        if ((stillWatchingEnabled || nextUpEnabled) && showPlaybackPrompt) {
             mCurrentIndex++;
             videoQueueManager.getValue().setCurrentMediaPosition(mCurrentIndex);
             spinnerOff = false;
@@ -1211,6 +1218,9 @@ private void itemComplete() {
             }
             endPlayback();
         } else {
+            if (curItem.getType() == BaseItemKind.VIDEO) {
+                suppressOverlayOnNextPlayback = true;
+            }
             next();
         }
     }
@@ -1226,6 +1236,10 @@ public void onPrepared() {
             if (mFragment != null) {
                 mFragment.setFadingEnabled(true);
                 mFragment.leanbackOverlayFragment.setShouldShowOverlay(false);
+                if (suppressOverlayOnNextPlayback) {
+                    mFragment.leanbackOverlayFragment.hideOverlay();
+                    suppressOverlayOnNextPlayback = false;
+                }
             }
 
             mPlaybackState = PlaybackState.PLAYING;

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)