#496 - save length to db

Author: sentinelweb

database/build.gradle.kts

@@ -2,15 +2,13 @@ plugins {
     kotlin("multiplatform")
     kotlin("native.cocoapods")
     id("com.android.library")
-//    kotlin("com.android.application")
     id("com.squareup.sqldelight")
     kotlin("plugin.serialization")
 }
 
 group = "uk.co.sentinelweb.cuer"
 version = "1.0"
 
-//val ver_jvm: String by project
 val ver_coroutines: String by project
 val ver_kotlinx_serialization_core: String by project
 val ver_sqldelight: String by project
@@ -19,7 +17,6 @@ val ver_koin: String by project
 val ver_turbine: String by project
 val ver_kotlin_fixture: String by project
 val ver_mockk: String by project
-
 val ver_swift_tools: String by project
 val ver_ios_deploy_target: String by project
 

database/src/androidUnitTest/kotlin/uk/co/sentinelweb/cuer/db/repository/SqldelightMediaDatabaseRepositoryTest.kt

@@ -14,8 +14,8 @@ import org.koin.test.inject
 import uk.co.sentinelweb.cuer.app.db.Database
 import uk.co.sentinelweb.cuer.app.db.repository.ChannelDatabaseRepository
 import uk.co.sentinelweb.cuer.app.db.repository.ConflictException
-import uk.co.sentinelweb.cuer.app.db.repository.MediaDatabaseRepository
 import uk.co.sentinelweb.cuer.app.db.repository.DbResult
+import uk.co.sentinelweb.cuer.app.db.repository.MediaDatabaseRepository
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Filter.*
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Operation.DELETE
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Operation.FULL
@@ -148,6 +148,7 @@ class SqldelightMediaDatabaseRepositoryTest : KoinTest {
                 channelData = initialSaved.channelData,
                 thumbNail = initialSaved.thumbNail,
                 image = initialSaved.image,
+                length = initialSaved.length,
                 broadcastDate = null,
             )
             val updated = sut.save(changed, emit = true, flat = false).data!!
@@ -178,6 +179,7 @@ class SqldelightMediaDatabaseRepositoryTest : KoinTest {
                     ),
                     thumbNail = media.thumbNail?.copy(id = saved[i].thumbNail?.id),
                     image = media.image?.copy(id = saved[i].image?.id),
+                    length = media.length,
                 )
             }
 
@@ -207,6 +209,7 @@ class SqldelightMediaDatabaseRepositoryTest : KoinTest {
                     thumbNail = it.thumbNail,
                     image = it.image,
                     broadcastDate = null,
+                    length = it.length,
                 )
             }
             val updated = sut.save(changed, emit = true, flat = false).data!!

database/src/commonMain/kotlin/uk/co/sentinelweb/cuer/db/factory/DatabaseFactory.kt

@@ -47,16 +47,10 @@ class DatabaseFactory(
             )
         ).apply {
             log.d("Database.Schema.version ${Database.Schema.version} prefs.dbVersion ${prefs.dbVersion}")
-//        }.apply {
-//            Database.Schema.migrate(
-//                driver = driver,
-//                oldVersion = prefs.dbVersion,
-//                newVersion = Database.Schema.version,
-//            )
         }.also {
             prefs.dbVersion = Database.Schema.version
         }.apply {
             log.d("Database.Schema.version ${Database.Schema.version} prefs.dbVersion ${prefs.dbVersion}")
         }
     }
-}
+}

database/src/commonMain/kotlin/uk/co/sentinelweb/cuer/db/mapper/MediaMapper.kt

@@ -39,7 +39,8 @@ class MediaMapper(
             isLiveBroadcast = entity.flags.hasFlag(FLAG_LIVE),
             isLiveBroadcastUpcoming = entity.flags.hasFlag(FLAG_LIVE_UPCOMING),
             playFromStart = entity.flags.hasFlag(FLAG_PLAY_FROM_START),
-            broadcastDate = entity.broadcast_date
+            broadcastDate = entity.broadcast_date,
+            length = entity.length
         )
 
     fun map(domain: MediaDomain): Media = Media(
@@ -58,7 +59,8 @@ class MediaMapper(
         thumb_id = domain.thumbNail?.id?.id?.value,
         image_id = domain.image?.id?.id?.value,
         flags = mapFlags(domain),
-        broadcast_date = domain.broadcastDate
+        broadcast_date = domain.broadcastDate,
+        length = domain.length
     )
 
     private fun mapFlags(domain: MediaDomain):Long =
@@ -69,4 +71,4 @@ class MediaMapper(
             FLAG_LIVE_UPCOMING to domain.isLiveBroadcastUpcoming,
             FLAG_PLAY_FROM_START to domain.playFromStart
         )
-}
+}

database/src/commonMain/sqldelight/uk/co/sentinelweb/cuer/database/entity/MediaEntity.sq

@@ -17,6 +17,7 @@ CREATE TABLE media (
     thumb_id TEXT,
     image_id TEXT,
     broadcast_date TEXT AS kotlinx.datetime.LocalDateTime DEFAULT NULL,
+    length INTEGER,
     FOREIGN KEY (channel_id) REFERENCES channel(id)
 );
 
@@ -34,7 +35,7 @@ CREATE INDEX media_description_index ON media(description);
 
 create:
 INSERT INTO media ( id, flags, type, url, title, duration, position, date_last_played, description, platform, platform_id,
-published, channel_id, thumb_id, image_id, broadcast_date ) VALUES ?
+published, channel_id, thumb_id, image_id, broadcast_date, length ) VALUES ?
 --ON CONFLICT (platform, platform_id) DO NOTHING
 ;
 
@@ -43,7 +44,7 @@ published, channel_id, thumb_id, image_id, broadcast_date ) VALUES ?
 
 update:
 REPLACE INTO media ( id, flags, type, url, title, duration, position, date_last_played, description, platform, platform_id,
-published, channel_id, thumb_id, image_id, broadcast_date ) VALUES ?
+published, channel_id, thumb_id, image_id, broadcast_date, length ) VALUES ?
 --   ON CONFLICT (platform, platform_id) DO NOTHING
 ;
 

database/src/commonMain/sqldelight/uk/co/sentinelweb/cuer/database/migrations/2.sqm

@@ -0,0 +1 @@
+ALTER TABLE media ADD COLUMN length INTEGER DEFAULT NULL;

database/src/commonMain/sqldelight/uk/co/sentinelweb/cuer/database/verify/2.db

@@ -53,7 +53,7 @@ class TimeSinceFormatterTest {
 
     @Test
     fun formatTimeSince_months() {
-        assertEquals("6mth", sut.formatTimeSince(baseTime - 1000L * 60 * 60 * 24 * 200))
+        assertEquals("6mo", sut.formatTimeSince(baseTime - 1000L * 60 * 60 * 24 * 200))
     }
 
     @Test
@@ -89,7 +89,7 @@ class TimeSinceFormatterTest {
 
     @Test
     fun formatTimeShort_months() {
-        assertEquals("6mth", sut.formatTimeShort(1000L * 60 * 60 * 24 * 200))
+        assertEquals("6mo", sut.formatTimeShort(1000L * 60 * 60 * 24 * 200))
     }
 
     @Test
@@ -102,4 +102,4 @@ class TimeSinceFormatterTest {
         assertEquals("--", sut.formatTimeShort(1000L * 60 * 60 * 24 * 365 * 21))
     }
 
-}
+}