wip: compressing .7z & .tar.gz

Author: fatihergin

app/build.gradle.kts

@@ -94,6 +94,7 @@ dependencies {
     implementation(libs.androidx.swiperefreshlayout)
     implementation(libs.androidpdfviewer)
     implementation(libs.apache.commons.compress)
+    implementation(libs.tukaanixz)
     implementation(libs.roottools)
     implementation(libs.rootshell)
     implementation(libs.gestureviews)

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt

@@ -485,7 +485,7 @@ class ItemsAdapter(
                     activity.toast(R.string.compressing)
                     val paths = getSelectedFileDirItems().map { it.path }
                     ensureBackgroundThread {
-                        if (CompressionHelper.compressPaths(activity, paths, destination, compressionFormat, password)) {
+                        if (CompressionHelper.compress(activity, paths, destination, compressionFormat, password)) {
                             activity.runOnUiThread {
                                 activity.toast(R.string.compression_successful)
                                 listener?.refreshFragment()

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/CompressionFormat.kt

@@ -1,12 +1,12 @@
 package com.simplemobiletools.filemanager.pro.helpers
 
-enum class CompressionFormat(val extension: String) {
-    ZIP(".zip"),
-    SEVEN_ZIP(".7z"),
-    TAR_DEFLATE(".tar.deflate"),
-    TAR_GZ(".tar.gz"),
-    TAR_SZ(".tar.sz"),
-    TAR_XZ(".tar.xz");
+enum class CompressionFormat(val extension: String, val canReadEncryptedArchive: Boolean, val canCreateEncryptedArchive: Boolean) {
+    ZIP(".zip", true, true),
+    SEVEN_ZIP(".7z", true, false),
+    TAR_DEFLATE(".tar.deflate", false, false),
+    TAR_GZ(".tar.gz", false, false),
+    TAR_SZ(".tar.sz", false, false),
+    TAR_XZ(".tar.xz", false, false);
 
     companion object {
         fun fromExtension(extension: String): CompressionFormat {

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/CompressionHelper.kt

@@ -5,14 +5,24 @@ import com.simplemobiletools.commons.extensions.*
 import net.lingala.zip4j.io.outputstream.ZipOutputStream
 import net.lingala.zip4j.model.ZipParameters
 import net.lingala.zip4j.model.enums.EncryptionMethod
+import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
+import org.apache.commons.compress.utils.IOUtils
 import java.io.Closeable
 import java.io.File
+import java.io.FileInputStream
+import java.io.IOException
+import java.nio.file.Files
+import java.nio.file.Path
 import java.util.LinkedList
 
+
 class CompressionHelper {
 
     companion object {
-        fun compressPaths(
+        fun compress(
             activity: BaseSimpleActivity,
             sourcePaths: List<String>,
             targetPath: String,
@@ -21,7 +31,7 @@ class CompressionHelper {
         ): Boolean {
             return when (compressionFormat) {
                 CompressionFormat.ZIP -> compressToZip(activity, sourcePaths, targetPath, password)
-                CompressionFormat.SEVEN_ZIP -> compressToSevenZip(activity, sourcePaths, targetPath, password)
+                CompressionFormat.SEVEN_ZIP -> compressToSevenZip(activity, sourcePaths, targetPath)
                 CompressionFormat.TAR_DEFLATE -> compressToTarDeflate(activity, sourcePaths, targetPath, password)
                 CompressionFormat.TAR_GZ -> compressToTarGz(activity, sourcePaths, targetPath, password)
                 CompressionFormat.TAR_SZ -> compressToTarSz(activity, sourcePaths, targetPath, password)
@@ -120,11 +130,34 @@ class CompressionHelper {
             activity: BaseSimpleActivity,
             sourcePaths: List<String>,
             targetPath: String,
-            password: String? = null
         ): Boolean {
-            return false
+            try {
+                SevenZOutputFile(File(targetPath)).use { sevenZOutput ->
+                    sourcePaths.forEach { sourcePath ->
+                        Files.walk(File(sourcePath).toPath()).forEach { path ->
+                            val file = path.toFile()
+
+                            if (!activity.getIsPathDirectory(file.absolutePath)) {
+                                FileInputStream(file).use { _ ->
+                                    val sevenZArchiveEntry = sevenZOutput.createArchiveEntry(file, file.toString())
+                                    sevenZOutput.putArchiveEntry(sevenZArchiveEntry)
+                                    sevenZOutput.write(Files.readAllBytes(file.toPath()))
+                                    sevenZOutput.closeArchiveEntry()
+                                }
+                            }
+                        }
+                    }
+
+                    sevenZOutput.finish()
+                }
+            } catch (e: IOException) {
+                e.printStackTrace()
+                return false
+            }
+            return true
         }
 
+
         private fun compressToTarDeflate(
             activity: BaseSimpleActivity,
             sourcePaths: List<String>,
@@ -140,7 +173,27 @@ class CompressionHelper {
             targetPath: String,
             password: String? = null
         ): Boolean {
-            return false
+            val tarPath = targetPath.replace(CompressionFormat.TAR_GZ.extension, ".tar")
+            val tarCreated = createTar(activity, sourcePaths, tarPath)
+
+            if (tarCreated) {
+                val tarFile = File(tarPath)
+                val fos = activity.getFileOutputStreamSync(targetPath, "application/gzip")
+                try {
+                    GzipCompressorOutputStream(fos).use { gzipOutput ->
+                        gzipOutput.write(Files.readAllBytes(tarFile.toPath()))
+                        gzipOutput.finish()
+                    }
+                } catch (e: IOException) {
+                    e.printStackTrace()
+                    return false
+                } finally {
+                    tarFile.delete()
+                }
+                return true
+            } else {
+                return false
+            }
         }
 
         private fun compressToTarSz(
@@ -160,5 +213,32 @@ class CompressionHelper {
         ): Boolean {
             return false
         }
+
+        private fun createTar(activity: BaseSimpleActivity, sourcePaths: List<String>, targetPath: String): Boolean {
+            val fos = activity.getFileOutputStreamSync(targetPath, "application/x-tar")
+            try {
+                TarArchiveOutputStream(fos).use { archive ->
+                    sourcePaths.forEach { sourcePath ->
+                        Files.walk(File(sourcePath).toPath()).forEach { path: Path ->
+                            val file = path.toFile()
+
+                            if (!activity.getIsPathDirectory(file.absolutePath)) {
+                                val tarArchiveEntry = TarArchiveEntry(file, file.toString())
+                                FileInputStream(file).use { fis ->
+                                    archive.putArchiveEntry(tarArchiveEntry)
+                                    IOUtils.copy(fis, archive)
+                                    archive.closeArchiveEntry()
+                                }
+                            }
+                        }
+                    }
+                    archive.finish()
+                }
+            } catch (e: IOException) {
+                e.printStackTrace()
+                return false
+            }
+            return true
+        }
     }
 }

gradle/libs.versions.toml

@@ -14,12 +14,13 @@ rootshell = "1.6"
 roottools = "df729dcb13"
 zip4j = "2.11.5"
 apachecommonscompress = "1.22"
+tukaanixz = "1.9"
 #Gradle
 gradlePlugins-agp = "8.1.0"
 #build
 app-build-compileSDKVersion = "34"
 app-build-targetSDK = "34"
-app-build-minimumSDK = "23"
+app-build-minimumSDK = "26"
 app-build-javaVersion = "VERSION_17"
 app-build-kotlinJVMTarget = "17"
 #versioning
@@ -40,6 +41,7 @@ rootshell = { module = "com.github.Stericson:RootShell", version.ref = "rootshel
 roottools = { module = "com.github.Stericson:RootTools", version.ref = "roottools" }
 zip4j = { module = "net.lingala.zip4j:zip4j", version.ref = "zip4j" }
 apache-commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "apachecommonscompress" }
+tukaanixz = { module = "org.tukaani:xz", version.ref = "tukaanixz" }
 [plugins]
 android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }