Skip to content

Fix system path separators for config globbing #2327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fishbowler merged 1 commit into from
Feb 20, 2025
Merged

Fix system path separators for config globbing #2327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion maestro-orchestra/src/main/java/maestro/orchestra/workspace/WorkspaceExecutionPlanner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ object WorkspaceExecutionPlanner {
val globs = workspaceConfig.flows ?: listOf("*")

val matchers = globs.flatMap { glob ->
directories.map { it.fileSystem.getPathMatcher("glob:${it.pathString}/$glob") }
directories.map { it.fileSystem.getPathMatcher(escapeSlashesForWindows("glob:${it.pathString}${it.fileSystem.separator}$glob")) }
}

val unsortedFlowFiles = flowFiles + flowFilesInDirs.filter { path ->
Expand Down Expand Up @@ -176,6 +176,10 @@ object WorkspaceExecutionPlanner {
return file.fileName.toString().substringBeforeLast(".")
}

private fun escapeSlashesForWindows(pathString: String): String {
return pathString.replace("\\","\\\\")
}

data class FlowSequence(
val flows: List<Path>,
val continueOnFailure: Boolean? = true,
Expand Down