From 3f37318c05e747c83529ab51459b9fbdb522d0d3 Mon Sep 17 00:00:00 2001
From: NIK679 <33275965+NIK679@users.noreply.github.com>
Date: Sat, 12 Feb 2022 21:45:05 +0530
Subject: [PATCH] Add option to display extended episode title (SXX:EXX -
 Title) in player (#78)

* Add option to display extended episode title (SXX:EXX - Title) in player

* ocd fix

* add null check condition

* Move setting to player category

Yeah this would fit in either Appearance or Player. But I lean more towards Player.

Co-authored-by: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
---
 .../java/dev/jdtech/jellyfin/models/PlayerItem.kt    |  2 ++
 .../dev/jdtech/jellyfin/utils/DownloadUtilities.kt   |  4 ++++
 .../jellyfin/viewmodels/PlayerActivityViewModel.kt   | 10 +++++++++-
 .../jdtech/jellyfin/viewmodels/PlayerViewModel.kt    | 12 +++++++++---
 app/src/main/res/values/strings.xml                  |  2 ++
 app/src/main/res/xml/fragment_settings.xml           |  4 ++++
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt b/app/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt
index abc7109c..52e250b4 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt
@@ -11,5 +11,7 @@ data class PlayerItem(
     val mediaSourceId: String,
     val playbackPosition: Long,
     val mediaSourceUri: String = "",
+    val parentIndexNumber: Int? = null,
+    val indexNumber: Int? = null,
     val item: DownloadItem? = null
 ) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/dev/jdtech/jellyfin/utils/DownloadUtilities.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/DownloadUtilities.kt
index c652e023..f6be45cb 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/utils/DownloadUtilities.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/utils/DownloadUtilities.kt
@@ -70,6 +70,8 @@ fun loadDownloadedEpisodes(downloadDatabase: DownloadDatabaseDao): List<PlayerIt
             mediaSourceId = "",
             playbackPosition = it.playbackPosition ?: 0,
             mediaSourceUri = File(defaultStorage, it.id.toString()).absolutePath,
+            parentIndexNumber = it.parentIndexNumber,
+            indexNumber = it.indexNumber,
             item = it
         )
     }
@@ -95,6 +97,8 @@ fun getDownloadPlayerItem(downloadDatabase: DownloadDatabaseDao, itemId: UUID):
                 "",
                 metadata.playbackPosition!!,
                 file.absolutePath,
+                metadata.parentIndexNumber,
+                metadata.indexNumber,
                 metadata
             )
         }
diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
index a3f94775..1a0b46ae 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
@@ -185,7 +185,15 @@ constructor(
             try {
                 for (item in items) {
                     if (item.itemId.toString() == player.currentMediaItem?.mediaId ?: "") {
-                        _currentItemTitle.value = item.name.orEmpty()
+                        if (sp.getBoolean(
+                                "display_extended_title",
+                                false
+                            ) && item.parentIndexNumber != null && item.indexNumber != null && item.name != null
+                        )
+                            _currentItemTitle.value =
+                                "S${item.parentIndexNumber}:E${item.indexNumber} - ${item.name}"
+                        else
+                            _currentItemTitle.value = item.name.orEmpty()
                     }
                 }
                 jellyfinRepository.postPlaybackStart(UUID.fromString(mediaItem?.mediaId))
diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt
index 10888c76..7b6ed136 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt
@@ -171,20 +171,26 @@ class PlayerViewModel @Inject internal constructor(
                 name = name,
                 itemId = id,
                 mediaSourceId = mediaSource.id!!,
-                playbackPosition = playbackPosition
+                playbackPosition = playbackPosition,
+                parentIndexNumber = parentIndexNumber,
+                indexNumber = indexNumber
             )
             MediaProtocol.HTTP -> PlayerItem(
                 name = name,
                 itemId = id,
                 mediaSourceId = mediaSource.id!!,
                 mediaSourceUri = mediaSource.path!!,
-                playbackPosition = playbackPosition
+                playbackPosition = playbackPosition,
+                parentIndexNumber = parentIndexNumber,
+                indexNumber = indexNumber
             )
             else -> PlayerItem(
                 name = name,
                 itemId = id,
                 mediaSourceId = mediaSource.id!!,
-                playbackPosition = playbackPosition
+                playbackPosition = playbackPosition,
+                parentIndexNumber = parentIndexNumber,
+                indexNumber = indexNumber
             )
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87b86feb..5222d7b9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,4 +118,6 @@
     <string name="player_controls_skip">Skip</string>
     <string name="track_selection">[%1$s] %2$s (%3$s)</string>
     <string name="add_server_empty_error">Empty server address</string>
+    <string name="display_extended_title_summary">Display extended episode title including season and episode information (SXX:EXX - EpisodeName).</string>
+    <string name="display_extended_title">Display extended title</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/fragment_settings.xml b/app/src/main/res/xml/fragment_settings.xml
index 60a313b1..a927abd1 100644
--- a/app/src/main/res/xml/fragment_settings.xml
+++ b/app/src/main/res/xml/fragment_settings.xml
@@ -53,6 +53,10 @@
             app:key="mpv_disable_hwdec"
             app:summary="@string/force_software_decoding_summary"
             app:title="@string/force_software_decoding" />
+        <SwitchPreference
+            app:key="display_extended_title"
+            app:summary="@string/display_extended_title_summary"
+            app:title="@string/display_extended_title" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_category_device">