kamma/kf-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed search

Browse Source
This commit is contained in:
Radek Davidek 2026-04-22 10:53:32 +02:00
parent 65a996bc29
commit d30944ebec
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/cz/kamma/kfmanager/service/FileOperations.java
View File

@ -658,16 +658,20 @@ public class FileOperations {
for (File file : files) { for (File file : files) {
if (callback != null && callback.isCancelled()) return; if (callback != null && callback.isCancelled()) return;
try { try {
if (file.isDirectory()) { // Always check if current file/directory matches name pattern
if (maxDepth == -1 || currentDepth < maxDepth) {
searchRecursive(file, patternLower, filenameRegex, contentPattern, maxDepth, currentDepth + 1, searchArchives, caseSensitive, callback);
}
} else {
boolean nameMatched = true; boolean nameMatched = true;
if (patternLower != null && !patternLower.isEmpty()) { if (patternLower != null && !patternLower.isEmpty()) {
nameMatched = matchName(file.getName(), patternLower, filenameRegex, caseSensitive); nameMatched = matchName(file.getName(), patternLower, filenameRegex, caseSensitive);
} }
if (file.isDirectory()) {
if (nameMatched && (contentPattern == null)) {
callback.onFileFound(file, null);
}
if (maxDepth == -1 || currentDepth < maxDepth) {
searchRecursive(file, patternLower, filenameRegex, contentPattern, maxDepth, currentDepth + 1, searchArchives, caseSensitive, callback);
}
} else {
boolean contentMatched = true; boolean contentMatched = true;
if (nameMatched && contentPattern != null) { if (nameMatched && contentPattern != null) {
contentMatched = fileMatchesContent(file, contentPattern); contentMatched = fileMatchesContent(file, contentPattern);