feat: downloads resume where they stopped, and fall back to another source (#623)

This commit is contained in:
kingokksa authored and GitHub committed 2026-10-16 13:45:35 -04:00
1 parent 59a5afa21d
commit 89a0e4d25f
53 files changed
+784 -221

No files matched your search

@@ -929,8 +929,7 @@ object ComponentsManager {
require(Hashes.isGithubSha256(item.digest)) { context.getString(R.string.cmgr_list_predates_checksums) }
val dest = File(packagesDir(context), safeName(item.file))
val part = File(dest.parentFile, dest.name + ".part")
part.delete()
check(Downloader.downloadFile(item.url, part, false) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { context.getString(R.string.user_apps_download_failed) }
check(Downloader.downloadFile(item.url, part, true, item.digest.substringAfter(':')) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { context.getString(R.string.user_apps_download_failed) }
if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error(context.getString(R.string.cmgr_checksum_mismatch)) }
val info = runCatching { packageInfo(context, part) }.getOrElse { part.delete(); throw it }
synchronized(lock) { part.renameTo(dest) }
@@ -2,6 +2,7 @@ package com.droiddeck.launcher.session
import android.content.Context
import android.util.Log
import com.droiddeck.launcher.core.DownloadSource
import com.droiddeck.launcher.core.FileUtils
import com.droiddeck.launcher.core.Hashes
import com.github.luben.zstd.ZstdInputStream
@@ -620,16 +621,27 @@ object EsyncPacks {
val label = context.getString(com.droiddeck.launcher.R.string.esync_fetching)
onProgress?.invoke(label, -1)
var reported = -1
val fetched = FileOutputStream(part).use { output ->
fetch(entry.asset.url, entry.asset.size, output) { done ->
val percent = (done * 100 / entry.asset.size).toInt().coerceIn(0, 100)
if (percent != reported) {
reported = percent
onProgress?.invoke(label, percent)
val sources = DownloadSource.candidates(entry.asset.url)
var fetched = false
for ((index, source) in sources.withIndex()) {
if (index > 0) Log.i(TAG, "retrying ${entry.asset.url} via $source")
reported = -1
fetched = FileOutputStream(part).use { output ->
fetch(source, entry.asset.size, output) { done ->
val percent = (done * 100 / entry.asset.size).toInt().coerceIn(0, 100)
if (percent != reported) {
reported = percent
onProgress?.invoke(label, percent)
}
}
}
if (fetched) {
DownloadSource.succeeded(source)
break
}
}
if (!fetched) {
DownloadSource.failed()
SessionEvents.record("sync.pack", mapOf("id" to entry.id, "source" to "download", "result" to "failed", "reason" to "download"))
return false
}
@@ -836,8 +848,17 @@ object EsyncPacks {
}
private fun fetchBytes(url: String, limit: Long): ByteArray? {
val out = ByteArrayOutputStream()
return if (fetch(url, limit, out, null)) out.toByteArray() else null
val sources = DownloadSource.candidates(url)
for ((index, source) in sources.withIndex()) {
if (index > 0) Log.i(TAG, "retrying $url via $source")
val out = ByteArrayOutputStream()
if (fetch(source, limit, out, null)) {
DownloadSource.succeeded(source)
return out.toByteArray()
}
}
DownloadSource.failed()
return null
}
private fun fetch(url: String, limit: Long, out: OutputStream, progress: ((Long) -> Unit)?): Boolean =
@@ -167,7 +167,7 @@ object ProtonExtras {
onProgress(downloading, 0)
var downloaded = false
for (attempt in 0 until 5) {
downloaded = Downloader.downloadFile(asset.url, archive, true) { fraction ->
downloaded = Downloader.downloadFile(asset.url, archive, true, asset.sha256) { fraction ->
onProgress(downloading, if (fraction < 0) -1 else (fraction * 100f).toInt().coerceIn(0, 100))
}
if (downloaded) break
@@ -192,7 +192,7 @@ object ProtonExtras {
val verified = when {
asset.sha256 != null -> asset.sha256.equals(Hashes.sha256(archive), ignoreCase = true)
asset.sha512 != null -> {
val expected = Downloader.downloadString(asset.sha512)?.let { Regex("(?i)\\b[0-9a-f]{128}\\b").find(it)?.value }
val expected = Downloader.downloadDirect(asset.sha512)?.let { Regex("(?i)\\b[0-9a-f]{128}\\b").find(it)?.value }
?: return context.getString(R.string.pextra_checksum_unreadable)
expected.equals(Hashes.sha512(archive), ignoreCase = true)
}
@@ -2,6 +2,7 @@ package com.droiddeck.launcher.session
import android.content.Context
import android.util.Log
import com.droiddeck.launcher.core.DownloadSource
import com.droiddeck.launcher.core.GameEnvironment
import com.droiddeck.launcher.input.ControllerPrefs
import com.droiddeck.launcher.runtime.LinuxRuntime
@@ -41,6 +42,7 @@ object SettingsReset {
context.getSharedPreferences("frame_gen", Context.MODE_PRIVATE).edit().clear().commit()
context.getSharedPreferences("steam_touch", Context.MODE_PRIVATE).edit()
.apply { STEAM_TOUCH_KEYS.forEach { remove(it) } }.commit()
DownloadSource.reset(context)
com.droiddeck.launcher.agent.AgentAccess.setCommandsEnabled(context, false)
if (gameProfiles) {