release: v1.12

fix: HEAD /backup/config 响应 Content-Length 为 0，restic 以为 config 空文件
fix: 添加 RemoteTransport.fileSize() 方法，HEAD 返回实际文件大小
feat: SmbTransport/WebdavTransport 实现 fileSize

app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId "com.example.androidbackupgui"
         minSdk 24
         targetSdk 34
-        versionCode 11
-        versionName "1.10"
+        versionCode 13
+        versionName "1.12"
     }
     buildFeatures {
         viewBinding true

app/src/main/java/com/example/androidbackupgui/backup/RemoteTransport.kt

@@ -42,6 +42,8 @@ interface RemoteTransport {
 
     suspend fun delete(remotePath: String): AppResult<Unit>
     suspend fun exists(remotePath: String): AppResult<Boolean>
+    /** Get the size of a remote file in bytes. Returns [AppResult.Failure] if not found. */
+    suspend fun fileSize(remotePath: String): AppResult<Long>
 
     companion object {
 

app/src/main/java/com/example/androidbackupgui/backup/RestBridgeRunner.kt

@@ -65,7 +65,7 @@ class RestBridgeRunner {
         val transport = cachedTransport!!
 
         val remoteBase = buildRemoteBase(backend, backendUrl, backendShare, repoPath)
-        val bridge = ResticRestBridge(transport, remoteBase, cacheDir)
+        val bridge = ResticRestBridge(transport, remoteBase, repoPath, cacheDir)
 
         try {
             bridge.start(0)

app/src/main/java/com/example/androidbackupgui/backup/ResticRestBridge.kt

@@ -4,9 +4,9 @@ import android.util.Log
 import fi.iki.elonen.NanoHTTPD
 import fi.iki.elonen.NanoHTTPD.IHTTPSession
 import kotlinx.coroutines.runBlocking
+import java.io.ByteArrayInputStream
 import java.io.File
 import java.util.UUID
-
 /**
  * NanoHTTPD-based REST bridge implementing the restic REST backend API.
  *
@@ -14,10 +14,15 @@ import java.util.UUID
  * can read/write blobs directly to SMB/WebDAV without a local staging repo.
  *
  * Port is auto-assigned (0); use [listeningPort] after start().
+ *
+ * @param repoPath repository path from the bridge URL (e.g. "backup").
+ *                 Stripped from incoming URIs so that the remoteBase SMB path
+ *                 does not get double-nested with the repo prefix.
  */
 class ResticRestBridge(
     private val transport: RemoteTransport,
     private val remoteBase: String,
+    private val repoPath: String,
     private val cacheDir: File
 ) : NanoHTTPD(0) {
 
@@ -56,6 +61,14 @@ class ResticRestBridge(
         session: IHTTPSession
     ): Response {
         val path = uri.trimEnd('/')
+        // Strip the repoPath prefix (/backup/...) from the URI so that type/name
+        // parsing sees only the restic REST API segment.
+        val stripPrefix = if (repoPath.isNotEmpty()) "/${repoPath.trim('/')}" else ""
+        val strippedPath = if (stripPrefix.isNotEmpty() && path.startsWith(stripPrefix)) {
+            path.removePrefix(stripPrefix).ifEmpty { "/" }
+        } else {
+            path
+        }
 
         // POST {path}?create=true -> mkdirs
         if (method == NanoHTTPD.Method.POST && params["create"] == "true") {
@@ -71,7 +84,7 @@ class ResticRestBridge(
             }
         }
 
-        val segments = path.split("/").filter { it.isNotEmpty() }
+        val segments = strippedPath.split("/").filter { it.isNotEmpty() }
 
         if (segments.isEmpty()) {
             return newFixedLengthResponse(Response.Status.NOT_FOUND, "text/plain", "Invalid path")
@@ -156,10 +169,15 @@ class ResticRestBridge(
         val remotePath = "$remoteBase/config"
         when (method) {
             NanoHTTPD.Method.HEAD -> {
-                when (val result = transport.exists(remotePath)) {
+                when (val exists = transport.exists(remotePath)) {
                     is AppResult.Success -> {
-                        if (result.data) {
-                            newFixedLengthResponse(Response.Status.OK, "application/octet-stream", "")
+                        if (exists.data) {
+                            val sizeResult = transport.fileSize(remotePath)
+                            val fileSize = if (sizeResult is AppResult.Success) sizeResult.data else 0L
+                            newFixedLengthResponse(
+                                Response.Status.OK, "application/octet-stream",
+                                ByteArrayInputStream(ByteArray(0)), fileSize
+                            )
                         } else {
                             newFixedLengthResponse(Response.Status.NOT_FOUND, "text/plain", "")
                         }

app/src/main/java/com/example/androidbackupgui/backup/SmbTransport.kt

@@ -253,4 +253,17 @@ class SmbTransport(
                 err(AppError.Remote("SMB 检查失败", "exists", cause = e))
             }
         }
+
+    override suspend fun fileSize(remotePath: String): AppResult<Long> =
+        withContext(Dispatchers.IO) {
+            try {
+                val file = smbFile(remotePath)
+                if (!file.exists()) return@withContext err(AppError.Remote("文件不存在", "fileSize"))
+                AppResult.Success(file.length())
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                err(AppError.Remote("SMB 获取文件大小失败", "fileSize", cause = e))
+            }
+        }
 }

app/src/main/java/com/example/androidbackupgui/backup/WebdavTransport.kt

@@ -180,4 +180,19 @@ class WebdavTransport(
                 err(AppError.Remote("WebDAV 检查失败", "exists", cause = e))
             }
         }
+
+    override suspend fun fileSize(remotePath: String): AppResult<Long> =
+        withContext(Dispatchers.IO) {
+            try {
+                val url = buildUrl(remotePath)
+                if (!sardine.exists(url)) return@withContext err(AppError.Remote("文件不存在", "fileSize"))
+                val resources = sardine.list(url)
+                val size = resources.firstOrNull()?.contentLength ?: 0L
+                AppResult.Success(size)
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                err(AppError.Remote("WebDAV 获取文件大小失败", "fileSize", cause = e))
+            }
+        }
 }