wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #136, properly sort folders by size

Browse source
This commit is contained in:
tibbi 2017-12-03 23:35:23 +01:00
parent 65c5f6af79
commit 5bdb75e6d5
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
View file

@ -10,6 +10,7 @@ import android.view.ViewGroup
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.dialogs.StoragePickerDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.Breadcrumbs
import com.simplemobiletools.filemanager.R
@ -179,16 +180,16 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
if (!showHidden && curName.startsWith("."))
continue
val children = getChildren(file)
val size = file.length()
items.add(FileDirItem(curPath, curName, file.isDirectory, children, size))
val children = getChildrenCount(file)
val size = if (file.isDirectory && context!!.config.sorting == SORT_BY_SIZE) getDirectorySize(file) else file.length()
val fileDirItem = FileDirItem(curPath, curName, file.isDirectory, children, size)
items.add(fileDirItem)
}
}
callback(items)
}
private fun getChildren(file: File): Int {
private fun getChildrenCount(file: File): Int {
val fileList: Array<out String>? = file.list() ?: return 0
if (file.isDirectory) {
@ -201,6 +202,20 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
return 0
}
private fun getDirectorySize(directory: File): Long {
if (directory.exists()) {
val fileList = directory.listFiles() ?: return 0
return fileList.indices.map {
if (fileList[it].isDirectory) {
getDirectorySize(fileList[it])
} else {
fileList[it].length()
}
}.sum()
}
return 0
}
private fun itemClicked(item: FileDirItem) {
if (item.isDirectory) {
openPath(item.path)