fix podcast ordering

GrakovNe · Nov 19, 2024 · 212512a · 212512a
1 parent 6e63a81
commit 212512a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/.../org/grakovne/lissen/channel/audiobookshelf/podcast/converter/PodcastResponseConverter.kt b/.../org/grakovne/lissen/channel/audiobookshelf/podcast/converter/PodcastResponseConverter.kt
@@ -1,11 +1,14 @@
 package org.grakovne.lissen.channel.audiobookshelf.podcast.converter
 
 import org.grakovne.lissen.channel.audiobookshelf.common.model.MediaProgressResponse
+import org.grakovne.lissen.channel.audiobookshelf.podcast.model.PodcastEpisodeResponse
 import org.grakovne.lissen.channel.audiobookshelf.podcast.model.PodcastResponse
 import org.grakovne.lissen.domain.BookChapter
 import org.grakovne.lissen.domain.BookFile
 import org.grakovne.lissen.domain.DetailedItem
 import org.grakovne.lissen.domain.MediaProgress
+import java.text.SimpleDateFormat
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -19,7 +22,7 @@ class PodcastResponseConverter @Inject constructor() {
         val orderedEpisodes = item
             .media
             .episodes
-            ?.sortedWith(compareBy({ it.season.safeToInt() }, { it.episode.safeToInt() }))
+            ?.orderEpisode()
 
         val filesAsChapters: List<BookChapter> =
             orderedEpisodes
@@ -65,6 +68,20 @@ class PodcastResponseConverter @Inject constructor() {
     }
 
     companion object {
+        private val dateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.ENGLISH)
+
+        private fun List<PodcastEpisodeResponse>.orderEpisode() =
+            this.sortedWith(
+                compareBy<PodcastEpisodeResponse> { item ->
+                    try {
+                        item.pubDate?.let { dateFormat.parse(it)?.time }
+                    } catch (e: Exception) {
+                        null
+                    }
+                }
+                    .thenBy { it.season.safeToInt() }
+                    .thenBy { it.episode.safeToInt() }
+            )
 
         private fun String?.safeToInt(): Int? {
             val maybeNumber = this?.takeIf { it.isNotBlank() }

diff --git a/...src/main/java/org/grakovne/lissen/channel/audiobookshelf/podcast/model/PodcastResponse.kt b/...src/main/java/org/grakovne/lissen/channel/audiobookshelf/podcast/model/PodcastResponse.kt
@@ -20,6 +20,7 @@ data class PodcastEpisodeResponse(
     val id: String,
     val season: String?,
     val episode: String?,
+    val pubDate: String?,
     val title: String,
     val audioFile: PodcastAudioFileResponse
 )