jessebrault/ssg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Bug fix with wildcard.

Browse Source
This commit is contained in:
JesseBrault0709 2024-05-31 10:17:49 +02:00
parent 8967338fae
commit cfafaf0df9
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/main/groovy/com/jessebrault/ssg/util/Glob.groovy
View File

@ -39,7 +39,7 @@ final class Glob {
new AnyDirectoryHierarchy() new AnyDirectoryHierarchy()
} else if (it.contains('*')) { } else if (it.contains('*')) {
def replaced = it.replace([ def replaced = it.replace([
'*': '.', '*': '.*',
'.': '\\.' '.': '\\.'
]) ])
new GlobFileOrDirectory(it, ~replaced) new GlobFileOrDirectory(it, ~replaced)
@ -73,35 +73,29 @@ final class Glob {
subjectParts = subject.split('/') as List<String> subjectParts = subject.split('/') as List<String>
} }
def subjectPartIter = subjectParts.iterator()
def subjectPartStack = new LinkedList<String>()
while (subjectPartIter.hasNext()) {
subjectPartStack.push(subjectPartIter.next())
}
boolean result = true boolean result = true
parts: parts:
for (def part : this.parts) { for (def part : this.parts) {
if (part instanceof Literal) { if (part instanceof Literal) {
if (subjectPartStack.isEmpty()) { if (subjectParts.isEmpty()) {
result = false result = false
break break
} }
def subjectPart = subjectPartStack.pop() def subjectPart = subjectParts.removeFirst()
if (part.literal != subjectPart) { if (part.literal != subjectPart) {
result = false result = false
break break
} }
} else if (part instanceof AnyDirectoryHierarchy) { } else if (part instanceof AnyDirectoryHierarchy) {
while (!subjectPartStack.isEmpty()) { while (!subjectParts.isEmpty()) {
def current = subjectPartStack.pop() def current = subjectParts.removeFirst()
if (subjectPartStack.isEmpty()) { if (subjectParts.isEmpty()) {
subjectPartStack.push(current) subjectParts.push(current)
continue parts continue parts
} }
} }
} else if (part instanceof GlobFileOrDirectory) { } else if (part instanceof GlobFileOrDirectory) {
def subjectPart = subjectPartStack.pop() def subjectPart = subjectParts.removeFirst()
def m = part.regexPattern.matcher(subjectPart) def m = part.regexPattern.matcher(subjectPart)
if (!m.matches()) { if (!m.matches()) {
result = false result = false