Reapply "Merge branch 'main' into main"

This reverts commit 3eb1377.

Author: mazen-salah

.github/workflows/bump_version.yaml

@@ -35,7 +35,7 @@ jobs:
           sed -i "s/versionName = \"[^\"]*\"/versionName = \"${{ env.VERSION_NAME }}\"/g" app/build.gradle.kts 
 
       - name: Open pull request
-        uses: peter-evans/create-pull-request@v6.1.0
+        uses: peter-evans/create-pull-request@v7.0.5
         with:
           commit-message: "Build: prepare for v${{ env.VERSION_NAME }} (${{ env.VERSION_CODE }}) release"
           branch: "release/${{ github.event.inputs.version }}"

Gemfile.lock

@@ -10,20 +10,20 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.965.0)
-    aws-sdk-core (3.201.5)
+    aws-partitions (1.1018.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.158.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.176.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -38,8 +38,8 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.111.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -65,10 +65,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.222.0)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -84,6 +84,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -109,6 +110,8 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -151,17 +154,17 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.2)
+    json (2.9.0)
+    jwt (2.9.3)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (6.0.1)
@@ -171,8 +174,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.5)
-      strscan
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -185,7 +187,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -195,15 +197,15 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)

core/common/src/main/java/dev/anilbeesetti/nextplayer/core/common/extensions/File.kt

@@ -1,15 +1,37 @@
 package dev.anilbeesetti.nextplayer.core.common.extensions
 
+import android.content.Context
+import android.net.Uri
 import android.os.Environment
+import androidx.core.net.toUri
 import java.io.File
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
-fun File.getSubtitles(): List<File> {
-    val mediaName = this.nameWithoutExtension
-    val subs = this.parentFile?.listFiles { file ->
-        file.nameWithoutExtension.startsWith(mediaName) && file.isSubtitle()
-    }?.toList() ?: emptyList()
+suspend fun File.getSubtitles(): List<File> = withContext(Dispatchers.IO) {
+    val mediaName = this@getSubtitles.nameWithoutExtension
+    val parentDir = this@getSubtitles.parentFile
+    val subtitleExtensions = listOf("srt", "ssa", "ass", "vtt", "ttml")
+
+    subtitleExtensions.mapNotNull { extension ->
+        val file = File(parentDir, "$mediaName.$extension")
+        file.takeIf { it.exists() }
+    }
+}
 
-    return subs
+suspend fun File.getLocalSubtitles(
+    context: Context,
+    excludeSubsList: List<Uri> = emptyList(),
+): List<Uri> = withContext(Dispatchers.Default) {
+    val excludeSubsPathSet = excludeSubsList.mapNotNull { context.getPath(it) }.toSet()
+
+    getSubtitles().mapNotNull { file ->
+        if (file.path !in excludeSubsPathSet) {
+            file.toUri()
+        } else {
+            null
+        }
+    }
 }
 
 fun String.getThumbnail(): File? {
@@ -24,7 +46,7 @@ fun String.getThumbnail(): File? {
 
 fun File.isSubtitle(): Boolean {
     val subtitleExtensions = listOf("srt", "ssa", "ass", "vtt", "ttml")
-    return extension in subtitleExtensions
+    return extension.lowercase() in subtitleExtensions
 }
 
 fun File.deleteFiles() {

core/data/src/main/java/dev/anilbeesetti/nextplayer/core/data/mappers/ToVideoState.kt

@@ -7,11 +7,13 @@ import dev.anilbeesetti.nextplayer.core.database.entities.MediumEntity
 fun MediumEntity.toVideoState(): VideoState {
     return VideoState(
         path = path,
-        position = playbackPosition,
+        title = name,
+        position = playbackPosition.takeIf { it != 0L },
         audioTrackIndex = audioTrackIndex,
         subtitleTrackIndex = subtitleTrackIndex,
         playbackSpeed = playbackSpeed,
         externalSubs = UriListConverter.fromStringToList(externalSubs),
         videoScale = videoScale,
+        thumbnailPath = thumbnailPath,
     )
 }

core/data/src/main/java/dev/anilbeesetti/nextplayer/core/data/models/VideoState.kt

@@ -4,10 +4,12 @@ import android.net.Uri
 
 data class VideoState(
     val path: String,
-    val position: Long,
+    val title: String,
+    val position: Long?,
     val audioTrackIndex: Int?,
     val subtitleTrackIndex: Int?,
     val playbackSpeed: Float?,
     val externalSubs: List<Uri>,
     val videoScale: Float,
+    val thumbnailPath: String?,
 )

core/data/src/main/java/dev/anilbeesetti/nextplayer/core/data/repository/LocalMediaRepository.kt

@@ -18,7 +18,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 class LocalMediaRepository @Inject constructor(
     private val mediumDao: MediumDao,
@@ -42,29 +41,52 @@ class LocalMediaRepository @Inject constructor(
         return mediumDao.get(uri)?.toVideoState()
     }
 
-    override suspend fun saveVideoState(
-        uri: String,
-        position: Long,
-        audioTrackIndex: Int?,
-        subtitleTrackIndex: Int?,
-        playbackSpeed: Float?,
-        externalSubs: List<Uri>,
-        videoScale: Float,
-    ) {
-        Timber.d(
-            "save state for [$uri]: [$position, $audioTrackIndex, $subtitleTrackIndex, $playbackSpeed]",
-        )
-
+    override fun updateMediumPosition(uri: String, position: Long) {
         applicationScope.launch {
-            mediumDao.updateMediumState(
+            val duration = mediumDao.get(uri)?.duration ?: position.plus(1)
+            mediumDao.updateMediumPosition(
                 uri = uri,
-                position = position,
-                audioTrackIndex = audioTrackIndex,
-                subtitleTrackIndex = subtitleTrackIndex,
-                playbackSpeed = playbackSpeed,
-                externalSubs = UriListConverter.fromListToString(externalSubs),
-                lastPlayedTime = System.currentTimeMillis(),
-                videoScale = videoScale,
+                position = position.takeIf { it < duration } ?: Long.MIN_VALUE.plus(1),
+            )
+            mediumDao.updateMediumLastPlayedTime(uri, System.currentTimeMillis())
+        }
+    }
+
+    override fun updateMediumPlaybackSpeed(uri: String, playbackSpeed: Float) {
+        applicationScope.launch {
+            mediumDao.updateMediumPlaybackSpeed(uri, playbackSpeed)
+            mediumDao.updateMediumLastPlayedTime(uri, System.currentTimeMillis())
+        }
+    }
+
+    override fun updateMediumAudioTrack(uri: String, audioTrackIndex: Int) {
+        applicationScope.launch {
+            mediumDao.updateMediumAudioTrack(uri, audioTrackIndex)
+            mediumDao.updateMediumLastPlayedTime(uri, System.currentTimeMillis())
+        }
+    }
+
+    override fun updateMediumSubtitleTrack(uri: String, subtitleTrackIndex: Int) {
+        applicationScope.launch {
+            mediumDao.updateMediumSubtitleTrack(uri, subtitleTrackIndex)
+            mediumDao.updateMediumLastPlayedTime(uri, System.currentTimeMillis())
+        }
+    }
+
+    override fun updateMediumZoom(uri: String, zoom: Float) {
+        applicationScope.launch {
+            mediumDao.updateMediumZoom(uri, zoom)
+            mediumDao.updateMediumLastPlayedTime(uri, System.currentTimeMillis())
+        }
+    }
+
+    override fun addExternalSubtitleToMedium(uri: String, subtitleUri: Uri) {
+        applicationScope.launch {
+            val currentExternalSubs = getVideoState(uri)?.externalSubs ?: emptyList()
+            if (currentExternalSubs.contains(subtitleUri)) return@launch
+            mediumDao.addExternalSubtitle(
+                mediumUri = uri,
+                externalSubs = UriListConverter.fromListToString(urlList = currentExternalSubs + subtitleUri),
             )
         }
     }

core/data/src/main/java/dev/anilbeesetti/nextplayer/core/data/repository/MediaRepository.kt

@@ -10,14 +10,14 @@ interface MediaRepository {
     fun getVideosFlow(): Flow<List<Video>>
     fun getVideosFlowFromFolderPath(folderPath: String): Flow<List<Video>>
     fun getFoldersFlow(): Flow<List<Folder>>
-    suspend fun saveVideoState(
-        uri: String,
-        position: Long,
-        audioTrackIndex: Int?,
-        subtitleTrackIndex: Int?,
-        playbackSpeed: Float?,
-        externalSubs: List<Uri>,
-        videoScale: Float,
-    )
+
     suspend fun getVideoState(uri: String): VideoState?
+
+    fun updateMediumPosition(uri: String, position: Long)
+    fun updateMediumPlaybackSpeed(uri: String, playbackSpeed: Float)
+    fun updateMediumAudioTrack(uri: String, audioTrackIndex: Int)
+    fun updateMediumSubtitleTrack(uri: String, subtitleTrackIndex: Int)
+    fun updateMediumZoom(uri: String, zoom: Float)
+
+    fun addExternalSubtitleToMedium(uri: String, subtitleUri: Uri)
 }

core/data/src/main/java/dev/anilbeesetti/nextplayer/core/data/repository/fake/FakeMediaRepository.kt

@@ -25,18 +25,25 @@ class FakeMediaRepository : MediaRepository {
         return flowOf(directories)
     }
 
-    override suspend fun saveVideoState(
-        uri: String,
-        position: Long,
-        audioTrackIndex: Int?,
-        subtitleTrackIndex: Int?,
-        playbackSpeed: Float?,
-        externalSubs: List<Uri>,
-        videoScale: Float,
-    ) {
-    }
-
     override suspend fun getVideoState(uri: String): VideoState? {
         return null
     }
+
+    override fun updateMediumPosition(uri: String, position: Long) {
+    }
+
+    override fun updateMediumPlaybackSpeed(uri: String, playbackSpeed: Float) {
+    }
+
+    override fun updateMediumAudioTrack(uri: String, audioTrackIndex: Int) {
+    }
+
+    override fun updateMediumSubtitleTrack(uri: String, subtitleTrackIndex: Int) {
+    }
+
+    override fun updateMediumZoom(uri: String, zoom: Float) {
+    }
+
+    override fun addExternalSubtitleToMedium(uri: String, subtitleUri: Uri) {
+    }
 }