BUG:目前AppsRepo.kt 代码实现正确，但构建仍然失败。问题在于 KAPT 仍然无法处理这个类。待修复

Fastace · Fastace · commit aef90909bdbe · 2025-12-08T13:54:08.000+08:00
diff --git a/source/core/data/src/main/kotlin/com/xayah/core/data/repository/AppsRepo.kt b/source/core/data/src/main/kotlin/com/xayah/core/data/repository/AppsRepo.kt
@@ -2,6 +2,7 @@ package com.xayah.core.data.repository
 
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import android.content.pm.ApplicationInfo
 import android.content.pm.LauncherApps
 import android.content.pm.PackageManager
@@ -83,6 +84,9 @@ class AppsRepo @Inject constructor(
     private val pathUtil: PathUtil,
     private val cloudRepo: CloudRepository
 ) {
+    companion object {
+        private const val TAG = "AppsRepo"
+    }
     // 内部创建 ResticRepository 实例
     private val resticRepo: ResticRepository by lazy {
         val logger = ResticLogger(Dispatchers.IO)
@@ -782,6 +786,28 @@ class AppsRepo @Inject constructor(
         }
     }.withLog()
 
+    // 在 AppsRepo 中添加快照详情加载方法
+    suspend fun loadSnapshotDetail(packageEntity: PackageEntity): ResticSnapshot? {
+        return packageEntity.resticSnapshotIds.firstOrNull()?.let { snapshotId ->
+            packageEntity.resticRepoPath?.let { repoPath ->
+                val password = context.readResticPassword()
+                if (password.isNullOrEmpty()) {
+                    Log.e(TAG, "Restic password is null or empty")
+                    return@let null
+                }
+
+                val snapshots = resticRepo.listSnapshots(repoPath, password)
+                snapshots.find { it.id == snapshotId }
+            }
+        }
+    }
+
+    // 添加应用更新方法（如果 DetailsViewModel 需要）
+    suspend fun refreshAppMetadata(app: PackageEntity) {
+        updateApp(app, app.userId)
+        calculateLocalAppSize(app)
+    }
+
     suspend fun calculateLocalAppSize(app: PackageEntity) {
         app.displayStats.apkBytes = calculateLocalAppDataSize(app, DataType.PACKAGE_APK)
         app.displayStats.userBytes = calculateLocalAppDataSize(app, DataType.PACKAGE_USER)
diff --git a/source/core/data/src/main/kotlin/com/xayah/core/data/repository/FilesRepo.kt b/source/core/data/src/main/kotlin/com/xayah/core/data/repository/FilesRepo.kt
@@ -1,6 +1,7 @@
 package com.xayah.core.data.repository
 
 import android.content.Context
+import android.util.Log
 import com.xayah.core.network.client.S3ClientImpl
 import com.xayah.core.database.dao.MediaDao
 import com.xayah.core.datastore.ConstantUtil
@@ -50,6 +51,9 @@ class FilesRepo @Inject constructor(
     private val rootService: RemoteRootService,
     private val cloudRepo: CloudRepository
 ) {
+    companion object {
+        private const val TAG = "FilesRepo"
+    }
         // 内部创建 ResticRepository 实例
         private val resticRepo: ResticRepository by lazy {
             val logger = ResticLogger(Dispatchers.IO)
@@ -370,6 +374,21 @@ class FilesRepo @Inject constructor(
         }
     }.withLog()
 
+    suspend fun loadSnapshotDetail(mediaEntity: MediaEntity): ResticSnapshot? {
+        return mediaEntity.extraInfo.resticSnapshotId?.let { snapshotId ->
+            mediaEntity.extraInfo.resticRepoPath?.let { repoPath ->
+                val password = context.readResticPassword()
+                if (password.isNullOrEmpty()) {
+                    Log.e(TAG, "Restic password is null or empty")
+                    return@let null
+                }
+
+                val snapshots = resticRepo.listSnapshots(repoPath, password)
+                snapshots.find { it.id == snapshotId }
+            }
+        }
+    }
+
     private fun renameDuplicateFile(name: String): String {
         val nameList = name.split("_").toMutableList()
         val index = nameList.first().toIntOrNull()
diff --git a/source/feature/main/details/src/main/kotlin/com/xayah/feature/main/details/DetailsViewModel.kt b/source/feature/main/details/src/main/kotlin/com/xayah/feature/main/details/DetailsViewModel.kt
@@ -2,11 +2,13 @@ package com.xayah.feature.main.details
 
 import android.content.Context
 import android.content.pm.PackageManager
-import android.widget.Toast
 import android.util.Log
+import android.widget.Toast
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+// ⭐ 修正：保留所需的 Repository 和工具类
+import com.xayah.core.data.R // 假设资源 R.string.failed 在此模块
 import com.xayah.core.data.repository.AppsRepo
 import com.xayah.core.data.repository.FilesRepo
 import com.xayah.core.data.repository.LabelsRepo
@@ -19,19 +21,13 @@ import com.xayah.core.model.database.LabelFileCrossRefEntity
 import com.xayah.core.model.database.MediaEntity
 import com.xayah.core.model.database.PackageDataStates
 import com.xayah.core.model.database.PackageEntity
+import com.xayah.core.restic.ResticSnapshot
 import com.xayah.core.rootservice.service.RemoteRootService
 import com.xayah.core.ui.route.MainRoutes
 import com.xayah.core.util.decodeURL
 import com.xayah.core.util.LogUtil
-import com.xayah.core.util.module.combine
 import com.xayah.core.util.launchOnDefault
 import com.xayah.core.util.withMainContext
-import com.xayah.core.restic.ResticRepository
-import com.xayah.core.restic.ResticSnapshot
-import com.xayah.core.datastore.readResticPassword
-import com.xayah.feature.main.details.DetailsUiState.Error
-import com.xayah.feature.main.details.DetailsUiState.Loading
-import com.xayah.feature.main.details.DetailsUiState.Success
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -51,15 +47,12 @@ class DetailsViewModel @Inject constructor(
     private val rootService: RemoteRootService,
     private val appsRepo: AppsRepo,
     private val filesRepo: FilesRepo,
-    private val labelsRepo: LabelsRepo,
-    private val resticRepo: ResticRepository,
+    private val labelsRepo: LabelsRepo
 ) : ViewModel() {
     private val id: Long = savedStateHandle.get<String>(MainRoutes.ARG_ID)?.toLongOrNull() ?: 0L
     private val target: Target = Target.valueOf(savedStateHandle.get<String>(MainRoutes.ARG_TARGET)!!.decodeURL().trim())
     private val isRefreshing: MutableStateFlow<Boolean> = MutableStateFlow(false)
-    // 添加 isProtecting 状态
     private val isProtecting: MutableStateFlow<Boolean> = MutableStateFlow(false)
-    // 添加 protectProgress 状态
     private val protectProgress: MutableStateFlow<String?> = MutableStateFlow(null)
 
     companion object {
@@ -78,7 +71,7 @@ class DetailsViewModel @Inject constructor(
                 appsRepo.getApp(id),
                 isRefreshing,
                 isProtecting,
-                protectProgress,  // 添加这个
+                protectProgress,
                 labelsRepo.getLabelsFlow(),
                 labelsRepo.getAppRefsFlow()
             ) { app, isRefreshing, isProtecting, protectProgress, labels, refs ->
@@ -87,7 +80,7 @@ class DetailsViewModel @Inject constructor(
                         uuid = UUID.randomUUID(),
                         isRefreshing = isRefreshing,
                         isProtecting = isProtecting,
-                        protectProgress = protectProgress,  // 添加这个
+                        protectProgress = protectProgress,
                         labels = labels,
                         app = app,
                         refs = refs.filter { ref ->
@@ -108,7 +101,7 @@ class DetailsViewModel @Inject constructor(
                 filesRepo.getFile(id),
                 isRefreshing,
                 isProtecting,
-                protectProgress,  // 添加这个
+                protectProgress,
                 labelsRepo.getLabelsFlow(),
                 labelsRepo.getFileRefsFlow()
             ) { file, isRefreshing, isProtecting, protectProgress, labels, refs ->
@@ -117,7 +110,7 @@ class DetailsViewModel @Inject constructor(
                         uuid = UUID.randomUUID(),
                         isRefreshing = isRefreshing,
                         isProtecting = isProtecting,
-                        protectProgress = protectProgress,  // 添加这个
+                        protectProgress = protectProgress,
                         labels = labels,
                         file = file,
                         refs = refs.filter { ref ->
@@ -287,7 +280,7 @@ class DetailsViewModel @Inject constructor(
 
     fun protect() {
         viewModelScope.launchOnDefault {
-            log { "protect() started" }  // 1. 方法开始
+            log { "protect() started" }
             isProtecting.emit(true)
             protectProgress.emit(null)
             try {
@@ -312,26 +305,26 @@ class DetailsViewModel @Inject constructor(
                     else -> {
                         val state = uiState.value.castTo<Success.File>()
                         val file = state.file
-                        log { "Protecting file: ${file.name}, cloud: ${file.indexInfo.cloud}" }  // 3. File 分支开始
-                        log { "Calling filesRepo.protectFile with progress callback" }  // 4. 调用前
+                        log { "Protecting file: ${file.name}, cloud: ${file.indexInfo.cloud}" }
+                        log { "Calling filesRepo.protectFile with progress callback" }
 
                         filesRepo.protectFile(file.indexInfo.cloud, file) { currentPart, totalParts, currentFile, totalFiles ->
-                            log { "Progress callback received in ViewModel: Part $currentPart/$totalParts, File $currentFile/$totalFiles" }  // 5. 回调被触发
+                            log { "Progress callback received in ViewModel: Part $currentPart/$totalParts, File $currentFile/$totalFiles" }
                             viewModelScope.launch {
                                 protectProgress.emit("$currentPart/$totalParts")
-                                log { "protectProgress updated to: $currentPart/$totalParts" }  // 6. 状态更新后
+                                log { "protectProgress updated to: $currentPart/$totalParts" }
                             }
                         }
-                        log { "filesRepo.protectFile completed" }  // 7. 调用完成
+                        log { "filesRepo.protectFile completed" }
                     }
                 }
             } catch (e: Exception) {
-                log { "protect() failed with exception: ${e.message}" }  // 8. 异常捕获
+                log { "protect() failed with exception: ${e.message}" }
             } finally {
-                log { "protect() finally block - cleaning up" }  // 9. 清理前
+                log { "protect() finally block - cleaning up" }
                 isProtecting.emit(false)
                 protectProgress.emit(null)
-                log { "protect() completed" }  // 10. 方法结束
+                log { "protect() completed" }
             }
         }
     }
@@ -340,27 +333,25 @@ class DetailsViewModel @Inject constructor(
     private val _snapshotDetailState = MutableStateFlow<ResticSnapshot?>(null)
     val snapshotDetailState: StateFlow<ResticSnapshot?> = _snapshotDetailState.asStateFlow()
 
-    // 获取快照详情
-    fun loadSnapshotDetail(packageEntity: PackageEntity) {
+    // 获取快照详情 - 使用扩展的 Repository 方法
+    // 修改快照详情加载方法
+    fun loadSnapshotDetail(entity: Any) {
         viewModelScope.launch {
-            packageEntity.resticSnapshotId?.let { snapshotId ->
-                packageEntity.resticRepoPath?.let { repoPath ->
-                    val password = context.readResticPassword()
-                    // 检查密码是否为空
-                    if (password.isNullOrEmpty()) {
-                        Log.e(TAG, "Restic password is null or empty")
-                        return@launch
+            when (entity) {
+                is PackageEntity -> {
+                    appsRepo.loadSnapshotDetail(entity)?.let { snapshot ->
+                        _snapshotDetailState.value = snapshot
+                    }
+                }
+                is MediaEntity -> {
+                    filesRepo.loadSnapshotDetail(entity)?.let { snapshot ->
+                        _snapshotDetailState.value = snapshot
                     }
-
-                    val snapshots = resticRepo.listSnapshots(repoPath, password)
-                    val snapshot = snapshots.find { it.id == snapshotId }
-                    _snapshotDetailState.value = snapshot
                 }
             }
         }
     }
 
-    // 修复：将 delete() 方法移到类内部
     fun delete() {
         viewModelScope.launchOnDefault {
             when (uiState.value) {
@@ -400,14 +391,14 @@ sealed interface DetailsUiState {
         open val uuid: UUID,
         open val isRefreshing: Boolean,
         open val isProtecting: Boolean,
-        open val protectProgress: String?,  // 添加这个字段
+        open val protectProgress: String?,
         open val labels: List<LabelEntity>,
     ) : DetailsUiState {
         data class App(
             override val uuid: UUID,
             override val isRefreshing: Boolean,
             override val isProtecting: Boolean,
-            override val protectProgress: String?,  // 添加这个字段
+            override val protectProgress: String?,
             override val labels: List<LabelEntity>,
             val app: PackageEntity,
             val refs: List<LabelAppCrossRefEntity>,
@@ -417,7 +408,7 @@ sealed interface DetailsUiState {
             override val uuid: UUID,
             override val isRefreshing: Boolean,
             override val isProtecting: Boolean,
-            override val protectProgress: String?,  // 添加这个字段
+            override val protectProgress: String?,
             override val labels: List<LabelEntity>,
             val file: MediaEntity,
             val refs: List<LabelFileCrossRefEntity>,
diff --git a/source/feature/main/restore/src/main/kotlin/com/xayah/feature/main/restore/IndexViewModel.kt b/source/feature/main/restore/src/main/kotlin/com/xayah/feature/main/restore/IndexViewModel.kt
@@ -25,6 +25,13 @@ import com.xayah.core.util.encodeURL
 import com.xayah.core.util.encodedURLWithSpace
 import com.xayah.core.util.localBackupSaveDir
 import com.xayah.core.util.navigateSingle
+import com.xayah.core.data.repository.AppsRepo
+import com.xayah.core.data.repository.FilesRepo
+import com.xayah.core.database.dao.PackageDao
+import com.xayah.core.service.rootservice.service.RemoteRootService
+import com.xayah.core.data.repository.SettingsDataRepo
+import com.xayah.core.util.PathUtil
+import kotlinx.coroutines.Dispatchers
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
@@ -58,7 +65,11 @@ class IndexViewModel @Inject constructor(
     private val pkgRepo: PackageRepository,
     private val mediaRepo: MediaRepository,
     private val cloudRepo: CloudRepository,
-    private val appsRepo: AppsRepo,
+    private val appsDao: PackageDao,
+    private val packageRepo: PackageRepository,
+    private val rootService: RemoteRootService,
+    private val settingsDataRepo: SettingsDataRepo,
+    private val pathUtil: PathUtil,
 ) : BaseViewModel<IndexUiState, IndexUiIntent, IndexUiEffect>(
     IndexUiState(
         storageIndex = 0,
@@ -70,6 +81,19 @@ class IndexViewModel @Inject constructor(
         mediumSize = "",
     )
 ) {
+    private val appsRepo: AppsRepo by lazy {
+        AppsRepo(
+            context = context,
+            defaultDispatcher = Dispatchers.IO,
+            appsDao = appsDao,
+            packageRepo = packageRepo,
+            rootService = rootService,
+            settingsDataRepo = settingsDataRepo,
+            pathUtil = pathUtil,
+            cloudRepo = cloudRepo
+        )
+    }
+
     override suspend fun onEvent(state: IndexUiState, intent: IndexUiIntent) {
         when (intent) {
             is IndexUiIntent.UpdateApps -> {
