修复直传接收并优化文件选择提示
This commit is contained in:
@@ -5,6 +5,7 @@ import android.database.Cursor
|
||||
import android.net.Network
|
||||
import android.net.Uri
|
||||
import android.provider.OpenableColumns
|
||||
import android.util.Log
|
||||
import org.json.JSONObject
|
||||
import java.io.FileInputStream
|
||||
import java.net.DatagramPacket
|
||||
@@ -28,12 +29,16 @@ data class SelectedFile(
|
||||
)
|
||||
|
||||
object UploadClient {
|
||||
private const val TAG = "QftUpload"
|
||||
private const val DISCOVERY_PORT = 39392
|
||||
private const val CHUNK_SMALL = 4L * 1024L * 1024L
|
||||
private const val CHUNK_DEFAULT = 8L * 1024L * 1024L
|
||||
private const val CHUNK_LARGE = 16L * 1024L * 1024L
|
||||
private const val MAX_WORKERS = 8
|
||||
private const val STREAM_BUFFER = 1024 * 1024
|
||||
// A single request is materially more reliable for small files on Wi-Fi
|
||||
// Direct, and a 4 MiB parallel chunk gives no throughput benefit there.
|
||||
private const val PARALLEL_MIN_FILE_SIZE = 32L * 1024L * 1024L
|
||||
// QFT Direct can briefly reset a TCP flow while the Android network route
|
||||
// settles. Chunk PUTs and the init/finish control calls are safe to retry;
|
||||
// the Windows receiver treats a repeated chunk as an idempotent success.
|
||||
@@ -222,7 +227,7 @@ object UploadClient {
|
||||
file: SelectedFile,
|
||||
onProgress: (sent: Long, total: Long) -> Unit,
|
||||
) {
|
||||
if (pairing.version >= 2 && isSeekable(resolver, file)) {
|
||||
if (pairing.version >= 2 && file.size >= PARALLEL_MIN_FILE_SIZE && isSeekable(resolver, file)) {
|
||||
try {
|
||||
uploadParallel(resolver, network, baseUrl, pairing, deviceName, file, onProgress)
|
||||
return
|
||||
@@ -236,6 +241,7 @@ object UploadClient {
|
||||
if (!message.contains("HTTP 404") && !message.contains("HTTP 501")) throw e
|
||||
}
|
||||
}
|
||||
Log.i(TAG, "using single-stream upload: size=${file.size}, endpoint=$baseUrl")
|
||||
uploadLegacy(resolver, network, baseUrl, pairing, deviceName, file, onProgress)
|
||||
}
|
||||
|
||||
@@ -248,6 +254,11 @@ object UploadClient {
|
||||
return block()
|
||||
} catch (e: Throwable) {
|
||||
last = e
|
||||
Log.w(
|
||||
TAG,
|
||||
"$label: attempt=${attempt + 1}/$LOCAL_REQUEST_ATTEMPTS, ${failureSummary(e)}",
|
||||
e,
|
||||
)
|
||||
if (attempt + 1 < LOCAL_REQUEST_ATTEMPTS) {
|
||||
try { Thread.sleep(120L * (attempt + 1)) } catch (_: InterruptedException) {
|
||||
Thread.currentThread().interrupt()
|
||||
@@ -256,7 +267,23 @@ object UploadClient {
|
||||
}
|
||||
}
|
||||
}
|
||||
throw IllegalStateException("$label after $LOCAL_REQUEST_ATTEMPTS attempts", last)
|
||||
val failure = last ?: IllegalStateException("unknown local request failure")
|
||||
throw IllegalStateException(
|
||||
"$label,已重试 $LOCAL_REQUEST_ATTEMPTS 次:${failureSummary(failure)}",
|
||||
failure,
|
||||
)
|
||||
}
|
||||
|
||||
private fun failureSummary(error: Throwable): String {
|
||||
val chain = ArrayList<String>(3)
|
||||
var current: Throwable? = error
|
||||
while (current != null && chain.size < 3) {
|
||||
val type = current.javaClass.simpleName.ifBlank { current.javaClass.name }
|
||||
val detail = current.message?.replace(Regex("\\s+"), " ")?.take(240)
|
||||
chain += if (detail.isNullOrBlank()) type else "$type: $detail"
|
||||
current = current.cause
|
||||
}
|
||||
return chain.joinToString(" <- ")
|
||||
}
|
||||
|
||||
private fun uploadParallel(
|
||||
@@ -268,7 +295,9 @@ object UploadClient {
|
||||
file: SelectedFile,
|
||||
onProgress: (sent: Long, total: Long) -> Unit,
|
||||
) {
|
||||
Log.i(TAG, "parallel init: size=${file.size}, endpoint=$baseUrl")
|
||||
val init = initUpload(network, baseUrl, pairing, deviceName, file)
|
||||
Log.i(TAG, "parallel init complete: chunks=${init.totalChunks}, chunkSize=${init.chunkSize}")
|
||||
if (init.totalChunks == 0) {
|
||||
finishUpload(network, baseUrl, pairing, deviceName, init.uploadId)
|
||||
onProgress(0, 0)
|
||||
@@ -362,6 +391,7 @@ object UploadClient {
|
||||
uploadId: String, index: Int, channel: FileChannel, offset: Long, length: Long,
|
||||
buffer: ByteBuffer,
|
||||
) = retryLocalRequest("分块 $index 上传失败") {
|
||||
Log.d(TAG, "chunk start: index=$index, bytes=$length, endpoint=$baseUrl")
|
||||
val conn = open(network, URL("$baseUrl/qft/upload/chunk/$uploadId/$index"))
|
||||
try {
|
||||
conn.requestMethod = "POST"
|
||||
@@ -391,6 +421,7 @@ object UploadClient {
|
||||
error("分块 $index 上传失败 HTTP $code${message?.let { ": $it" } ?: ""}")
|
||||
}
|
||||
try { conn.inputStream.close() } catch (_: Exception) {}
|
||||
Log.d(TAG, "chunk complete: index=$index, bytes=$length")
|
||||
} finally {
|
||||
conn.disconnect()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user