Merge pull request #952 from jellyfin/unstable

Pull Unstable into Master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,15 +7,19 @@ assignees: ''
 
 ---
 
+**Software Versions**
+Jellyfin Server Version: 
+Roku Client Version: 
+
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
 
-**To Reproduce**
+**How To Reproduce**
 <!-- Steps to reproduce the behavior: -->
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
-4. See error
+4. Bug occurs
 
 **Expected behavior**
 <!-- A clear and concise description of what you expected to happen. -->
@@ -26,5 +30,10 @@ assignees: ''
 **Screenshots**
 <!-- If applicable, add screenshots to help explain your problem. -->
 
+**Connection Information**
+Is server local or remote? 
+
+Is server connection http or https? 
+
 **Additional context**
 <!-- Add any other context about the problem here. -->

.github/workflows/auto-close-stale-pr.yml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag=v6
+      - uses: actions/stale@6f05e4244c9a0b2ed3401882b05d701dd0a7289b # v7
         with:
           days-before-issue-stale: -1
           days-before-issue-close: -1

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
   run:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3
+      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
       - uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # tag=v3
         with:
           node-version: "14.12.0"

.github/workflows/master-release.yml

@@ -22,7 +22,7 @@ jobs:
         run: awk 'BEGIN { FS="=" } /^minor_version/ { print "MINOR="$2; }' manifest >> $GITHUB_ENV
       - name: "Find and save build_version from manifest"
         run: awk 'BEGIN { FS="=" } /^build_version/ { print "BUILD="$2; }' manifest >> $GITHUB_ENV
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3
+      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
       - uses: vimtor/action-zip@5f1c4aa587ea41db1110df6a99981dbe19cee310 # tag=v1
         with:
           recursive: false

.github/workflows/unstable-release.yml

@@ -22,7 +22,7 @@ jobs:
         run: awk 'BEGIN { FS="=" } /^minor_version/ { print "MINOR="$2; }' manifest >> $GITHUB_ENV
       - name: "Find and save build_version from manifest"
         run: awk 'BEGIN { FS="=" } /^build_version/ { print "BUILD="$2; }' manifest >> $GITHUB_ENV
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3
+      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
       - uses: vimtor/action-zip@5f1c4aa587ea41db1110df6a99981dbe19cee310 # tag=v1
         with:
           recursive: false

Makefile

@@ -10,7 +10,7 @@
 ##########################################################################
 
 APPNAME = Jellyfin_Roku
-VERSION = 1.6.2
+VERSION = 1.6.3
 
 ZIP_EXCLUDE= -x xml/* -x artwork/* -x \*.pkg -x storeassets\* -x keys\* -x \*/.\* -x *.git* -x *.DS* -x *.pkg* -x dist/**\*  -x out/**\* 
 

components/ItemGrid/GridItem.brs

@@ -8,6 +8,9 @@ sub init()
 
     m.itemPoster.observeField("loadStatus", "onPosterLoadStatusChanged")
 
+    m.unplayedCount = m.top.findNode("unplayedCount")
+    m.unplayedEpisodeCount = m.top.findNode("unplayedEpisodeCount")
+
     m.itemText.translation = [0, m.itemPoster.height + 7]
 
     m.alwaysShowTitles = get_user_setting("itemgrid.alwaysShowTitles") = "true"
@@ -40,6 +43,13 @@ sub itemContentChanged()
         m.itemIcon.uri = itemData.iconUrl
         m.itemText.text = itemData.Title
     else if itemData.type = "Series"
+        if itemData?.json?.UserData?.UnplayedItemCount <> invalid
+            if itemData.json.UserData.UnplayedItemCount > 0
+                m.unplayedCount.visible = true
+                m.unplayedEpisodeCount.text = itemData.json.UserData.UnplayedItemCount
+            end if
+        end if
+
         m.itemPoster.uri = itemData.PosterUrl
         m.itemIcon.uri = itemData.iconUrl
         m.itemText.text = itemData.Title

components/ItemGrid/GridItem.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="GridItem" extends="Group">
   <children>
-    <maskGroup id="posterMask" maskUri="pkg:/images/postermask.png" scaleRotateCenter="[145, 212.5]" scale="[0.85,0.85]"  >
+    <maskGroup id="posterMask" maskUri="pkg:/images/postermask.png" scaleRotateCenter="[145, 212.5]" scale="[0.85,0.85]">
       <Poster id="backdrop" width="290" height="425" loadDisplayMode="scaleToZoom" uri="pkg:/images/white.9.png" />
-      <Poster id="itemPoster" width="290" height="425" loadDisplayMode="scaleToZoom" />
+      <Poster id="itemPoster" width="290" height="425" loadDisplayMode="scaleToZoom">
+        <Rectangle id="unplayedCount" visible="false" width="90" height="60" color="#00a4dcFF" translation="[201, 0]">
+          <Label id="unplayedEpisodeCount" width="90" height="60" font="font:SmallestBoldSystemFont" horizAlign="center" vertAlign="center" />
+        </Rectangle>
+      </Poster>
       <Poster id="itemIcon" width="50" height="50" translation="[230,10]" />
       <Label id="posterText" width="280" height="415" translation="[5,5]" horizAlign="center" vertAlign="center" ellipsizeOnBoundary="true" wrap="true" />
     </maskGroup>

components/ItemGrid/GridItemSmall.brs

@@ -1,30 +1,42 @@
 sub init()
     m.itemPoster = m.top.findNode("itemPoster")
     m.posterText = m.top.findNode("posterText")
+    m.title = m.top.findNode("title")
     m.posterText.font.size = 30
+    m.title.font.size = 25
     m.backdrop = m.top.findNode("backdrop")
 
     m.itemPoster.observeField("loadStatus", "onPosterLoadStatusChanged")
 
     'Parent is MarkupGrid and it's parent is the ItemGrid
     m.topParent = m.top.GetParent().GetParent()
 
+    m.title.visible = false
+
     'Get the imageDisplayMode for these grid items
     if m.topParent.imageDisplayMode <> invalid
         m.itemPoster.loadDisplayMode = m.topParent.imageDisplayMode
     end if
-
 end sub
 
 sub itemContentChanged()
     m.backdrop.blendColor = "#101010"
 
+    m.title.visible = false
+
+    if isValid(m.topParent.showItemTitles)
+        if LCase(m.topParent.showItemTitles) = "showalways"
+            m.title.visible = true
+        end if
+    end if
+
     itemData = m.top.itemContent
 
     if not isValid(itemData) then return
 
     m.itemPoster.uri = itemData.PosterUrl
     m.posterText.text = itemData.title
+    m.title.text = itemData.title
 
     'If Poster not loaded, ensure "blue box" is shown until loaded
     if m.itemPoster.loadStatus <> "ready"
@@ -33,6 +45,20 @@ sub itemContentChanged()
     end if
 end sub
 
+sub focusChanged()
+    if m.top.itemHasFocus = true
+        m.title.repeatCount = -1
+    else
+        m.title.repeatCount = 0
+    end if
+
+    if isValid(m.topParent.showItemTitles)
+        if LCase(m.topParent.showItemTitles) = "showonhover"
+            m.title.visible = m.top.itemHasFocus
+        end if
+    end if
+end sub
+
 'Hide backdrop and text when poster loaded
 sub onPosterLoadStatusChanged()
     if m.itemPoster.loadStatus = "ready"

components/ItemGrid/GridItemSmall.xml

@@ -3,12 +3,13 @@
   <children>
     <Poster id="backdrop" translation="[0,15]" width="230" height="320" loadDisplayMode="scaleToZoom" uri="pkg:/images/white.9.png" />
     <Poster id="itemPoster" translation="[0,15]" width="230" height="320" loadDisplayMode="scaleToZoom" />
+    <ScrollingLabel translation="[0,340]" id="title" horizAlign="center" font="font:SmallSystemFont" repeatCount="0" maxWidth="230" />
     <Poster id="itemIcon" width="50" height="50" translation="[230,10]" />
     <Label id="posterText" width="230" height="320" translation="[5,5]" horizAlign="center" vertAlign="center" ellipsizeOnBoundary="true" wrap="true" />
   </children>
   <interface>
     <field id="itemContent" type="node" onChange="itemContentChanged" />
-    <field id="itemHasFocus" type="boolean" onChange="focusChanged" />
+    <field id="itemHasFocus" type="boolean" onChange="focusChanged" alwaysNotify="true" />
   </interface>
   <script type="text/brightscript" uri="GridItemSmall.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />

components/ItemGrid/ItemGrid.brs

@@ -12,6 +12,11 @@ sub init()
     m.newBackdrop = m.top.findNode("backdropTransition")
     m.emptyText = m.top.findNode("emptyText")
 
+    m.genreList = m.top.findNode("genrelist")
+    m.genreList.observeField("itemSelected", "onGenreItemSelected")
+    m.genreData = CreateObject("roSGNode", "ContentNode")
+    m.genreList.content = m.genreData
+
     m.swapAnimation = m.top.findNode("backroundSwapAnimation")
     m.swapAnimation.observeField("state", "swapDone")
 
@@ -74,6 +79,12 @@ sub init()
     end if
 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()
@@ -241,7 +252,10 @@ sub setMoviesOptions(options)
     ]
     options.filter = [
         { "Title": tr("All"), "Name": "All" },
-        { "Title": tr("Favorites"), "Name": "Favorites" }
+        { "Title": tr("Favorites"), "Name": "Favorites" },
+        { "Title": tr("Played"), "Name": "Played" },
+        { "Title": tr("Unplayed"), "Name": "Unplayed" },
+        { "Title": tr("Resumable"), "Name": "Resumable" }
     ]
 end sub
 
@@ -256,7 +270,9 @@ sub setBoxsetsOptions(options)
     ]
     options.filter = [
         { "Title": tr("All"), "Name": "All" },
-        { "Title": tr("Favorites"), "Name": "Favorites" }
+        { "Title": tr("Favorites"), "Name": "Favorites" },
+        { "Title": tr("Played"), "Name": "Played" },
+        { "Title": tr("Unplayed"), "Name": "Unplayed" }
     ]
 end sub
 
@@ -278,8 +294,18 @@ sub setTvShowsOptions(options)
     ]
     options.filter = [
         { "Title": tr("All"), "Name": "All" },
-        { "Title": tr("Favorites"), "Name": "Favorites" }
+        { "Title": tr("Favorites"), "Name": "Favorites" },
+        { "Title": tr("Played"), "Name": "Played" },
+        { "Title": tr("Unplayed"), "Name": "Unplayed" }
     ]
+
+    if isValid(m.view)
+        if LCase(m.options.view) = "genres" or LCase(m.view) = "genres"
+            options.sort = [{ "Title": tr("TITLE"), "Name": "SortName" }]
+            options.filter = []
+        end if
+    end if
+
 end sub
 
 ' Set Live TV view, sort, and filter options
@@ -423,10 +449,32 @@ sub ItemDataLoaded(msg)
         return
     end if
 
+    if m.loadItemsTask.view = "Genres"
+        ' Reset genre list data
+        m.genreData.removeChildren(m.genreData.getChildren(-1, 0))
+
+        for each item in itemData
+            m.genreData.appendChild(item)
+        end for
+
+        m.itemGrid.opacity = "0"
+        m.genreList.opacity = "1"
+
+        m.itemGrid.setFocus(false)
+        m.genreList.setFocus(true)
+
+        m.loading = false
+        m.spinner.visible = false
+        return
+    end if
+
     for each item in itemData
         m.data.appendChild(item)
     end for
 
+    m.itemGrid.opacity = "1"
+    m.genreList.opacity = "0"
+
     'Update the stored counts
     m.loadedItems = m.itemGrid.content.getChildCount()
     m.loadedRows = m.loadedItems / m.itemGrid.numColumns
@@ -438,6 +486,7 @@ sub ItemDataLoaded(msg)
     end if
 
     m.itemGrid.setFocus(true)
+    m.genreList.setFocus(false)
     m.spinner.visible = false
 end sub
 
@@ -645,7 +694,10 @@ sub optionsClosed()
         m.itemGrid.content = m.data
         loadInitialItems()
     end if
-    m.itemGrid.setFocus(true)
+
+    m.itemGrid.setFocus(m.itemGrid.opacity = 1)
+    m.genreList.setFocus(m.genreList.opacity = 1)
+
     if m.tvGuide <> invalid
         m.tvGuide.lastFocus.setFocus(true)
     end if
@@ -681,13 +733,19 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
     if not press then return false
-    topGrp = m.top.findNode("itemGrid")
+
+    if m.itemGrid.opacity = 1
+        topGrp = m.itemGrid
+    else
+        topGrp = m.genreList
+    end if
     searchGrp = m.top.findNode("voiceBox")
 
     if key = "left" and searchGrp.isinFocusChain()
         topGrp.setFocus(true)
         searchGrp.setFocus(false)
     end if
+
     if key = "options"
         if m.options.visible = true
             m.options.visible = false
@@ -773,14 +831,16 @@ function onKeyEvent(key as string, press as boolean) as boolean
 end function
 
 sub updateTitle()
-    if m.filter = "All"
-        m.top.overhangTitle = m.top.parentItem.title
-    else if m.filter = "Favorites"
+    m.top.overhangTitle = m.top.parentItem.title
+
+    if m.filter = "Favorites"
         m.top.overhangTitle = m.top.parentItem.title + " " + tr("(Favorites)")
     end if
+
     if m.voiceBox.text <> ""
         m.top.overhangTitle = m.top.parentItem.title + tr(" (Filtered by ") + m.loadItemsTask.searchTerm + ")"
     end if
+
     if m.top.alphaSelected <> ""
         m.top.overhangTitle = m.top.parentItem.title + tr(" (Filtered by ") + m.loadItemsTask.nameStartsWith + ")"
     end if
@@ -794,14 +854,18 @@ sub updateTitle()
     if m.options.view = "Networks" or m.view = "Networks"
         m.top.overhangTitle = "%s (%s)".Format(m.top.parentItem.title, tr("Networks"))
     end if
+
     if m.options.view = "Studios" or m.view = "Studios"
         m.top.overhangTitle = "%s (%s)".Format(m.top.parentItem.title, tr("Studios"))
     end if
+
     if m.options.view = "Genres" or m.view = "Genres"
         m.top.overhangTitle = "%s (%s)".Format(m.top.parentItem.title, tr("Genres"))
     end if
+
     actInt = m.itemGrid.itemFocused + 1
-    if m.showItemCount and m.loadItemsTask.totalRecordCount > 0
+
+    if m.showItemCount and m.loadItemsTask.totalRecordCount > 0 and m.options.view <> "Genres" and m.view <> "Genres"
         m.top.overhangTitle += " (" + tr("%1 of %2").Replace("%1", actInt.toStr()).Replace("%2", m.loadItemsTask.totalRecordCount.toStr()) + ")"
     end if