jellyfin/jellyfin-roku
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-roku.git synced 2024-11-23 14:19:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #792 from candry7731/Fix-Search

Browse Source 
Fix Episode titles when search
This commit is contained in:
1hitsong 2022-10-11 20:10:26 -04:00 committed by GitHub
commit 8908f11bf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/ListPoster.brs
View File

@ -64,7 +64,8 @@ sub itemContentChanged() as void
else if itemData.json.lookup("Type") = "MusicAlbum"
m.title.font = "font:SmallestSystemFont"
m.staticTitle.font = "font:SmallestSystemFont"
else
m.series.visible = false
end if
m.staticTitle.text = m.title.text

9
components/data/SceneManager.brs
View File

@ -8,8 +8,9 @@ end sub
'
' Push a new group onto the stack, replacing the existing group on the screen
sub pushScene(newGroup)
currentGroup = m.groups.peek()
currentGroup = m.groups.peek()
if newGroup <> invalid
if currentGroup <> invalid
'Search through group and store off last focused item
if currentGroup.focusedChild <> invalid
@ -62,6 +63,10 @@ sub pushScene(newGroup)
newGroup.control = "play"
m.overhang.visible = false
end if
else
currentGroup.focusedChild.setFocus(true)
end if
end sub
'
@ -141,7 +146,7 @@ end sub
'
' Clear previous scene from group stack
sub clearPreviousScene()
m.groups.pop()
m.groups.Delete(2)
end sub
'

5
source/Main.brs
View File

@ -110,6 +110,7 @@ sub Main (args as dynamic) as void
else if isNodeEvent(msg, "selectedItem")
' If you select a library from ANYWHERE, follow this flow
selectedItem = msg.getData()
m.selectedItemType = selectedItem.type
if selectedItem.type = "CollectionFolder" or selectedItem.type = "UserView" or selectedItem.type = "Folder" or selectedItem.type = "Channel" or selectedItem.type = "Boxset"
group = CreateItemGrid(selectedItem)
sceneManager.callFunc("pushScene", group)
@ -239,6 +240,7 @@ sub Main (args as dynamic) as void
else if isNodeEvent(msg, "episodeSelected")
' If you select a TV Episode from ANYWHERE, follow this flow
m.selectedItemType = "Episode"
node = getMsgPicker(msg, "picker")
video_id = node.id
if node.selectedAudioStreamIndex <> invalid and node.selectedAudioStreamIndex > 1
@ -268,6 +270,7 @@ sub Main (args as dynamic) as void
node = getMsgPicker(msg)
' TODO - swap this based on target.mediatype
' types: [ Series (Show), Episode, Movie, Audio, Person, Studio, MusicArtist ]
m.selectedItemType = node.type
if node.type = "Series"
group = CreateSeriesDetailsGroup(node)
else if node.type = "Movie"
@ -414,7 +417,7 @@ sub Main (args as dynamic) as void
end if
else if isNodeEvent(msg, "state")
node = msg.getRoSGNode()
if selectedItem.Type = "TvChannel" and node.state = "finished"
if m.selectedItemType = "TvChannel" and node.state = "finished"
video = CreateVideoPlayerGroup(node.id)
m.global.sceneManager.callFunc("pushScene", video)
m.global.sceneManager.callFunc("clearPreviousScene")