Enhance file restoration process by adding module parameter to restore method, improving backup validation, and ensuring correct file path resolution. Update related task actions for better clarity and functionality.

Author: efraespada

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/Extensions.kt

@@ -269,23 +269,37 @@ fun defaultConfig(): StringCareConfiguration =
         )
     }
 
+/**
+ * Copies a backup from [tempRoot] back under [projectPath].
+ *
+ * Backups are stored as `tempRoot/<module>/…` while [projectPath] is already the Gradle module directory,
+ * so the path segment after [tempRoot] must be `<module>/src/…` and resolves to `projectPath/src/…`,
+ * not `projectPath/<module>/src/…`.
+ */
 fun File.restore(
     projectPath: String,
     tempRoot: String,
+    module: String,
 ): File {
     val baseDir = File(tempRoot).canonicalFile
     val backupFile = this.canonicalFile
     val prefix = baseDir.absolutePath.let { if (it.endsWith(File.separator)) it else it + File.separator }
     require(backupFile.absolutePath.startsWith(prefix)) {
         "Backup ${backupFile.absolutePath} is not under temp root ${baseDir.absolutePath}"
     }
-    val relative = backupFile.absolutePath.substring(prefix.length)
+    var relative = backupFile.absolutePath.substring(prefix.length)
+    val modulePrefix = module + File.separator
+    require(relative.startsWith(modulePrefix)) {
+        "Backup relative path $relative does not start with module directory $modulePrefix"
+    }
+    relative = relative.substring(modulePrefix.length)
     val restore = File(projectPath, relative).normalize()
     withFileLock(restore) {
         if (restore.exists()) {
             restore.delete()
         }
-        File(restore.absolutePath).writeText(backupFile.getContent())
+        restore.parentFile?.mkdirs()
+        backupFile.copyTo(restore, overwrite = true)
     }
     return restore
 }

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/ParserFileOps.kt

@@ -67,4 +67,4 @@ internal fun restoreBackedUpFiles(
         .walkTopDown()
         .toList()
         .filter { file -> !file.isDirectory }
-        .map { file -> file.restore(projectPath, tempRoot) }
+        .map { file -> file.restore(projectPath, tempRoot, module) }

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/VariantApi.kt

@@ -107,6 +107,10 @@ fun Project.registerVariantObfuscationTasks(
             t.skip.set(provider { extension.skip })
         }
 
+        tasks.named("stringcareBeforeMergeAssets$variantCapitalized").configure {
+            it.mustRunAfter(tasks.named("stringcareBeforeMergeResources$variantCapitalized"))
+        }
+
         val mergeRes =
             "${AndroidTaskNames.MERGE}${variantCapitalized}${AndroidTaskNames.RESOURCES}"
         val beforeRes = "stringcareBeforeMergeResources$variantCapitalized"

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreStringsTask.kt

@@ -44,13 +44,12 @@ abstract class RestoreStringsTask : DefaultTask() {
     }
 
     @TaskAction
-    /** Restores backed up XML files and resets temp folder state. */
+    /** Restores backed up XML files from the shared temp root (cleared later by [RestoreAssetsTask]). */
     fun run() {
         if (skip.get()) return
         PrintUtils.print(moduleName.get(), restoreStringRes)
         val service = stringCareService.get()
         val tempRoot = service.getOrCreateTempFolder()
         restoreFilesUseCase.restoreResources(projectPath.get(), moduleName.get(), tempRoot)
-        service.resetTempFolder()
     }
 }