Fix file associations

It was fucked because we were removing the static path and then cramming
that into assications
This commit is contained in:
2025-04-22 10:53:25 +02:00
parent 4b0a85411d
commit ddc1d83d58
3 changed files with 16 additions and 6 deletions

13
.vscode/launch.json vendored
View File

@@ -18,6 +18,19 @@
"*.yml",
]
},
{
"name": "Launch Package (Payday 2)",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${workspaceFolder}",
"cwd": "C:/Users/Administrator/Seafile/Games-Payday2",
"args": [
"-loglevel",
"trace",
"*.yml",
]
},
{
"name": "Launch Package (Barotrauma cookfile)",
"type": "go",

View File

@@ -141,9 +141,6 @@ func main() {
logger.Debug("Created logger for command %q with log level %s", cmdName, cmdLogLevel.String())
}
// This aggregation is great but what if one modification replaces the whole entire file?
// Shit......
// TODO: Add "Isolate" field to modifications which makes them run alone
for file, association := range associations {
workers <- struct{}{}
wg.Add(1)

View File

@@ -86,6 +86,7 @@ func AssociateFilesWithCommands(files []string, commands []ModifyCommand) (map[s
fileCommands := make(map[string]FileCommandAssociation)
for _, file := range files {
file = strings.ReplaceAll(file, "\\", "/")
fileCommands[file] = FileCommandAssociation{
File: file,
IsolateCommands: []ModifyCommand{},
@@ -94,9 +95,8 @@ func AssociateFilesWithCommands(files []string, commands []ModifyCommand) (map[s
for _, command := range commands {
for _, glob := range command.Files {
static, pattern := SplitPattern(glob)
file = strings.ReplaceAll(file, "\\", "/")
file = strings.Replace(file, static+`/`, "", 1)
matches, err := Matches(file, pattern)
patternFile := strings.Replace(file, static+`/`, "", 1)
matches, err := Matches(patternFile, pattern)
if err != nil {
logger.Trace("Failed to match glob %s with file %s: %v", glob, file, err)
continue