Display ending episode # on details when it spans multiple episode #

Author: 1hitsong

components/data/ImageData.xml

@@ -3,6 +3,7 @@
   <interface>
     <field id="json" type="assocarray" onChange="setFields" />
     <field id="imagetype" type="string" />
+    <field id="posterdisplaymode" type="string" />
     <field id="size" type="string" />
     <field id="height" type="integer" />
     <field id="width" type="integer" />

components/extras/ExtrasItem.xml

@@ -4,11 +4,11 @@
     <LayoutGroup layoutDirection="vert">
       <Poster id="posterImg" width="234" height="300" translation="[8,243]" failedBitmapUri="pkg:/images/baseline_person_white_48dp.png" />
       <ScrollingLabel id="pLabel"
-        horizAlign="center" vertAlign="bottom"
+        horizAlign="left" vertAlign="bottom"
         height="48"
         font="font:SmallestBoldSystemFont" repeatCount="0" />
       <ScrollingLabel id="SubTitle"
-        horizAlign="center" vertAlign="center"
+        horizAlign="left" vertAlign="center"
         height="32"
         font="font:SmallestBoldSystemFont" color="#A7A7A7FF" repeatCount="0" />
     </LayoutGroup>

components/extras/ExtrasRowList.bs

@@ -55,8 +55,18 @@ sub onSeasonOfEpisodesLoaded()
         header += ` ${data[0].json.ParentIndexNumber}`
     end if
 
-    if m.top.episodeNumber > 0
-        for i = 1 to m.top.episodeNumber - 1
+    ' We can't simply use the episode index due to combination episodes
+    shiftAmount = 0
+    if isValidAndNotEmpty(m.top.episodeID)
+        for each episode in data
+            if isStringEqual(m.top.episodeID, episode.json.LookupCI("id")) then exit for
+            shiftAmount++
+        end for
+    end if
+
+    ' Shift episodes array so the selected episode is displayed first
+    if shiftAmount > 0
+        for i = 0 to shiftAmount - 1
             itemToMove = data.Shift()
             data.push(itemToMove)
         end for
@@ -224,7 +234,13 @@ function buildRow(rowTitle as string, items, imgWdth = 0)
         if LCase(mov.json.type) = VideoType.EPISODE
             if isAllValid([mov.json.SeriesName, mov.json.ParentIndexNumber, mov.json.IndexNumber, mov.json.Name])
                 mov.labelText = mov.json.SeriesName
-                mov.subTitle = `S${mov.json.ParentIndexNumber}:E${mov.json.IndexNumber} - ${mov.json.Name}`
+
+                endingEpisode = ""
+                if isValid(mov.json.LookupCI("indexNumberEnd"))
+                    endingEpisode = `-${mov.json.LookupCI("indexNumberEnd")}`
+                end if
+
+                mov.subTitle = `S${mov.json.ParentIndexNumber}:E${mov.json.IndexNumber}${endingEpisode} - ${mov.json.Name}`
             else
                 mov.labelText = mov.json.Name
                 mov.subTitle = mov.json.ProductionYear

components/extras/ExtrasRowList.xml

@@ -6,7 +6,7 @@
     <field id="hasItems" type="boolean" />
     <field id="parentId" type="string" />
     <field id="showID" type="string" />
-    <field id="episodeNumber" type="Integer" />
+    <field id="episodeID" type="string" />
     <field id="seasonID" type="string" />
     <field id="focusedItem" type="node" alwaysNotify="true" />
     <field id="selectedItem" type="node" alwaysNotify="true" />

components/home/LoadItemsTask.bs

@@ -74,6 +74,7 @@ function loadLatestMedia() as object
                 SeriesName: item.LookupCI("SeriesName"),
                 ParentIndexNumber: item.LookupCI("ParentIndexNumber"),
                 IndexNumber: item.LookupCI("IndexNumber"),
+                IndexNumberEnd: item.LookupCI("IndexNumberEnd"),
                 AlbumArtist: item.LookupCI("AlbumArtist"),
                 Status: item.LookupCI("Status"),
                 ImageTags: item.LookupCI("ImageTags"),
@@ -122,6 +123,7 @@ function loadContinueWatching() as object
             EndDate: item.LookupCI("EndDate"),
             ParentIndexNumber: item.LookupCI("ParentIndexNumber"),
             IndexNumber: item.LookupCI("IndexNumber"),
+            IndexNumberEnd: item.LookupCI("IndexNumberEnd"),
             OfficialRating: item.LookupCI("OfficialRating"),
             CollectionType: item.LookupCI("CollectionType"),
             ImageTags: item.LookupCI("ImageTags"),
@@ -160,6 +162,7 @@ function loadSeasonOfEpisodes() as object
             IndexNumber: item.json.LookupCI("IndexNumber"),
             Name: item.json.LookupCI("Name"),
             ParentIndexNumber: item.json.LookupCI("ParentIndexNumber"),
+            IndexNumberEnd: item.json.LookupCI("IndexNumberEnd"),
             ProductionYear: item.json.LookupCI("ProductionYear"),
             SeriesName: item.json.LookupCI("SeriesName"),
             EndDate: item.json.LookupCI("EndDate"),
@@ -200,6 +203,7 @@ function loadContinueListening() as object
             Status: item.LookupCI("Status"),
             EndDate: item.LookupCI("EndDate"),
             ParentIndexNumber: item.LookupCI("ParentIndexNumber"),
+            IndexNumberEnd: item.LookupCI("IndexNumberEnd"),
             IndexNumber: item.LookupCI("IndexNumber"),
             OfficialRating: item.LookupCI("OfficialRating"),
             CollectionType: item.LookupCI("CollectionType"),
@@ -307,6 +311,7 @@ function loadLiveTVOnNow() as object
             Album: item.LookupCI("Album"),
             SeriesName: item.LookupCI("SeriesName"),
             ParentIndexNumber: item.LookupCI("ParentIndexNumber"),
+            IndexNumberEnd: item.LookupCI("IndexNumberEnd"),
             IndexNumber: item.LookupCI("IndexNumber"),
             AlbumArtist: item.LookupCI("AlbumArtist"),
             Status: item.LookupCI("Status"),
@@ -432,6 +437,7 @@ function loadFavorites() as object
             Status: item.LookupCI("Status"),
             EndDate: item.LookupCI("EndDate"),
             ParentIndexNumber: item.LookupCI("ParentIndexNumber"),
+            IndexNumberEnd: item.LookupCI("IndexNumberEnd"),
             IndexNumber: item.LookupCI("IndexNumber"),
             OfficialRating: item.LookupCI("OfficialRating"),
             CollectionType: item.LookupCI("CollectionType"),
@@ -477,6 +483,7 @@ function loadItemsByPerson(videoType, dimens = {}) as object
             IndexNumber: item.LookupCI("IndexNumber"),
             Name: item.LookupCI("Name"),
             ParentIndexNumber: item.LookupCI("ParentIndexNumber"),
+            IndexNumberEnd: item.LookupCI("IndexNumberEnd"),
             ProductionYear: item.LookupCI("ProductionYear"),
             SeriesName: item.LookupCI("SeriesName"),
             EndDate: item.LookupCI("EndDate"),

components/movies/MovieDetails.bs

@@ -257,7 +257,7 @@ sub itemContentChanged()
     if isvalid(m.extrasGrid)
         m.extrasGrid.seasonID = item.seasonID
         m.extrasGrid.showID = item.showID
-        m.extrasGrid.episodeNumber = item.json.IndexNumber
+        m.extrasGrid.episodeID = item.id
     end if
 
     if not isChainValid(item, "json")
@@ -422,6 +422,10 @@ sub addEpisodeTitle(itemData as object)
         titleText = `Season ${itemData.ParentIndexNumber} Episode ${itemData.IndexNumber}`
     end if
 
+    if isValid(itemData.LookupCI("indexNumberEnd"))
+        titleText += `-${itemData.LookupCI("indexNumberEnd")}`
+    end if
+
     if isValid(itemData.name)
         if titleText <> "" then titleText += " • "
         titleText += itemData.name

source/static/whatsNew/1.0.9.json

@@ -23,6 +23,10 @@
     "description": "Create way to navigate between episodes on the detail view",
     "author": "1hitsong"
   },
+  {
+    "description": "Display ending episode number on detail view when episode spans more than one episode number",
+    "author": "1hitsong"
+  },
   {
     "description": "Redesign sign in screen",
     "author": "1hitsong"