mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-08-18 11:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize ViewVideoViewModel.loadVideoLink.

Browse Source
This commit is contained in:
Docile-Alligator
2026-06-07 21:55:53 -04:00
parent cf1ad30a3f
commit 7150ebc04c
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ml/docilealligator/infinityforreddit/VideoLinkFetcherKt.kt
View File

@ -270,9 +270,8 @@ private suspend fun parseRedgifsVideoLinks(
if (mp4.contains("-silent")) {
mp4 = mp4.substring(0, mp4.indexOf("-silent")) + ".mp4"
}
val mp4Name = mp4
AppResult.Success(Pair(mp4Name, mp4Name))
AppResult.Success(Pair(mp4, mp4))
} catch (e: JSONException) {
e.printStackTrace()
AppResult.Error(null)

31
app/src/main/java/ml/docilealligator/infinityforreddit/viewmodels/ViewVideoViewModel.kt
View File

@ -42,8 +42,8 @@ class ViewVideoViewModel(
private val vReddItUrl: String?,
private var streamableShortCode: String?,
var isDataSavingMode: Boolean = false,
var dataSavingModeDefaultResolution: Int = 0,
var nonDataSavingModeDefaultResolution: Int = 0,
val dataSavingModeDefaultResolution: Int = 0,
val nonDataSavingModeDefaultResolution: Int = 0,
var playbackSpeed: Int
) : ViewModel() {
var wasPlaying: Boolean = false
@ -90,7 +90,6 @@ class ViewVideoViewModel(
streamableApiProvider: Provider<StreamableAPIKt>,
currentAccountSharedPreferences: SharedPreferences,
) {
//https://www.redgifs.com/watch/mortifiedunhealthyptarmigan
viewModelScope.launch {
val result = fetchVideoLink(
retrofit, vReddItRetrofit, redgifsRetrofit, streamableApiProvider,
@ -99,12 +98,11 @@ class ViewVideoViewModel(
)
when (result) {
is AppResult.Success<*> -> {
is AppResult.Success -> {
when (val data = result.data) {
is StreamableVideo -> {
videoDownloadUrl = data.mp4?.url ?: data.mp4Mobile?.url
_videoUri.value = videoDownloadUrl?.toUri()
//title =
}
is Pair<*, *> -> {
@ -117,37 +115,28 @@ class ViewVideoViewModel(
redgifsId = data.newRedgifsId
streamableShortCode = data.newStreamableShortCode
videoFallbackDirectUrl = data.post.videoFallBackDirectUrl
// post =
post = data.post
val optionalResult = data.optionalResult
optionalResult?.let {
when (it) {
is AppResult.Success<*> -> {
is AppResult.Success -> {
when (val optionalData = it.data) {
is StreamableVideo -> {
videoDownloadUrl = optionalData.mp4?.url ?: optionalData.mp4Mobile?.url
_videoUri.value = videoDownloadUrl?.toUri()
//title =
}
is Pair<*, *> -> {
if (redgifsId == null) {
// Imgur
} else {
// Redgifs
_videoUri.value = (optionalData.first as? String)?.toUri()
videoDownloadUrl = optionalData.first as? String
}
// Redgifs or Imgur
_videoUri.value = (optionalData.first as? String)?.toUri()
videoDownloadUrl = optionalData.second as? String
}
}
}
is AppResult.Error<*> -> {
(it.error as? Int?)?.let {
} ?: run {
}
is AppResult.Error -> {
_errorResId.value = LiveDataState.Value(it.error as? Int ?: R.string.error_fetching_video)
}
}
} ?: run {