handle renaming zip entries properly

Raival-e · Raival-e · commit ab809766255d · 2025-07-27T00:52:49.000+04:00
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/CompressTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/CompressTask.kt
@@ -131,6 +131,7 @@ class CompressTask(
                     append(content.content.displayName)
                     append(" -> ")
                     append(content.status.name)
+                    append("\n")
                 }
             }
         }
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/CopyTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/CopyTask.kt
@@ -216,7 +216,8 @@ class CopyTask(
                 pendingFiles.forEach { content ->
                     append(content.content.displayName)
                     append(" -> ")
-                    appendLine(content.status.name)
+                    append(content.status.name)
+                    append("\n")
                 }
             }
         }
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/DeleteTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/DeleteTask.kt
@@ -152,6 +152,7 @@ class DeleteTask(
                     append(content.source.displayName)
                     append(" -> ")
                     append(content.status.name)
+                    append("\n")
                 }
             }
         }
diff --git a/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/RenameTask.kt b/app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/RenameTask.kt
@@ -10,11 +10,15 @@ import com.raival.compose.file.explorer.screen.main.tab.files.holder.LocalFileHo
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.ZipFileHolder
 import com.raival.compose.file.explorer.screen.main.tab.files.misc.FileMimeType.apkFileType
 import com.reandroid.archive.ZipAlign
-import net.lingala.zip4j.ZipFile
 import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
 
 class RenameTask(val sourceContent: List<ContentHolder>) : Task() {
     private var parameters: RenameTaskParameters? = null
@@ -111,6 +115,54 @@ class RenameTask(val sourceContent: List<ContentHolder>) : Task() {
             processName = globalClass.getString(R.string.renaming)
         }
 
+        // Check if we're dealing with zip files and handle them separately
+        val firstPendingItem = pendingContent.firstOrNull { it.status == TaskContentStatus.PENDING }
+        if (firstPendingItem?.source is ZipFileHolder) {
+            try {
+                handleZipFileRenaming()
+            } catch (e: Exception) {
+                logger.logError(e)
+                markAsFailed(
+                    globalClass.resources.getString(
+                        R.string.task_summary_failed,
+                        e.message ?: emptyString
+                    )
+                )
+                return
+            }
+        } else {
+            // Handle local files
+            handleLocalFileRenaming()
+        }
+
+        if (progressMonitor.status == TaskStatus.RUNNING) {
+            val sample = sourceContent.first()
+            if (sample is ZipFileHolder) {
+                if (sample.zipTree.source.extension == apkFileType) {
+                    progressMonitor.apply {
+                        processName = globalClass.resources.getString(R.string.aligning_apk)
+                        progress = -1f
+                        contentName = emptyString
+                    }
+                    ZipAlign.alignApk(sample.zipTree.source.file)
+                }
+            }
+        }
+
+        if (progressMonitor.status == TaskStatus.RUNNING) {
+            progressMonitor.status = TaskStatus.SUCCESS
+            progressMonitor.summary = buildString {
+                pendingContent.forEach { content ->
+                    append(content.source.displayName)
+                    append(" -> ")
+                    append(content.status.name)
+                    append("\n")
+                }
+            }
+        }
+    }
+
+    private suspend fun handleLocalFileRenaming() {
         pendingContent.forEachIndexed { index, itemToRename ->
             if (aborted) {
                 progressMonitor.status = TaskStatus.PAUSED
@@ -127,13 +179,8 @@ class RenameTask(val sourceContent: List<ContentHolder>) : Task() {
                 try {
                     if (itemToRename.source is LocalFileHolder) {
                         itemToRename.source.file.renameTo(File(itemToRename.newPath))
-                    } else if (itemToRename.source is ZipFileHolder) {
-                        ZipFile(itemToRename.source.zipTree.source.file).renameFile(
-                            itemToRename.source.uniquePath + if (itemToRename.source.isFolder) "/" else emptyString,
-                            itemToRename.newPath
-                        )
+                        itemToRename.status = TaskContentStatus.SUCCESS
                     }
-                    itemToRename.status = TaskContentStatus.SUCCESS
                 } catch (e: Exception) {
                     logger.logError(e)
                     markAsFailed(
@@ -146,30 +193,140 @@ class RenameTask(val sourceContent: List<ContentHolder>) : Task() {
                 }
             }
         }
+    }
 
-        if (progressMonitor.status == TaskStatus.RUNNING) {
-            val sample = sourceContent.first()
-            if (sample is ZipFileHolder) {
-                if (sample.zipTree.source.extension == apkFileType) {
-                    progressMonitor.apply {
-                        processName = globalClass.resources.getString(R.string.aligning_apk)
-                        progress = -1f
-                        contentName = emptyString
+    private suspend fun handleZipFileRenaming() {
+        val zipFileHolder = pendingContent.first().source as ZipFileHolder
+        val sourceZipFile = zipFileHolder.zipTree.source.file
+        val tempFile = File(sourceZipFile.parent, "${sourceZipFile.nameWithoutExtension}_temp.zip")
+
+        try {
+            // Create a map of old paths to new paths for all items to rename
+            val renameMap = mutableMapOf<String, String>()
+            val foldersToRename = mutableSetOf<String>()
+
+            pendingContent.filter { it.status == TaskContentStatus.PENDING }.forEach { item ->
+                val zipHolder = item.source as ZipFileHolder
+                val oldPath = zipHolder.uniquePath
+                val newPath = item.newPath
+
+                if (zipHolder.isFolder) {
+                    foldersToRename.add(oldPath)
+                }
+
+                renameMap[oldPath] = newPath
+            }
+
+            // Open the source zip file for reading
+            ZipFile(sourceZipFile).use { sourceZip ->
+                // Create a new zip file
+                ZipOutputStream(FileOutputStream(tempFile)).use { zipOut ->
+
+                    val entries = sourceZip.entries().toList()
+                    var processedCount = 0
+
+                    entries.forEach { entry ->
+                        if (aborted) {
+                            progressMonitor.status = TaskStatus.PAUSED
+                            return
+                        }
+
+                        val entryName = entry.name.removeSuffix("/")
+                        var newEntryName = entryName
+                        var shouldRename = false
+
+                        // Check direct rename
+                        if (renameMap.containsKey(entryName)) {
+                            newEntryName = renameMap[entryName]!!
+                            shouldRename = true
+                        } else {
+                            // Check if this entry is inside a folder being renamed
+                            for (folderPath in foldersToRename) {
+                                if (entryName.startsWith("$folderPath/")) {
+                                    val relativePath = entryName.substring(folderPath.length + 1)
+                                    newEntryName = "${renameMap[folderPath]}/$relativePath"
+                                    shouldRename = true
+                                    break
+                                }
+                            }
+                        }
+
+                        // Restore trailing slash for directories
+                        if (entry.isDirectory) {
+                            newEntryName += "/"
+                        }
+
+                        // Create new entry with the new name
+                        val newEntry = ZipEntry(newEntryName).apply {
+                            time = entry.time
+                            if (!entry.isDirectory) {
+                                method = entry.method
+                                if (entry.method == ZipEntry.STORED) {
+                                    size = entry.size
+                                    crc = entry.crc
+                                }
+                            }
+                        }
+
+                        zipOut.putNextEntry(newEntry)
+
+                        // Copy entry data if it's not a directory
+                        if (!entry.isDirectory) {
+                            sourceZip.getInputStream(entry).use { inputStream ->
+                                inputStream.copyTo(zipOut)
+                            }
+                        }
+
+                        zipOut.closeEntry()
+
+                        // Update progress
+                        processedCount++
+                        progressMonitor.apply {
+                            contentName = entry.name
+                            progress = processedCount.toFloat() / entries.size
+                        }
+
+                        // Mark corresponding pending items as successful
+                        if (shouldRename) {
+                            pendingContent.find {
+                                (it.source as ZipFileHolder).uniquePath == entryName
+                            }?.status = TaskContentStatus.SUCCESS
+                        }
                     }
-                    ZipAlign.alignApk(sample.zipTree.source.file)
                 }
             }
-        }
 
-        if (progressMonitor.status == TaskStatus.RUNNING) {
-            progressMonitor.status = TaskStatus.SUCCESS
-            progressMonitor.summary = buildString {
-                pendingContent.forEach { content ->
-                    append(content.source.displayName)
-                    append(" -> ")
-                    append(content.status.name)
+            // Replace the original file with the new one
+            if (sourceZipFile.delete()) {
+                if (!tempFile.renameTo(sourceZipFile)) {
+                    throw IOException(globalClass.getString(R.string.failed_to_replace_original_zip_file))
                 }
+            } else {
+                throw IOException(globalClass.getString(R.string.failed_to_delete_original_zip_file))
+            }
+
+            // Mark any remaining pending items as successful (for folders without zip entries)
+            pendingContent.filter { it.status == TaskContentStatus.PENDING }.forEach { item ->
+                val zipHolder = item.source as ZipFileHolder
+                if (zipHolder.isFolder) {
+                    // Check if this folder has any children that were successfully renamed
+                    val hasRenamedChildren = pendingContent.any { other ->
+                        other.status == TaskContentStatus.SUCCESS &&
+                                (other.source as ZipFileHolder).uniquePath.startsWith("${zipHolder.uniquePath}/")
+                    }
+
+                    if (hasRenamedChildren) {
+                        item.status = TaskContentStatus.SUCCESS
+                    }
+                }
+            }
+
+        } catch (e: Exception) {
+            // Clean up temp file if it exists
+            if (tempFile.exists()) {
+                tempFile.delete()
             }
+            throw e
         }
     }
 
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
@@ -372,4 +372,6 @@
     <string name="aligning_apk">در حال هم‌ترازی فایل APK</string>
     <string name="invalid_apk_file">فایل APK نامعتبر</string>
     <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">برخی از فایل‌ها به زیرشاخه‌های خود منتقل می‌شوند، آنها مستثنی خواهند شد.</string>
+    <string name="failed_to_replace_original_zip_file">ناموفق در جایگزینی فایل zip اصلی</string>
+    <string name="failed_to_delete_original_zip_file">ناموفق در حذف فایل zip اصلی</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -372,4 +372,6 @@
     <string name="aligning_apk">Alinhando o arquivo APK</string>
     <string name="invalid_apk_file">Arquivo APK inválido</string>
     <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">Alguns arquivos são movidos para seus subdiretórios, eles serão excluídos.</string>
+    <string name="failed_to_replace_original_zip_file">Falha ao substituir o arquivo zip original</string>
+    <string name="failed_to_delete_original_zip_file">Falha ao excluir o arquivo zip original</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -372,4 +372,6 @@
     <string name="aligning_apk">Выравнивание файла APK</string>
     <string name="invalid_apk_file">Неверный файл APK</string>
     <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">Некоторые файлы перемещены в их подкаталоги, они будут исключены.</string>
+    <string name="failed_to_replace_original_zip_file">Не удалось заменить исходный zip-файл</string>
+    <string name="failed_to_delete_original_zip_file">Не удалось удалить исходный zip-файл</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -372,4 +372,6 @@
     <string name="aligning_apk">对齐APK文件</string>
     <string name="invalid_apk_file">无效的APK文件</string>
     <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">一些文件被移动到它们的子目录中，这些文件将被排除。</string>
+    <string name="failed_to_replace_original_zip_file">替换原始zip文件失败</string>
+    <string name="failed_to_delete_original_zip_file">删除原始zip文件失败</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -373,4 +373,6 @@
     <string name="aligning_apk">Aligning APK file</string>
     <string name="invalid_apk_file">Invalid APK</string>
     <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">Some files are moved into their subdirectories, those will be excluded.</string>
+    <string name="failed_to_replace_original_zip_file">Failed to replace original zip file</string>
+    <string name="failed_to_delete_original_zip_file">Failed to delete original zip file</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ class CompressTask(`
`131`	`131`	`append(content.content.displayName)`
`132`	`132`	`append(" -> ")`
`133`	`133`	`append(content.status.name)`
	`134`	`+ append("\n")`
`134`	`135`	`}`
`135`	`136`	`}`
`136`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,8 @@ class CopyTask(`
`216`	`216`	`pendingFiles.forEach { content ->`
`217`	`217`	`append(content.content.displayName)`
`218`	`218`	`append(" -> ")`
`219`		`- appendLine(content.status.name)`
	`219`	`+ append(content.status.name)`
	`220`	`+ append("\n")`
`220`	`221`	`}`
`221`	`222`	`}`
`222`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ class DeleteTask(`
`152`	`152`	`append(content.source.displayName)`
`153`	`153`	`append(" -> ")`
`154`	`154`	`append(content.status.name)`
	`155`	`+ append("\n")`
`155`	`156`	`}`
`156`	`157`	`}`
`157`	`158`	`}`