fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix subfolder counting at "Group direct subfolders"

This commit is contained in:
tibbi 2018-12-15 21:23:00 +01:00
parent 5482059235
commit 98a5b7144b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View File

@ -967,19 +967,27 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
val newDirs = dirs.filter { foldersToShow.contains(it.path) } as ArrayList<Directory> val newDirs = dirs.filter { foldersToShow.contains(it.path) } as ArrayList<Directory>
// update the directory media counts, add all subfolder media counts to it // update the directory media counts, add all subfolder media counts to it
dirs.forEach { for (dir in dirs) {
val mainDir = it
var longestSharedPath = "" var longestSharedPath = ""
newDirs.forEach { for (newDir in newDirs) {
if (it.path != mainDir.path && mainDir.path.startsWith(it.path, true) && it.path.length > longestSharedPath.length) { if (newDir.path == dir.path) {
it.subfoldersCount += 1 longestSharedPath = dir.path
longestSharedPath = it.path continue
} }
if (dir.path.startsWith(newDir.path, true) && newDir.path.length > longestSharedPath.length) {
longestSharedPath = newDir.path
}
}
val parentFolder = newDirs.firstOrNull { it.path == longestSharedPath }
parentFolder?.apply {
subfoldersCount++
} }
val mainFolder = newDirs.firstOrNull { it.path == longestSharedPath } val mainFolder = newDirs.firstOrNull { it.path == longestSharedPath }
if (mainFolder != null) { if (mainFolder != null) {
mainFolder.subfoldersMediaCount += mainDir.mediaCnt mainFolder.subfoldersMediaCount += dir.mediaCnt
} }
} }