Update master with 2.1.4 bugfixes

Makefile

@@ -3,7 +3,7 @@
 # If you want to get_images, you'll also need convert from ImageMagick
 ##########################################################################
 
-VERSION := 2.1.3
+VERSION := 2.1.4
 
 ## usage
 

components/ItemGrid/GridItem.bs

@@ -21,18 +21,21 @@ sub init()
     m.checkmark.height = 60
 
     m.itemText.translation = [0, m.itemPoster.height + 7]
-
-    m.gridTitles = m.global.session.user.settings["itemgrid.gridTitles"]
     m.itemText.visible = m.gridTitles = "showalways"
 
     ' Add some padding space when Item Titles are always showing
     if m.itemText.visible then m.itemText.maxWidth = 250
 
-    'Parent is MarkupGrid and it's parent is the ItemGrid
-    m.topParent = m.top.GetParent().GetParent()
-    'Get the imageDisplayMode for these grid items
-    if isValid(m.topParent.imageDisplayMode)
-        m.itemPoster.loadDisplayMode = m.topParent.imageDisplayMode
+    ' grab data from ItemGrid node
+    m.itemGrid = m.top.GetParent().GetParent() 'Parent is MarkupGrid and it's parent is the ItemGrid
+
+    if isValid(m.itemGrid)
+        if isValid(m.itemGrid.imageDisplayMode)
+            m.itemPoster.loadDisplayMode = m.itemGrid.imageDisplayMode
+        end if
+        if isValid(m.itemGrid.gridTitles)
+            m.gridTitles = m.itemGrid.gridTitles
+        end if
     end if
 
 end sub
@@ -91,7 +94,7 @@ sub itemContentChanged()
         m.itemPoster.uri = itemData.PosterUrl
         'm.itemIcon.uri = itemData.iconUrl
         m.itemText.text = itemData.Title
-        m.itemPoster.loadDisplayMode = m.topParent.imageDisplayMode
+        m.itemPoster.loadDisplayMode = m.itemGrid.imageDisplayMode
     else if itemData.type = "Video"
         m.itemPoster.uri = itemData.PosterUrl
         m.itemIcon.uri = itemData.iconUrl
@@ -169,7 +172,7 @@ sub focusChanged()
         m.posterMask.scale = [1, 1]
     else
         m.itemText.repeatCount = 0
-        if m.topParent.alphaActive = true
+        if m.itemGrid.alphaActive = true
             m.posterMask.scale = [0.85, 0.85]
         end if
     end if

components/ItemGrid/ItemGrid.bs

@@ -68,15 +68,15 @@ sub init()
 
     'Get reset folder setting
     m.resetGrid = m.global.session.user.settings["itemgrid.reset"]
+
+    m.top.gridTitles = m.global.session.user.settings["itemgrid.gridTitles"]
 end sub
 
-'
 'Genre Item Selected
 sub onGenreItemSelected()
     m.top.selectedItem = m.genreList.content.getChild(m.genreList.rowItemSelected[0]).getChild(m.genreList.rowItemSelected[1])
 end sub
 
-'
 'Load initial set of Data
 sub loadInitialItems()
     m.loadItemsTask.control = "stop"
@@ -436,7 +436,6 @@ sub SetUpOptions()
     m.options.options = options
 end sub
 
-'
 'Handle loaded data, and add to Grid
 sub ItemDataLoaded(msg)
     itemData = msg.GetData()
@@ -497,7 +496,6 @@ sub ItemDataLoaded(msg)
     stopLoadingSpinner()
 end sub
 
-'
 'Set Background Image
 sub SetBackground(backgroundUri as string)
 
@@ -510,7 +508,6 @@ sub SetBackground(backgroundUri as string)
     m.newBackdrop.uri = backgroundUri
 end sub
 
-'
 'Handle new item being focused
 sub onItemFocused()
 
@@ -536,7 +533,6 @@ sub onItemFocused()
     end if
 end sub
 
-'
 'When Image Loading Status changes
 sub newBGLoaded()
     'If image load was sucessful, start the fade swap
@@ -545,12 +541,9 @@ sub newBGLoaded()
     end if
 end sub
 
-'
 'Swap Complete
 sub swapDone()
-
-    if m.swapAnimation.state = "stopped"
-
+    if isValid(m.swapAnimation) and m.swapAnimation.state = "stopped"
         'Set main BG node image and hide transitioning node
         m.backdrop.uri = m.newBackdrop.uri
         m.backdrop.opacity = 0.25
@@ -564,7 +557,6 @@ sub swapDone()
     end if
 end sub
 
-'
 'Load next set of items
 sub loadMoreData()
     if m.Loading = true then return
@@ -576,7 +568,6 @@ sub loadMoreData()
     m.loadItemsTask.control = "RUN"
 end sub
 
-'
 'Item Selected
 sub onItemSelected()
     m.top.selectedItem = m.itemGrid.content.getChild(m.itemGrid.itemSelected)
@@ -627,8 +618,6 @@ sub onvoiceFilter()
     end if
 end sub
 
-
-'
 'Check if options updated and any reloading required
 sub optionsClosed()
     if m.top.parentItem.collectionType = "livetv" and m.options.view <> m.view

components/ItemGrid/ItemGrid.xml

@@ -35,5 +35,6 @@
     <field id="alphaSelected" type="string" alias="alpha.letterSelected" alwaysNotify="true" onChange="alphaSelectedChanged" />
     <field id="alphaActive" type="boolean" value="false" />
     <field id="jumpToItem" type="integer" value="" />
+    <field id="gridTitles" type="string" />
   </interface>
 </component>

components/ItemGrid/ItemGridOptions.bs

@@ -195,6 +195,8 @@ sub buttonFocusChanged()
 end sub
 
 sub toggleFavorite()
+    if not isValid(m.selectedFavoriteItem) then return
+
     m.favItemsTask = createObject("roSGNode", "FavoriteItemsTask")
     if m.favoriteMenu.iconUri = "pkg:/images/icons/favorite.png"
         m.favoriteMenu.iconUri = "pkg:/images/icons/favorite_selected.png"

components/ItemGrid/LoadVideoContentTask.bs

@@ -13,7 +13,6 @@ enum SubtitleSelection
 end enum
 
 sub init()
-    m.user = AboutMe()
     m.top.functionName = "loadItems"
 end sub
 
@@ -119,8 +118,7 @@ sub LoadItems_AddVideoContent(video as object, mediaSourceId as dynamic, audio_s
         video.logoImage = api.items.GetImageURL(logoLookupID, "logo", 0, { "maxHeight": 65, "maxWidth": 300, "quality": "90" })
     end if
 
-    user = AboutMe()
-    if user.Configuration.EnableNextEpisodeAutoPlay
+    if m.global.session.user.Configuration.EnableNextEpisodeAutoPlay
         if LCase(m.top.itemType) = "episode"
             addNextEpisodesToQueue(video.showID)
         end if
@@ -395,6 +393,12 @@ sub addAudioStreamsToVideo(video)
 end sub
 
 sub addSubtitlesToVideo(video, meta)
+    if not isValid(meta) then return
+    if not isValid(meta.id) then return
+    if not isValid(m.playbackInfo) then return
+    if not isValidAndNotEmpty(m.playbackInfo.MediaSources) then return
+    if not isValid(m.playbackInfo.MediaSources[0].MediaStreams) then return
+
     subtitles = sortSubtitles(meta.id, m.playbackInfo.MediaSources[0].MediaStreams)
     safesubs = subtitles["all"]
     subtitleTracks = []
@@ -565,16 +569,16 @@ function sortSubtitles(id as string, MediaStreams)
 end function
 
 function FindPreferredAudioStream(streams as dynamic) as integer
-    preferredLanguage = m.user.Configuration.AudioLanguagePreference
-    playDefault = m.user.Configuration.PlayDefaultAudioTrack
+    preferredLanguage = m.global.session.user.Configuration.AudioLanguagePreference
+    playDefault = m.global.session.user.Configuration.PlayDefaultAudioTrack
 
     if playDefault <> invalid and playDefault = true
         return 1
     end if
 
     ' Do we already have the MediaStreams or not?
     if streams = invalid
-        url = Substitute("Users/{0}/Items/{1}", m.user.id, m.top.itemId)
+        url = Substitute("Users/{0}/Items/{1}", m.global.session.user.id, m.top.itemId)
         resp = APIRequest(url)
         jsonResponse = getJson(resp)
 

components/extras/ExtrasItem.bs

@@ -1,11 +1,30 @@
+import "pkg:/source/utils/misc.bs"
+
 sub init()
+    initPosterImg()
+    initName()
+    initRole()
+end sub
+
+sub initPosterImg()
     m.posterImg = m.top.findNode("posterImg")
+end sub
+
+sub initName()
     m.name = m.top.findNode("pLabel")
+end sub
+
+sub initRole()
     m.role = m.top.findNode("subTitle")
 end sub
 
 sub showContent()
-    if m.top.itemContent <> invalid
+    ' validate nodes to prevent crash
+    if not isValid(m.posterImg) then initPosterImg()
+    if not isValid(m.name) then initName()
+    if not isValid(m.role) then initRole()
+
+    if isValid(m.top.itemContent)
         cont = m.top.itemContent
         m.name.text = cont.labelText
         m.name.maxWidth = cont.imageWidth

components/home/HomeItem.bs

@@ -30,7 +30,7 @@ sub init()
     end if
 
     ' update the backdrop node
-    m.backdrop = m.top.findNode("backdrop")
+    initBackdrop()
     m.backdrop.color = backdropColor
 end sub
 
@@ -46,6 +46,10 @@ sub initItemTextExtra()
     m.itemTextExtra = m.top.findNode("itemTextExtra")
 end sub
 
+sub initBackdrop()
+    m.backdrop = m.top.findNode("backdrop")
+end sub
+
 sub itemContentChanged()
     if isValid(m.unplayedCount) then m.unplayedCount.visible = false
     itemData = m.top.itemContent
@@ -58,6 +62,7 @@ sub itemContentChanged()
     if not isValid(m.itemPoster) then initItemPoster()
     if not isValid(m.itemText) then initItemText()
     if not isValid(m.itemTextExtra) then initItemTextExtra()
+    if not isValid(m.backdrop) then initBackdrop()
 
     m.itemPoster.width = itemData.imageWidth
     m.itemText.maxWidth = itemData.imageWidth

components/home/HomeItem.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component name="HomeItem" extends="Group">
   <children>
-    <Rectangle id="backdrop" width="464" height="261" translation="[8,5]" />
+    <Rectangle id="backdrop" width="464" height="261" />
     <Poster id="itemIcon" width="100" height="100" translation="[190,85]" loadDisplayMode="scaleToFit" />
-    <Poster id="itemPoster" width="464" height="261" translation="[8,5]" loadDisplayMode="scaleToZoom">
+    <Poster id="itemPoster" width="464" height="261" loadDisplayMode="scaleToZoom">
       <Rectangle id="unplayedCount" visible="false" width="90" height="60" color="#00a4dcFF" translation="[375, 0]">
         <Label id="unplayedEpisodeCount" width="90" height="60" font="font:MediumBoldSystemFont" horizAlign="center" vertAlign="center" />
       </Rectangle>
       <PlayedCheckmark id="playedIndicator" color="#00a4dcFF" width="60" height="46" visible="false" />
     </Poster>
-    <Rectangle id="progressBackground" visible="false" color="0x00000098" width="464" height="8" translation="[8,260]">
+    <Rectangle id="progressBackground" visible="false" color="0x00000098" width="464" height="8" translation="[0,253]">
       <Rectangle id="progress" color="#00a4dcFF" width="0" height="8" />
     </Rectangle>
     <ScrollingLabel id="itemText" horizAlign="center" vertAlign="center" font="font:SmallBoldSystemFont" height="64" maxWidth="456" translation="[8,267]" repeatCount="0" />

manifest

@@ -3,7 +3,7 @@
 title=Jellyfin
 major_version=2
 minor_version=1
-build_version=3
+build_version=4
 
 ### Main Menu Icons / Channel Poster Artwork
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jellyfin-roku",
   "type": "module",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Roku app for Jellyfin media server",
   "dependencies": {
     "@rokucommunity/bslib": "0.1.1",

source/Main.bs

@@ -307,7 +307,12 @@ sub Main (args as dynamic) as void
                 else if selectedItemType = "Series"
                     group = CreateSeriesDetailsGroup(selectedItem.json.id)
                 else if selectedItemType = "Season"
-                    group = CreateSeasonDetailsGroupByID(selectedItem.json.SeriesId, selectedItem.id)
+                    if isValid(selectedItem.json) and isValid(selectedItem.json.SeriesId) and isValid(selectedItem.id)
+                        group = CreateSeasonDetailsGroupByID(selectedItem.json.SeriesId, selectedItem.id)
+                    else
+                        stopLoadingSpinner()
+                        message_dialog(tr("Error loading Season"))
+                    end if
                 else if selectedItemType = "Movie"
                     ' open movie detail page
                     group = CreateMovieDetailsGroup(selectedItem)
@@ -810,7 +815,7 @@ sub Main (args as dynamic) as void
                 selectedItem = m.global.queueManager.callFunc("getHold")
                 m.global.queueManager.callFunc("clearHold")
 
-                if isValid(selectedItem) and selectedItem.count() > 0 and isValid(selectedItem[0])
+                if isValidAndNotEmpty(selectedItem) and isValid(selectedItem[0])
                     if popupNode.returnData.indexselected = 0
                         'Resume video from resume point
                         startLoadingSpinner()
@@ -838,7 +843,13 @@ sub Main (args as dynamic) as void
                         CreateSeriesDetailsGroup(selectedItem[0].json.SeriesId)
                     else if popupNode.returnData.indexselected = 3
                         ' User chose Go to season
-                        CreateSeasonDetailsGroupByID(selectedItem[0].json.SeriesId, selectedItem[0].json.seasonID)
+                        if isValid(selectedItem[0].json) and isValid(selectedItem[0].json.SeriesId) and isValid(selectedItem[0].json.seasonID)
+                            CreateSeasonDetailsGroupByID(selectedItem[0].json.SeriesId, selectedItem[0].json.seasonID)
+                        else
+                            stopLoadingSpinner()
+                            message_dialog(tr("Error loading Season"))
+                        end if
+
                     else if popupNode.returnData.indexselected = 4
                         ' User chose Go to episode
                         CreateMovieDetailsGroup(selectedItem[0])

source/ShowScenes.bs

@@ -644,7 +644,7 @@ function CreateSeriesDetailsGroup(seriesID as string) as dynamic
     ' Get season data early in the function so we can check number of seasons.
     seasonData = TVSeasons(seriesID)
     ' Divert to season details if user setting goStraightToEpisodeListing is enabled and only one season exists.
-    if m.global.session.user.settings["ui.tvshows.goStraightToEpisodeListing"] = true and seasonData.Items.Count() = 1
+    if seasonData <> invalid and m.global.session.user.settings["ui.tvshows.goStraightToEpisodeListing"] and seasonData.Items.Count() = 1
         stopLoadingSpinner()
         return CreateSeasonDetailsGroupByID(seriesID, seasonData.Items[0].id)
     end if

source/api/Items.bs

@@ -53,6 +53,8 @@ function searchMedia(query as string)
             "limit": 100
         })
 
+        if data = invalid then return []
+
         results = []
         for each item in data.Items
             tmp = CreateObject("roSGNode", "SearchData")
@@ -95,7 +97,7 @@ function ItemMetaData(id as string)
         tmp.image = PosterImage(data.id, imgParams)
         tmp.json = data
         return tmp
-    else if LCase(data.type) = "recording"
+    else if data.type = "Recording"
         tmp = CreateObject("roSGNode", "RecordingData")
         tmp.image = PosterImage(data.id, imgParams)
         tmp.json = data