feat: new programme guide.

oxyroid · May 5, 2024 · 3e0a338 · 3e0a338
1 parent 5651531
commit 3e0a338
Show file tree

Hide file tree

Showing 5 changed files with 495 additions and 429 deletions.
diff --git a/data/src/main/java/com/m3u/data/database/dao/ProgrammeDao.kt b/data/src/main/java/com/m3u/data/database/dao/ProgrammeDao.kt
@@ -57,7 +57,7 @@ interface ProgrammeDao {
 
     @Query(
         """
-        SELECT MIN(start) AS startEdge, MAX(`end`) AS endEdge
+        SELECT MIN(start) AS start_edge, MAX(`end`) AS end_edge
         FROM programmes
         WHERE epg_url in (:epgUrls)
         AND channel_id = :channelId

diff --git a/data/src/main/java/com/m3u/data/database/model/Programme.kt b/data/src/main/java/com/m3u/data/database/model/Programme.kt
@@ -35,11 +35,16 @@ data class Programme(
     val id: Int = 0
 )
 
-@Keep
 data class ProgrammeRange(
-    val startEdge: Long,
-    val endEdge: Long
+    @ColumnInfo("start_edge")
+    val start: Long,
+    @ColumnInfo("end_edge")
+    val end: Long
 ) {
-    fun isEmpty(): Boolean = length() <= 0
-    fun length(): Long = endEdge - startEdge
+    fun isEmpty(): Boolean = end - start <= 0
+    fun count(unit: Long = 1L): Int = (end - start).floorDiv(unit).toInt()
+
+    companion object {
+        const val HOUR_LENGTH = 3600000L
+    }
 }
diff --git a/features/stream/src/main/java/com/m3u/features/stream/StreamViewModel.kt b/features/stream/src/main/java/com/m3u/features/stream/StreamViewModel.kt
@@ -320,8 +320,8 @@ class StreamViewModel @Inject constructor(
                         )
                     }
 
-                    it.length() < 12 * 3600000L -> {
-                        with(Instant.fromEpochMilliseconds(it.startEdge)) {
+                    it.count(ProgrammeRange.HOUR_LENGTH) < 12 -> {
+                        with(Instant.fromEpochMilliseconds(it.start)) {
                             ProgrammeRange(
                                 this.toEpochMilliseconds(),
                                 this.plus(24.hours).toEpochMilliseconds()