ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager.git synced 2025-05-02 06:44:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(downloader): versions not loading correctly

Browse Source
This commit is contained in:
Robert 2024-05-29 23:25:15 +02:00
parent 1f671aba33
commit 413083c58d
No known key found for this signature in database
GPG Key ID: 887C470FCF872DC6
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/app/revanced/manager/network/downloader/APKMirror.kt
View File

@ -35,7 +35,7 @@ class APKMirror : AppDownloader, KoinComponent {
) )
private suspend fun getAppLink(packageName: String): String { private suspend fun getAppLink(packageName: String): String {
val searchResults = httpClient.getHtml { url("$apkMirror/?post_type=app_release&searchtype=app&s=$packageName") } val searchResults = httpClient.getHtml { url("$APK_MIRROR/?post_type=app_release&searchtype=app&s=$packageName") }
.div { .div {
withId = "content" withId = "content"
findFirst { findFirst {
@ -66,7 +66,7 @@ class APKMirror : AppDownloader, KoinComponent {
} }
return searchResults.find { url -> return searchResults.find { url ->
httpClient.getHtml { url(apkMirror + url) } httpClient.getHtml { url(APK_MIRROR + url) }
.div { .div {
withId = "primary" withId = "primary"
findFirst { findFirst {
@ -90,11 +90,12 @@ class APKMirror : AppDownloader, KoinComponent {
override fun getAvailableVersions(packageName: String, versionFilter: Set<String>) = flow<AppDownloader.App> { override fun getAvailableVersions(packageName: String, versionFilter: Set<String>) = flow<AppDownloader.App> {
// Vanced music uses the same package name so we have to hardcode... // We have to hardcode some apps since there are multiple apps with that package name
val appCategory = if (packageName == "com.google.android.apps.youtube.music") val appCategory = when (packageName) {
"youtube-music" "com.google.android.apps.youtube.music" -> "youtube-music"
else "com.google.android.youtube" -> "youtube"
getAppLink(packageName).split("/")[3] else -> getAppLink(packageName).split("/")[3]
}
var page = 1 var page = 1
@ -107,7 +108,7 @@ class APKMirror : AppDownloader, KoinComponent {
page <= 1 page <= 1
) { ) {
httpClient.getHtml { httpClient.getHtml {
url("$apkMirror/uploads/page/$page/") url("$APK_MIRROR/uploads/page/$page/")
parameter("appcategory", appCategory) parameter("appcategory", appCategory)
}.div { }.div {
withClass = "widget_appmanager_recentpostswidget" withClass = "widget_appmanager_recentpostswidget"
@ -172,7 +173,7 @@ class APKMirror : AppDownloader, KoinComponent {
preferSplit: Boolean, preferSplit: Boolean,
onDownload: suspend (downloadProgress: Pair<Float, Float>?) -> Unit onDownload: suspend (downloadProgress: Pair<Float, Float>?) -> Unit
) { ) {
val variants = httpClient.getHtml { url(apkMirror + downloadLink) } val variants = httpClient.getHtml { url(APK_MIRROR + downloadLink) }
.div { .div {
withClass = "variants-table" withClass = "variants-table"
findFirst { // list of variants findFirst { // list of variants
@ -217,7 +218,7 @@ class APKMirror : AppDownloader, KoinComponent {
if (variant.apkType == APKType.BUNDLE) throw Exception("Split apks are not supported yet") // TODO if (variant.apkType == APKType.BUNDLE) throw Exception("Split apks are not supported yet") // TODO
val downloadPage = httpClient.getHtml { url(apkMirror + variant.link) } val downloadPage = httpClient.getHtml { url(APK_MIRROR + variant.link) }
.a { .a {
withClass = "downloadButton" withClass = "downloadButton"
findFirst { findFirst {
@ -225,7 +226,7 @@ class APKMirror : AppDownloader, KoinComponent {
} }
} }
val downloadLink = httpClient.getHtml { url(apkMirror + downloadPage) } val downloadLink = httpClient.getHtml { url(APK_MIRROR + downloadPage) }
.form { .form {
withId = "filedownload" withId = "filedownload"
findFirst { findFirst {
@ -250,7 +251,7 @@ class APKMirror : AppDownloader, KoinComponent {
try { try {
httpClient.download(targetFile) { httpClient.download(targetFile) {
url(apkMirror + downloadLink) url(APK_MIRROR + downloadLink)
onDownload { bytesSentTotal, contentLength -> onDownload { bytesSentTotal, contentLength ->
onDownload(bytesSentTotal.div(100000).toFloat().div(10) to contentLength.div(100000).toFloat().div(10)) onDownload(bytesSentTotal.div(100000).toFloat().div(10) to contentLength.div(100000).toFloat().div(10))
} }
@ -268,7 +269,7 @@ class APKMirror : AppDownloader, KoinComponent {
} }
companion object { companion object {
const val apkMirror = "https://www.apkmirror.com" const val APK_MIRROR = "https://www.apkmirror.com"
val supportedArches = listOf("universal", "noarch") + SUPPORTED_ABIS val supportedArches = listOf("universal", "noarch") + SUPPORTED_ABIS
} }