Skip to content

Commit 2a374a6

Browse files
committed
Fix VideoInfo parsing error & Release v1.6.1 (10610)
1 parent deefa98 commit 2a374a6

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ plugins {
1111
apply(plugin = "dagger.hilt.android.plugin")
1212

1313
val versionMajor = 1
14-
val versionMinor = 7
15-
val versionPatch = 0
16-
val versionBuild = 1
17-
val isStable = false
14+
val versionMinor = 6
15+
val versionPatch = 1
16+
val versionBuild = 0
17+
val isStable = true
1818

1919
val keystorePropertiesFile = rootProject.file("keystore.properties")
2020

@@ -40,7 +40,7 @@ android {
4040
applicationId = "com.junkfood.seal"
4141
minSdk = 23
4242
targetSdk = 33
43-
versionCode = 10600
43+
versionCode = 10610
4444
versionName = StringBuilder("${versionMajor}.${versionMinor}.${versionPatch}").apply {
4545
if (!isStable) append("-beta.${versionBuild}")
4646
if (!splitApks) append("-(F-Droid)")

app/src/main/java/com/junkfood/seal/ui/component/VideoCard.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fun VideoCard(
3535
thumbnailUrl: Any = "",
3636
onClick: () -> Unit = {},
3737
progress: Float = 100f,
38-
fileSizeApprox: Int = 1024 * 1024 * 69,
38+
fileSizeApprox: Long = 1024 * 1024 * 69,
3939
duration: Int = 359,
4040
isPreview: Boolean = false
4141
) {

app/src/main/java/com/junkfood/seal/ui/page/download/DownloadViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class DownloadViewModel @Inject constructor() : ViewModel() {
9191
val title: String = "",
9292
val uploader: String = "",
9393
val duration: Int = 0,
94-
val fileSizeApprox: Int = 0,
94+
val fileSizeApprox: Long = 0,
9595
val progress: Float = 0f,
9696
val progressText: String = "",
9797
val thumbnailUrl: String = "",
@@ -302,7 +302,7 @@ class DownloadViewModel @Inject constructor() : ViewModel() {
302302
uploader = videoInfo.uploader ?: "null",
303303
thumbnailUrl = videoInfo.thumbnail.toHttpsUrl(),
304304
duration = videoInfo.duration?.roundToInt() ?: 0,
305-
fileSizeApprox = videoInfo.fileSizeApprox ?: 0
305+
fileSizeApprox = videoInfo.fileSizeApprox ?: 0L
306306
)
307307
}
308308

app/src/main/java/com/junkfood/seal/util/VideoInfo.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ data class VideoInfo(
1212
val thumbnail: String? = null,
1313
val description: String? = null,
1414
val uploader: String? = null,
15-
@SerialName("uploader_id") val uploaderId: String? = null,
16-
@SerialName("uploader_url") val uploaderUrl: String? = null,
17-
@SerialName("channel_id") val channelId: String? = null,
18-
@SerialName("channel_url") val channelUrl: String? = null,
15+
// @SerialName("uploader_id") val uploaderId: String? = null,
16+
// @SerialName("uploader_url") val uploaderUrl: String? = null,
17+
// @SerialName("channel_id") val channelId: Int? = null,
18+
// @SerialName("channel_url") val channelUrl: String? = null,
1919
val duration: Double? = null,
20-
@SerialName("view_count") val viewCount: Int? = null,
20+
@SerialName("view_count") val viewCount: Long? = null,
2121
@SerialName("webpage_url") val webpageUrl: String? = null,
2222
@SerialName("categories") val categories: List<String> = emptyList(),
2323
val tags: List<String>? = emptyList(),
2424
@SerialName("live_status") val liveStatus: String? = null,
25-
@SerialName("release_timestamp") val releaseTimestamp: Int? = null,
25+
// @SerialName("release_timestamp") val releaseTimestamp: Int? = null,
2626
@SerialName("comment_count") val commentCount: Int? = null,
2727
val chapters: List<Chapter>? = emptyList(),
2828
@SerialName("like_count") val likeCount: Int? = null,
2929
val channel: String? = null,
30-
@SerialName("channel_follower_count") val channelFollowerCount: Int? = null,
30+
// @SerialName("channel_follower_count") val channelFollowerCount: Int? = null,
3131
@SerialName("upload_date") val uploadDate: String? = null,
3232
val availability: String? = null,
3333
@SerialName("original_url") val originalUrl: String? = null,
@@ -46,7 +46,8 @@ data class VideoInfo(
4646
val ext: String,
4747
val protocol: String? = null,
4848
@SerialName("format_note") val formatNote: String? = null,
49-
@SerialName("filesize_approx") val fileSizeApprox: Int? = null,
49+
@SerialName("filesize_approx") val fileSizeApprox: Long? = null,
50+
@SerialName("filesize") val fileSize: Long? = null,
5051
val tbr: Double? = null,
5152
val width: Int? = null,
5253
val height: Int? = null,
@@ -81,7 +82,7 @@ data class Format(
8182
@SerialName("video_ext") val videoExt: String? = null,
8283
val format: String? = null,
8384
val resolution: String? = null,
84-
@SerialName("filesize_approx") val fileSizeApprox: Int? = null,
85+
@SerialName("filesize_approx") val fileSizeApprox: Long? = null,
8586
)
8687

8788
@Serializable
@@ -102,7 +103,7 @@ data class RequestedDownload(
102103
@SerialName("ext") val ext: String? = null,
103104
@SerialName("protocol") val protocol: String? = null,
104105
@SerialName("format_note") val formatNote: String? = null,
105-
@SerialName("filesize_approx") val filesizeApprox: Int? = null,
106+
@SerialName("filesize_approx") val fileSizeApprox: Long? = null,
106107
@SerialName("tbr") val tbr: Double? = null,
107108
@SerialName("width") val width: Int? = null,
108109
@SerialName("height") val height: Int? = null,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
This release fixes emerging bugs in v1.6.0
2+
3+
Bug Fix:
4+
Video info parsing error
5+
UI glitch when filtering videos in download history

0 commit comments

Comments
 (0)