From 641658ead64ae48636c8da3c2e4aad0ce79f1276 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 3 Sep 2017 23:05:58 +0200
Subject: [PATCH] properly fetch root filediritem children counts and file
 sizes

---
 .../filemanager/fragments/ItemsFragment.kt    |  2 +-
 .../filemanager/helpers/RootHelpers.kt        | 35 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
index 855fd42f..92f9d63d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -189,7 +189,7 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener {
     }
 
     private fun getRootItemsOf(path: String, callback: (items: ArrayList<FileDirItem>) -> Unit) {
-        RootHelpers().getFiles(context, path, callback)
+        RootHelpers().getFiles(context, path.trimEnd('/'), callback)
     }
 
     private fun getChildren(file: File): Int {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt
index 0509df68..3b8d0b9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt
@@ -43,7 +43,7 @@ class RootHelpers {
             override fun commandOutput(id: Int, line: String) {
                 val parts = line.split(" ")
 
-                val filename = parts[1]
+                val filename = parts[1].trimStart('/')
                 if (showHidden || !filename.startsWith(".")) {
                     val filePath = "${path.trimEnd('/')}/$filename"
                     val isDirectory = parts[0].startsWith("d")
@@ -60,9 +60,40 @@ class RootHelpers {
 
             override fun commandCompleted(id: Int, exitcode: Int) {
                 super.commandCompleted(id, exitcode)
-                callback(files)
+                getFileDirParameters(files, callback)
             }
         }
         RootTools.getShell(true).add(command)
     }
+
+    fun getFileDirParameters(oldItems: ArrayList<FileDirItem>, callback: (fileDirItems: ArrayList<FileDirItem>) -> Unit) {
+        val files = ArrayList<FileDirItem>()
+        oldItems.forEach {
+            val childrenCount = "find ${it.path} -mindepth 1 -maxdepth 1 | wc -l"
+            val fileSize = if (it.isDirectory) "" else "wc -c < ${it.path}"
+            val command = object : Command(0, "echo $($childrenCount) $($fileSize)") {
+                override fun commandOutput(id: Int, line: String) {
+                    val areDigitsOnly = line.matches(Regex("[0-9 ]+"))
+                    if (areDigitsOnly) {
+                        val parts = line.split(' ')
+                        val children = parts[0].toInt()
+                        val bytes = if (parts.size > 1) parts[1].toLong() else 0L
+                        val fileDirItem = FileDirItem(it.path, it.name, it.isDirectory, children, bytes)
+                        files.add(fileDirItem)
+                    }
+                    super.commandOutput(id, line)
+                }
+
+                override fun commandTerminated(id: Int, reason: String?) {
+                    super.commandTerminated(id, reason)
+                }
+
+                override fun commandCompleted(id: Int, exitcode: Int) {
+                    callback(files)
+                    super.commandCompleted(id, exitcode)
+                }
+            }
+            RootTools.getShell(true).add(command)
+        }
+    }
 }