PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

Merge pull request #2924 from esensar/fix/1886-subfolder-grouping-revert

Browse source 
Revert "Make subfolder grouping follow file structure"
This commit is contained in:
Tibor Kaputa 2023-07-31 10:28:30 +02:00 committed by GitHub
commit 29e6a0eef0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 76 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
View file

@ -197,28 +197,37 @@ fun Context.getDirsToShow(dirs: ArrayList<Directory>, allDirs: ArrayList<Directo
fun Context.getDirectParentSubfolders(dirs: ArrayList<Directory>, currentPathPrefix: String): ArrayList<Directory> {
val folders = dirs.map { it.path }.sorted().toMutableSet() as HashSet<String>
// Sort by path length, to ensure that parents get processed first
val foldersByPathLength = dirs.filter {
currentPathPrefix.isEmpty() ||
(it.path.startsWith(currentPathPrefix, true) && it.path != currentPathPrefix)
}.sortedBy {
it.path.length
val currentPaths = LinkedHashSet<String>()
val foldersWithoutMediaFiles = ArrayList<String>()
var newDirId = 1000L
for (path in folders) {
if (path == RECYCLE_BIN || path == FAVORITES) {
continue
}
var newDirId = 1000L
val groups = mutableMapOf<String, MutableList<Directory>>()
if (currentPathPrefix.isNotEmpty()) {
if (!path.startsWith(currentPathPrefix, true)) {
continue
}
for (folder in foldersByPathLength) {
val parent = groups.keys.firstOrNull { folder.path.startsWith(it, true) }
if (parent != null) {
// If we have parent in top level groups
// Add this folder to that group,
// but also add all folders in between which may not have media files
groups.getOrPut(parent, ::mutableListOf).apply {
var midParent = File(folder.path).parent
while (midParent != null && none { it.path.equals(midParent, true) }) {
if (!File(path).parent.equals(currentPathPrefix, true)) {
continue
}
}
if (currentPathPrefix.isNotEmpty() && path.equals(currentPathPrefix, true) || File(path).parent.equals(currentPathPrefix, true)) {
currentPaths.add(path)
} else if (folders.any { !it.equals(path, true) && (File(path).parent.equals(it, true) || File(it).parent.equals(File(path).parent, true)) }) {
// if we have folders like
// /storage/emulated/0/Pictures/Images and
// /storage/emulated/0/Pictures/Screenshots,
// but /storage/emulated/0/Pictures is empty, still Pictures with the first folders thumbnails and proper other info
val parent = File(path).parent
if (parent != null && !folders.contains(parent) && dirs.none { it.path.equals(parent, true) }) {
currentPaths.add(parent)
val isSortingAscending = config.sorting.isSortingAscending()
val subDirs = dirs.filter { File(it.path).parent.equals(midParent, true) } as ArrayList<Directory>
val subDirs = dirs.filter { File(it.path).parent.equals(File(path).parent, true) } as ArrayList<Directory>
if (subDirs.isNotEmpty()) {
val lastModified = if (isSortingAscending) {
subDirs.minByOrNull { it.modified }?.modified
@ -239,46 +248,38 @@ fun Context.getDirectParentSubfolders(dirs: ArrayList<Directory>, currentPathPre
val directory = Directory(
newDirId++,
midParent,
parent,
subDirs.first().tmb,
getFolderNameFromPath(midParent),
getFolderNameFromPath(parent),
subDirs.sumBy { it.mediaCnt },
lastModified,
dateTaken,
subDirs.sumByLong { it.size },
getPathLocation(midParent),
getPathLocation(parent),
mediaTypes,
""
)
directory.containsMediaFilesDirectly = false
dirs.add(directory)
add(directory)
currentPaths.add(parent)
foldersWithoutMediaFiles.add(parent)
}
midParent = File(midParent).parent
}
add(folder)
}
} else {
// If we have don't have parent in top level groups
// Set this folder as top level group if it is direct child
if (currentPathPrefix.isEmpty() || File(folder.path).parent.equals(currentPathPrefix, true)) {
groups.getOrPut(folder.path, ::mutableListOf).add(folder)
} else {
// Otherwise find its parent which is a direct child of current path prefix
// And create a group for it
var firstVisibleParent = File(folder.path).parent
while (firstVisibleParent != null && !File(firstVisibleParent).parent.equals(currentPathPrefix, true)) {
firstVisibleParent = File(firstVisibleParent).parent
}
if (firstVisibleParent != null) {
groups.getOrPut(firstVisibleParent, ::mutableListOf).add(folder)
}
}
currentPaths.add(path)
}
}
val currentPaths = groups.keys.toMutableList()
var areDirectSubfoldersAvailable = false
currentPaths.forEach {
val path = it
currentPaths.forEach {
if (!foldersWithoutMediaFiles.contains(it) && !it.equals(path, true) && File(it).parent?.equals(path, true) == true) {
areDirectSubfoldersAvailable = true
}
}
}
if (currentPathPrefix.isEmpty() && folders.contains(RECYCLE_BIN)) {
currentPaths.add(RECYCLE_BIN)
@ -295,7 +296,12 @@ fun Context.getDirectParentSubfolders(dirs: ArrayList<Directory>, currentPathPre
folders.clear()
folders.addAll(currentPaths)
return dirs.filter { folders.contains(it.path) } as ArrayList<Directory>
val dirsToShow = dirs.filter { folders.contains(it.path) } as ArrayList<Directory>
return if (areDirectSubfoldersAvailable) {
getDirectParentSubfolders(dirsToShow, currentPathPrefix)
} else {
dirsToShow
}
}
fun Context.updateSubfolderCounts(children: ArrayList<Directory>, parentDirs: ArrayList<Directory>) {