mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
fix: games on an SD card install faster and Battle.net can read the card's volume (#2379)
A Battle.net library on another volume is reached through its own drive letter, so the Agent's volume query succeeds. The proot fast path keeps folder handles for FUSE-backed libraries. Supersedes #2377.
This commit is contained in:
1 parent
1d247d212b
commit
3b6d13a8d7
6 files changed
+883
-36
No files matched your search
@@ -232,11 +232,24 @@ object BattleNet {
|
||||
}
|
||||
|
||||
internal fun hostFolder(context: Context, path: String): File? {
|
||||
val drive = Regex("""^([CcZz]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null
|
||||
val drive = Regex("""^([A-Za-z]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null
|
||||
val relative = drive.groupValues[2].replace('\\', '/').trim('/')
|
||||
if (relative.isEmpty() || relative.split('/').any { it == ".." }) return null
|
||||
return if (drive.groupValues[1].equals("c", ignoreCase = true)) File(prefix(context), "pfx/drive_c/$relative")
|
||||
else com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "/$relative")
|
||||
val letter = drive.groupValues[1].lowercase()
|
||||
if (letter == "c") return File(prefix(context), "pfx/drive_c/$relative")
|
||||
val link = File(prefix(context), "pfx/dosdevices/$letter:").toPath()
|
||||
val mapped = runCatching { java.nio.file.Files.readSymbolicLink(link).toString() }.getOrNull()
|
||||
val target = when {
|
||||
mapped == null -> if (letter == "z") "/" else return null
|
||||
mapped.startsWith("/") -> mapped
|
||||
else -> {
|
||||
val rootfs = LinuxRuntime.rootDir(context).toPath().toAbsolutePath().normalize()
|
||||
val resolved = link.toAbsolutePath().parent.resolve(mapped).normalize()
|
||||
if (!resolved.startsWith(rootfs)) return null
|
||||
"/" + rootfs.relativize(resolved).joinToString("/")
|
||||
}
|
||||
}.trimEnd('/')
|
||||
return com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "$target/$relative")
|
||||
}
|
||||
|
||||
private val KEY = Regex("""^\[(.+)\](?:\s+\d+)?\s*$""")
|
||||
|
||||
Reference in new issue
Block a user