Skip to content

Commit

Permalink
Move some function from SharedViewModel to SimpleMediaServiceHandler
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxrave-dev
maxrave-dev committed Jul 24, 2024
1 parent 8aef45d commit 84a134f
Show file tree
Hide file tree
Showing 18 changed files with 265 additions and 284 deletions.
215 changes: 206 additions & 9 deletions app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,17 @@ import androidx.media3.session.MediaSession
import androidx.media3.session.SessionCommand
import coil.ImageLoader
import coil.request.ImageRequest
import com.maxrave.kotlinytmusicscraper.models.sponsorblock.SkipSegments
import com.maxrave.simpmusic.R
import com.maxrave.simpmusic.common.ASC
import com.maxrave.simpmusic.common.DESC
import com.maxrave.simpmusic.common.LOCAL_PLAYLIST_ID
import com.maxrave.simpmusic.common.LOCAL_PLAYLIST_ID_SAVED_QUEUE
import com.maxrave.simpmusic.common.MEDIA_CUSTOM_COMMAND
import com.maxrave.simpmusic.common.SPONSOR_BLOCK
import com.maxrave.simpmusic.data.dataStore.DataStoreManager
import com.maxrave.simpmusic.data.dataStore.DataStoreManager.Settings.TRUE
import com.maxrave.simpmusic.data.db.entities.NewFormatEntity
import com.maxrave.simpmusic.data.db.entities.SongEntity
import com.maxrave.simpmusic.data.model.browse.album.Track
import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
Expand All @@ -55,6 +59,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.cancellable
Expand Down Expand Up @@ -130,6 +135,17 @@ class SimpleMediaServiceHandler(
private var _sleepTimerState = MutableStateFlow<SleepTimerState>(SleepTimerState(false, 0))
val sleepTimerState = _sleepTimerState.asStateFlow()

// SponsorBlock
private var _skipSegments: MutableStateFlow<List<SkipSegments>?> = MutableStateFlow(null)
val skipSegments: StateFlow<List<SkipSegments>?> = _skipSegments

private var getSkipSegmentsJob : Job? = null

private var _format: MutableStateFlow<NewFormatEntity?> = MutableStateFlow(null)
val format: StateFlow<NewFormatEntity?> = _format

private var getFormatJob : Job? = null

private var skipSilent = false

private var normalizeVolume = false
Expand All @@ -144,6 +160,11 @@ class SimpleMediaServiceHandler(

private var songEntityJob: Job? = null

private var watchTimeList: ArrayList<Float> = arrayListOf()

private var jobWatchtime: Job? = null


init {
player.addListener(this)
job = Job()
Expand All @@ -154,16 +175,19 @@ class SimpleMediaServiceHandler(
loadJob = Job()
songEntityJob = Job()
downloadImageForWidgetJob = Job()
skipSilent = runBlocking { dataStoreManager.skipSilent.first() == DataStoreManager.TRUE }
getSkipSegmentsJob = Job()
getFormatJob = Job()
jobWatchtime = Job()
skipSilent = runBlocking { dataStoreManager.skipSilent.first() == TRUE }
normalizeVolume =
runBlocking { dataStoreManager.normalizeVolume.first() == DataStoreManager.TRUE }
if (runBlocking { dataStoreManager.saveStateOfPlayback.first() } == DataStoreManager.TRUE) {
runBlocking { dataStoreManager.normalizeVolume.first() == TRUE }
if (runBlocking { dataStoreManager.saveStateOfPlayback.first() } == TRUE) {
Log.d("CHECK INIT", "TRUE")
val shuffleKey = runBlocking { dataStoreManager.shuffleKey.first() }
val repeatKey = runBlocking { dataStoreManager.repeatKey.first() }
Log.d("CHECK INIT", "Shuffle: $shuffleKey")
Log.d("CHECK INIT", "Repeat: $repeatKey")
player.shuffleModeEnabled = shuffleKey == DataStoreManager.TRUE
player.shuffleModeEnabled = shuffleKey == TRUE
player.repeatMode =
when (repeatKey) {
DataStoreManager.REPEAT_ONE -> Player.REPEAT_MODE_ONE
Expand All @@ -179,7 +203,71 @@ class SimpleMediaServiceHandler(
toggleLike = ::toggleLike
}
mayBeRestoreQueue()
coroutineScope.launch {
val skipSegmentsJob = launch {
simpleMediaState.collect { state ->
if (state is SimpleMediaState.Progress && dataStoreManager.sponsorBlockEnabled.first() == TRUE) {
val progress = (state.progress / player.duration).toFloat()
if (player.duration > 0L) {
val skipSegments = skipSegments.value
val listCategory = dataStoreManager.getSponsorBlockCategories()
if (skipSegments != null) {
for (skip in skipSegments) {
if (listCategory.contains(skip.category)) {
val firstPart = (skip.segment[0] / skip.videoDuration).toFloat()
val secondPart =
(skip.segment[1] / skip.videoDuration).toFloat()
if (progress in firstPart..secondPart) {
Log.w(
"Seek to",
(skip.segment[1] / skip.videoDuration).toFloat()
.toString(),
)
skipSegment((skip.segment[1] * 1000).toLong())
Toast.makeText(
context,
context.getString(
R.string.sponsorblock_skip_segment,
context.getString(
SPONSOR_BLOCK.listName.get(
SPONSOR_BLOCK.list.indexOf(skip.category),
),
).lowercase(),
),
Toast.LENGTH_SHORT,
).show()
}
}
}
}
}
}
}
}
val playbackJob =
launch {
format.collectLatest { formatTemp ->
if (dataStoreManager.sendBackToGoogle.first() == TRUE) {
if (formatTemp != null) {
println("format in viewModel: $formatTemp")
Log.d(TAG, "Collect format ${formatTemp.videoId}")
Log.w(TAG, "Format expire at ${formatTemp.expiredTime}")
Log.i(TAG, "AtrUrl ${formatTemp.playbackTrackingAtrUrl}")
initPlayback(
formatTemp.playbackTrackingVideostatsPlaybackUrl,
formatTemp.playbackTrackingAtrUrl,
formatTemp.playbackTrackingVideostatsWatchtimeUrl,
formatTemp.cpn,
)
}
}
}
}
skipSegmentsJob.join()
playbackJob.join()
}
}

private var getDataOfNowPlayingTrackStateJob: Job? = null
private fun getDataOfNowPlayingState(mediaItem: MediaItem) {
val videoId = if (mediaItem.isVideo()) {
Expand All @@ -195,6 +283,8 @@ class SimpleMediaServiceHandler(
)
}
updateWidget(mediaItem)
_format.value = null
_skipSegments.value = null
getDataOfNowPlayingTrackStateJob?.cancel()
getDataOfNowPlayingTrackStateJob = coroutineScope.launch {
Log.w(TAG, "getDataOfNowPlayingState: $videoId")
Expand Down Expand Up @@ -233,6 +323,113 @@ class SimpleMediaServiceHandler(
}
}
}
if (dataStoreManager.sponsorBlockEnabled.first() == TRUE){ getSkipSegments(videoId) }
if (dataStoreManager.sendBackToGoogle.first() == TRUE){ getFormat(videoId) }
}
}

private fun getSkipSegments(videoId: String) {
_skipSegments.value = null
coroutineScope.launch {
mainRepository.getSkipSegments(videoId).collect { segments ->
if (segments != null) {
Log.w("Check segments $videoId", segments.toString())
_skipSegments.value = segments
} else {
_skipSegments.value = null
}
}
}
}

private fun getFormat(mediaId: String?) {
getFormatJob?.cancel()
getFormatJob = coroutineScope.launch {
if (mediaId != null) {
mainRepository.getFormatFlow(mediaId).cancellable().collectLatest { f ->
Log.w(TAG, "Get format for "+ mediaId.toString() + ": " +f.toString())
if (f != null) {
_format.emit(f)
} else {
_format.emit(null)
}
}
}
}
}

private fun initPlayback(
playback: String?,
atr: String?,
watchTime: String?,
cpn: String?,
) {
jobWatchtime?.cancel()
coroutineScope.launch {
if (playback != null && atr != null && watchTime != null && cpn != null) {
watchTimeList.clear()
mainRepository.initPlayback(playback, atr, watchTime, cpn, queueData.value?.playlistId)
.collect {
if (it.first == 204) {
Log.d("Check initPlayback", "Success")
watchTimeList.add(0f)
watchTimeList.add(5.54f)
watchTimeList.add(it.second)
updateWatchTime()
}
}
}
}
}

private fun updateWatchTime() {
coroutineScope.launch {
jobWatchtime =
launch {
simpleMediaState.collect { state ->
if (state is SimpleMediaState.Progress){
val value = state.progress
if (value > 0 && watchTimeList.isNotEmpty()) {
val second = (value / 1000).toFloat()
if (second in watchTimeList.last()..watchTimeList.last() + 1.2f) {
val watchTimeUrl =
_format.value?.playbackTrackingVideostatsWatchtimeUrl
val cpn = _format.value?.cpn
if (second + 20.23f < (player.duration / 1000).toFloat()) {
watchTimeList.add(second + 20.23f)
if (watchTimeUrl != null && cpn != null) {
mainRepository.updateWatchTime(
watchTimeUrl,
watchTimeList,
cpn,
queueData.value?.playlistId
).collect { response ->
if (response == 204) {
Log.d("Check updateWatchTime", "Success")
}
}
}
} else {
watchTimeList.clear()
if (watchTimeUrl != null && cpn != null) {
mainRepository.updateWatchTimeFull(
watchTimeUrl,
cpn,
queueData.value?.playlistId
).collect { response ->
if (response == 204) {
Log.d("Check updateWatchTimeFull", "Success")
}
}
}
}
Log.w("Check updateWatchTime", watchTimeList.toString())
}
}
}
}
}
jobWatchtime?.join()
}
}

Expand Down Expand Up @@ -752,7 +949,7 @@ class SimpleMediaServiceHandler(

private fun mayBeNormalizeVolume() {
runBlocking {
normalizeVolume = dataStoreManager.normalizeVolume.first() == DataStoreManager.TRUE
normalizeVolume = dataStoreManager.normalizeVolume.first() == TRUE
}
if (!normalizeVolume) {
loudnessEnhancer?.enabled = false
Expand Down Expand Up @@ -792,13 +989,13 @@ class SimpleMediaServiceHandler(
}

private fun maybeSkipSilent() {
skipSilent = runBlocking { dataStoreManager.skipSilent.first() } == DataStoreManager.TRUE
skipSilent = runBlocking { dataStoreManager.skipSilent.first() } == TRUE
player.skipSilenceEnabled = skipSilent
}

private fun mayBeRestoreQueue() {
coroutineScope.launch {
if (dataStoreManager.saveRecentSongAndQueue.first() == DataStoreManager.TRUE) {
if (dataStoreManager.saveRecentSongAndQueue.first() == TRUE) {
val currentPlayingTrack = mainRepository.getSongById(dataStoreManager.recentMediaId.first()).singleOrNull()?.toTrack()
if (currentPlayingTrack != null) {
val queue = mainRepository.getSavedQueue().singleOrNull()
Expand Down Expand Up @@ -884,7 +1081,7 @@ class SimpleMediaServiceHandler(

fun mayBeSaveRecentSong() {
coroutineScope.launch {
if (dataStoreManager.saveRecentSongAndQueue.first() == DataStoreManager.TRUE) {
if (dataStoreManager.saveRecentSongAndQueue.first() == TRUE) {
dataStoreManager.saveRecentSong(
player.currentMediaItem?.mediaId ?: "",
player.contentPosition,
Expand All @@ -901,7 +1098,7 @@ class SimpleMediaServiceHandler(
}

fun mayBeSavePlaybackState() {
if (runBlocking { dataStoreManager.saveStateOfPlayback.first() } == DataStoreManager.TRUE) {
if (runBlocking { dataStoreManager.saveStateOfPlayback.first() } == TRUE) {
runBlocking {
dataStoreManager.recoverShuffleAndRepeatKey(
player.shuffleModeEnabled,
Expand Down
43 changes: 0 additions & 43 deletions app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import com.maxrave.simpmusic.R
import com.maxrave.simpmusic.common.Config
import com.maxrave.simpmusic.common.FIRST_TIME_MIGRATION
import com.maxrave.simpmusic.common.SELECTED_LANGUAGE
import com.maxrave.simpmusic.common.SPONSOR_BLOCK
import com.maxrave.simpmusic.common.STATUS_DONE
import com.maxrave.simpmusic.common.SUPPORTED_LANGUAGE
import com.maxrave.simpmusic.common.SUPPORTED_LOCATION
Expand All @@ -60,7 +59,6 @@ import dev.chrisbanes.insetter.applyInsetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import okhttp3.CacheControl
Expand Down Expand Up @@ -604,46 +602,6 @@ class MainActivity : AppCompatActivity() {
}
}
}
val job1 =
launch {
viewModel.timeline.collect { timeline ->
val progress = (timeline.current / timeline.total).toFloat()
if (timeline.total > 0L && !timeline.loading){
val skipSegments = viewModel.skipSegments.first()
val enabled = viewModel.sponsorBlockEnabled()
val listCategory = viewModel.sponsorBlockCategories()
if (skipSegments != null && enabled == DataStoreManager.TRUE) {
for (skip in skipSegments) {
if (listCategory.contains(skip.category)) {
val firstPart = (skip.segment[0] / skip.videoDuration).toFloat()
val secondPart =
(skip.segment[1] / skip.videoDuration).toFloat()
if (progress in firstPart..secondPart) {
Log.w(
"Seek to",
(skip.segment[1] / skip.videoDuration).toFloat()
.toString(),
)
viewModel.skipSegment((skip.segment[1] * 1000).toLong())
Toast.makeText(
this@MainActivity,
getString(
R.string.sponsorblock_skip_segment,
getString(
SPONSOR_BLOCK.listName.get(
SPONSOR_BLOCK.list.indexOf(skip.category),
),
).lowercase(),
),
Toast.LENGTH_SHORT,
).show()
}
}
}
}
}
}
}

val showHideJob = launch {
repeatOnLifecycle(Lifecycle.State.RESUMED) {
Expand Down Expand Up @@ -685,7 +643,6 @@ class MainActivity : AppCompatActivity() {
}
}

job1.join()
miniplayerJob.join()
showHideJob.join()
bottomNavBarJob.join()
Expand Down
Loading

0 comments on commit 84a134f

Please sign in to comment.