Skip to content

Queue home videos from the same folder #5573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Scorpeg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Queue home videos from the same folder #5573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c74410a
Queue home videos from the same folder
Scorpeg Jun 2, 2026
786d94a
Limit home video folder queue lookup to one page
Scorpeg Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
28 changes: 28 additions & 0 deletions app/src/main/java/org/jellyfin/androidtv/util/sdk/SdkPlaybackHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,20 @@ class SdkPlaybackHelper(
}
}

BaseItemKind.VIDEO -> {
val parentId = mainItem.parentId
if (parentId == null) {
getParts(mainItem)
} else {
val siblingVideos = getVideosInFolder(parentId, mainItem)
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]
Expand All @@ -248,6 +262,20 @@ class SdkPlaybackHelper(
}
}

private suspend fun getVideosInFolder(parentId: UUID, item: BaseItemDto): List<BaseItemDto> {
val response by api.itemsApi.getItems(
parentId = parentId,
isMissing = false,
includeItemTypes = listOf(BaseItemKind.VIDEO),
sortBy = listOf(ItemSortBy.SORT_NAME),
nameStartsWithOrGreater = item.sortName ?: item.name,
limit = ITEM_QUERY_LIMIT,
fields = ItemRepository.itemFields,
)

return response.items
}

private suspend fun getParts(item: BaseItemDto): List<BaseItemDto> = buildList {
add(item)

Expand Down