test: fix playback updates #501
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,12 +29,14 @@ import android.content.SharedPreferences | |
| import android.os.Build | ||
| import android.os.Bundle | ||
| import android.preference.PreferenceManager | ||
| import androidx.lifecycle.ProcessLifecycleOwner | ||
| import androidx.lifecycle.lifecycleScope | ||
| import androidx.localbroadcastmanager.content.LocalBroadcastManager | ||
| import com.google.android.exoplayer2.database.ExoDatabaseProvider | ||
| import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor | ||
| import com.google.android.exoplayer2.upstream.cache.SimpleCache | ||
| import com.google.firebase.analytics.FirebaseAnalytics | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import net.danlew.android.joda.JodaTimeAndroid | ||
| import org.greenrobot.eventbus.EventBus | ||
|
|
@@ -141,7 +143,7 @@ open class SerenityApplication : Application() { | |
| } | ||
|
|
||
| protected open fun discoverServers() { | ||
| ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.IO) { | ||
| EmbyServerDiscover().findServers() | ||
| } | ||
| } | ||
|
Comment on lines
145
to
149
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Check for build.gradle files containing lifecycle-process dependency
find . -type f \( -name "build.gradle" -o -name "build.gradle.kts" \) | head -20Repository: NineWorlds/serenity-android Length of output: 348 🏁 Script executed: #!/bin/bash
# Search for lifecycle-process in all build.gradle files
echo "=== Searching for lifecycle-process ==="
grep -r "lifecycle-process" . --include="*.gradle" --include="*.gradle.kts" 2>/dev/null || echo "Not found in build files"
echo -e "\n=== Searching for androidx.lifecycle in serenity-app/build.gradle.kts ==="
grep -E "androidx\.lifecycle|lifecycle" serenity-app/build.gradle.kts 2>/dev/null || echo "Not found"
echo -e "\n=== Full serenity-app/build.gradle.kts dependencies section ==="
sed -n '/^dependencies/,/^}/p' serenity-app/build.gradle.kts 2>/dev/null | head -100Repository: NineWorlds/serenity-android Length of output: 3515 🏁 Script executed: #!/bin/bash
# Read the SerenityApplication.kt file, especially around lines 145-149
echo "=== SerenityApplication.kt (lines 140-160) ==="
sed -n '140,160p' serenity-app/src/main/java/us/nineworlds/serenity/SerenityApplication.kt
echo -e "\n=== Import statements in SerenityApplication.kt ==="
head -30 serenity-app/src/main/java/us/nineworlds/serenity/SerenityApplication.kt
echo -e "\n=== Check for Toothpick usage in SerenityApplication.kt ==="
grep -E "Toothpick|inject|Inject" serenity-app/src/main/java/us/nineworlds/serenity/SerenityApplication.kt || echo "No Toothpick usage found"Repository: NineWorlds/serenity-android Length of output: 2791 Lifecycle-aware coroutine management is solid, but dependency injection pattern needs adjustment. The lifecycle-process dependency is properly declared, and using 🤖 Prompt for AI Agents |
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,6 +55,35 @@ object UpdateProgressRequestJob { | |
| } | ||
| } | ||
|
|
||
| fun updateProgress(position: Long, video: VideoContentInfo, playSessionId: String?) { | ||
| if (scope == null) { | ||
| job = SupervisorJob() | ||
| scope = CoroutineScope(Dispatchers.IO + job!!) | ||
| } | ||
|
|
||
| scope?.launch { | ||
| val id = video.id() | ||
| if (id == null) { | ||
| Timber.w("Video ID is null. Cannot update progress for video: ${video.id()}") | ||
| return@launch | ||
| } | ||
|
|
||
| try { | ||
| if (video.isWatched) { | ||
| serenityClient.watched(id) | ||
| serenityClient.progress(id, "0", playSessionId) | ||
| } else { | ||
| serenityClient.progress(id, position.toString(), playSessionId) | ||
| } | ||
| } catch (e: Exception) { | ||
| if (e is CancellationException) { | ||
| return@launch | ||
| } | ||
| Timber.e(e, "Error updating progress") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun onFinish() { | ||
| scope?.cancel() | ||
| scope = null | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,6 +54,7 @@ class ExoplayerPresenter : MvpPresenter<ExoplayerView>(), ExoplayerPresenter, | |
| internal lateinit var video: VideoContentInfo | ||
|
|
||
| private var onScreenControllerShowing: Boolean = false | ||
| private var playSessionId: String? = null | ||
|
|
||
| override fun attachView(view: ExoplayerView?) { | ||
| Toothpick.inject(this, Toothpick.openScope(InjectionConstants.APPLICATION_SCOPE)) | ||
|
|
@@ -97,11 +98,15 @@ class ExoplayerPresenter : MvpPresenter<ExoplayerView>(), ExoplayerPresenter, | |
| presenterScope.launch { | ||
| playbackRepository.stopPlaying(video.id().orEmpty(), currentPosition) | ||
| } | ||
| playSessionId = null | ||
| } | ||
|
|
||
| override fun startPlaying() { | ||
| presenterScope.launch { | ||
|
|
||
| if (playSessionId == null) { | ||
| playSessionId = playbackRepository.startPlaying(video.id().orEmpty()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -131,7 +136,7 @@ class ExoplayerPresenter : MvpPresenter<ExoplayerView>(), ExoplayerPresenter, | |
| override fun updateServerPlaybackPosition(currentPostion: Long) { | ||
| presenterScope.launch { | ||
| video.resumeOffset = currentPostion.toInt() | ||
| playbackRepository.updatePlaybackPosition(video, playSessionId) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -152,7 +157,7 @@ class ExoplayerPresenter : MvpPresenter<ExoplayerView>(), ExoplayerPresenter, | |
|
|
||
| override fun playVideo() { | ||
| val videoUrl: String = transcoderUrl() | ||
| startPlaying() | ||
| viewState.initializePlayer(videoUrl, video.resumeOffset) | ||
| } | ||
|
|
||
|
|
@@ -185,4 +190,4 @@ class ExoplayerPresenter : MvpPresenter<ExoplayerView>(), ExoplayerPresenter, | |
|
|
||
| private fun selectCodec(mimeType: String): Boolean = | ||
| MediaCodecInfoUtil.isCodecSupported(mimeType) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,34 +2,35 @@ package us.nineworlds.serenity.ui.video.player | |
|
|
||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import timber.log.Timber | ||
| import toothpick.InjectConstructor | ||
| import us.nineworlds.serenity.common.rest.SerenityClient | ||
| import us.nineworlds.serenity.core.model.VideoContentInfo | ||
|
|
||
| @InjectConstructor | ||
| class PlaybackRepository(private val serenityClient: SerenityClient) { | ||
|
|
||
| suspend fun startPlaying(videoId: String): String? = withContext(Dispatchers.IO) { | ||
| val playSessionId = serenityClient.startPlaying(videoId) | ||
| Timber.d("Playback Session Id: ${playSessionId}") | ||
| playSessionId | ||
| } | ||
|
|
||
| suspend fun stopPlaying(videoId: String, offset: Long) = withContext(Dispatchers.IO){ | ||
| serenityClient.stopPlaying(videoId, offset) | ||
| } | ||
|
|
||
| suspend fun updatePlaybackPosition(video: VideoContentInfo, playSessionId: String? = null) = withContext(Dispatchers.IO){ | ||
| val videoId: String = video.id().orEmpty() | ||
| if (video.isWatched) { | ||
| serenityClient.watched(videoId) | ||
| serenityClient.progress(videoId, "0", playSessionId) | ||
| } else { | ||
| serenityClient.progress(videoId, video.resumeOffset.toString(), playSessionId) | ||
| } | ||
| } | ||
|
|
||
| suspend fun watched(videoId: String) = withContext(Dispatchers.IO) { | ||
| serenityClient.watched(videoId) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion | 🟠 Major
Remove unused import
kotlin.uuid.Uuid.This import is not used in the file. The code uses
java.util.UUIDthroughout.🔎 Proposed fix
-import kotlin.uuid.Uuid📝 Committable suggestion
🤖 Prompt for AI Agents