Hotfix/youtube (#12)

* Fix deserialization of TextBlock * Fix wrong duration calculation
topi314 · Oct 29, 2023 · a15cbd8 · a15cbd8
1 parent 8e9ec8c
commit a15cbd8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/com/github/topi314/sponsorblock/plugin/inntertube/Chapters.kt b/src/main/java/com/github/topi314/sponsorblock/plugin/inntertube/Chapters.kt
@@ -34,7 +34,12 @@ data class MacroMarkersListItemRenderer(
 )
 
 @Serializable
-data class TextBlock(val simpleText: String) {
-    override fun toString(): String = simpleText
+data class TextBlock(val runs: List<Run> = emptyList()) {
+    @Serializable
+    data class Run(val text: String, val bold: Boolean = false)
+
+    fun joinRuns() = runs.joinToString("", transform = Run::text)
+
+    override fun toString(): String = joinRuns()
 }
 
diff --git a/src/main/java/com/github/topi314/sponsorblock/plugin/inntertube/requests.kt b/src/main/java/com/github/topi314/sponsorblock/plugin/inntertube/requests.kt
@@ -69,14 +69,14 @@ fun HttpInterface.requestVideoChaptersById(id: String, trackLength: Long): List<
     val all = content.horizontalCardListRenderer.cards
     return (all.zipWithNext() + (all.last() to null)).map { (now, next) ->
         val renderer = now.macroMarkersListItemRenderer
-        val start = renderer.timeDescription.simpleText.parseDuration()
-        val end = next?.macroMarkersListItemRenderer?.timeDescription?.simpleText?.parseDuration() ?: trackLength.toDuration(DurationUnit.MILLISECONDS)
+        val start = renderer.timeDescription.joinRuns().parseDuration()
+        val end = next?.macroMarkersListItemRenderer?.timeDescription?.joinRuns()?.parseDuration() ?: trackLength.toDuration(DurationUnit.MILLISECONDS)
 
         Chapter(
-            renderer.title.simpleText,
+            renderer.title.joinRuns(),
             start.inWholeMilliseconds,
             end.inWholeMilliseconds,
-            start + end
+            end - start
         )
     }
 }