fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

get proper file count of folders only when needed

Browse Source
This commit is contained in:
tibbi 2021-01-14 21:40:02 +01:00
parent d68aee2b5f
commit a9bb37e07d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
View File

@ -233,9 +233,10 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
val lastModifieds = context!!.getFolderLastModifieds(path) val lastModifieds = context!!.getFolderLastModifieds(path)
val isSortingBySize = context!!.config.getFolderSorting(currentPath) and SORT_BY_SIZE != 0 val isSortingBySize = context!!.config.getFolderSorting(currentPath) and SORT_BY_SIZE != 0
val getProperChildCount = context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_LIST
if (files != null) { if (files != null) {
for (file in files) { for (file in files) {
val fileDirItem = getFileDirItemFromFile(file, isSortingBySize, lastModifieds) val fileDirItem = getFileDirItemFromFile(file, isSortingBySize, lastModifieds, getProperChildCount)
if (fileDirItem != null) { if (fileDirItem != null) {
items.add(fileDirItem) items.add(fileDirItem)
} }
@ -245,7 +246,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
callback(path, items) callback(path, items)
} }
private fun getFileDirItemFromFile(file: File, isSortingBySize: Boolean, lastModifieds: HashMap<String, Long>): ListItem? { private fun getFileDirItemFromFile(file: File, isSortingBySize: Boolean, lastModifieds: HashMap<String, Long>, getProperChildCount: Boolean): ListItem? {
val curPath = file.absolutePath val curPath = file.absolutePath
val curName = file.name val curName = file.name
if (!showHidden && curName.startsWith(".")) { if (!showHidden && curName.startsWith(".")) {
@ -254,7 +255,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
var lastModified = lastModifieds.remove(curPath) var lastModified = lastModifieds.remove(curPath)
val isDirectory = if (lastModified != null) false else file.isDirectory val isDirectory = if (lastModified != null) false else file.isDirectory
val children = if (isDirectory) file.getDirectChildrenCount(showHidden) else 0 val children = if (isDirectory && getProperChildCount) file.getDirectChildrenCount(showHidden) else 0
val size = if (isDirectory) { val size = if (isDirectory) {
if (isSortingBySize) { if (isSortingBySize) {
file.getProperSize(showHidden) file.getProperSize(showHidden)
@ -380,7 +381,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
files.addAll(searchFiles(text, it.absolutePath)) files.addAll(searchFiles(text, it.absolutePath))
} else { } else {
if (it.name.contains(text, true)) { if (it.name.contains(text, true)) {
val fileDirItem = getFileDirItemFromFile(it, isSortingBySize, HashMap<String, Long>()) val fileDirItem = getFileDirItemFromFile(it, isSortingBySize, HashMap<String, Long>(), false)
if (fileDirItem != null) { if (fileDirItem != null) {
files.add(fileDirItem) files.add(fileDirItem)
} }