Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
b4c0284734 | |||
c5d1dad8de | |||
4ff2ee80ee | |||
633eebfd2a | |||
5a31703840 | |||
162d0c758d | |||
14d64495b6 | |||
fe6e97e832 | |||
35b3d8b099 | |||
2e3e958e15 | |||
955afc4295 | |||
2c487bc443 | |||
b77224176b |
35
.vscode/launch.json
vendored
35
.vscode/launch.json
vendored
@@ -12,11 +12,10 @@
|
|||||||
"program": "${workspaceFolder}",
|
"program": "${workspaceFolder}",
|
||||||
"cwd": "C:/Users/Administrator/Seafile/Games-Barotrauma",
|
"cwd": "C:/Users/Administrator/Seafile/Games-Barotrauma",
|
||||||
"args": [
|
"args": [
|
||||||
"loglevel",
|
"-loglevel",
|
||||||
"trace",
|
"trace",
|
||||||
"(?-s)LightComponent!anyrange=\"(!num)\"",
|
"-cook",
|
||||||
"*4",
|
"*.yml",
|
||||||
"**/Outpost*.xml"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -33,6 +32,28 @@
|
|||||||
"cookassistant.yml",
|
"cookassistant.yml",
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Launch Package (Quasimorph cookfile)",
|
||||||
|
"type": "go",
|
||||||
|
"request": "launch",
|
||||||
|
"mode": "auto",
|
||||||
|
"program": "${workspaceFolder}",
|
||||||
|
"cwd": "C:/Users/Administrator/Seafile/Games-Quasimorph",
|
||||||
|
"args": [
|
||||||
|
"cook.yml",
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Launch Package (Rimworld cookfile)",
|
||||||
|
"type": "go",
|
||||||
|
"request": "launch",
|
||||||
|
"mode": "auto",
|
||||||
|
"program": "${workspaceFolder}",
|
||||||
|
"cwd": "C:/Users/Administrator/Seafile/Games-Rimworld/294100",
|
||||||
|
"args": [
|
||||||
|
"cookVehicles.yml",
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "Launch Package (Workspace)",
|
"name": "Launch Package (Workspace)",
|
||||||
"type": "go",
|
"type": "go",
|
||||||
@@ -40,11 +61,7 @@
|
|||||||
"mode": "auto",
|
"mode": "auto",
|
||||||
"program": "${workspaceFolder}",
|
"program": "${workspaceFolder}",
|
||||||
"args": [
|
"args": [
|
||||||
"-loglevel",
|
"tester.yml",
|
||||||
"trace",
|
|
||||||
"(?-s)LightComponent!anyrange=\"(!num)\"",
|
|
||||||
"*4",
|
|
||||||
"**/Outpost*.xml"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
156
main.go
156
main.go
@@ -8,12 +8,12 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"modify/processor"
|
"cook/processor"
|
||||||
"modify/utils"
|
"cook/utils"
|
||||||
|
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
|
|
||||||
"modify/logger"
|
"cook/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
type GlobalStats struct {
|
type GlobalStats struct {
|
||||||
@@ -80,6 +80,17 @@ func main() {
|
|||||||
globs := utils.AggregateGlobs(commands)
|
globs := utils.AggregateGlobs(commands)
|
||||||
logger.Debug("Aggregated %d globs before deduplication", utils.CountGlobsBeforeDedup(commands))
|
logger.Debug("Aggregated %d globs before deduplication", utils.CountGlobsBeforeDedup(commands))
|
||||||
|
|
||||||
|
for _, command := range commands {
|
||||||
|
logger.Trace("Command: %s", command.Name)
|
||||||
|
logger.Trace("Regex: %s", command.Regex)
|
||||||
|
logger.Trace("Files: %v", command.Files)
|
||||||
|
logger.Trace("Lua: %s", command.Lua)
|
||||||
|
logger.Trace("Git: %t", command.Git)
|
||||||
|
logger.Trace("Reset: %t", command.Reset)
|
||||||
|
logger.Trace("Isolate: %t", command.Isolate)
|
||||||
|
logger.Trace("LogLevel: %s", command.LogLevel)
|
||||||
|
}
|
||||||
|
|
||||||
// Resolve all the files for all the globs
|
// Resolve all the files for all the globs
|
||||||
logger.Info("Found %d unique file patterns", len(globs))
|
logger.Info("Found %d unique file patterns", len(globs))
|
||||||
files, err := utils.ExpandGLobs(globs)
|
files, err := utils.ExpandGLobs(globs)
|
||||||
@@ -107,7 +118,34 @@ func main() {
|
|||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
var fileMutex sync.Mutex
|
var fileMutex sync.Mutex
|
||||||
|
|
||||||
for file, commands := range associations {
|
// Create a map to store loggers for each command
|
||||||
|
commandLoggers := make(map[string]*logger.Logger)
|
||||||
|
for _, command := range commands {
|
||||||
|
// Create a named logger for each command
|
||||||
|
cmdName := command.Name
|
||||||
|
if cmdName == "" {
|
||||||
|
// If no name is provided, use a short version of the regex pattern
|
||||||
|
if len(command.Regex) > 20 {
|
||||||
|
cmdName = command.Regex[:17] + "..."
|
||||||
|
} else {
|
||||||
|
cmdName = command.Regex
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse the log level for this specific command
|
||||||
|
cmdLogLevel := logger.ParseLevel(command.LogLevel)
|
||||||
|
|
||||||
|
// Create a logger with the command name as a field
|
||||||
|
commandLoggers[command.Name] = logger.WithField("command", cmdName)
|
||||||
|
commandLoggers[command.Name].SetLevel(cmdLogLevel)
|
||||||
|
|
||||||
|
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{}{}
|
workers <- struct{}{}
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
logger.SafeGoWithArgs(func(args ...interface{}) {
|
logger.SafeGoWithArgs(func(args ...interface{}) {
|
||||||
@@ -122,43 +160,19 @@ func main() {
|
|||||||
logger.Error("Failed to read file %q: %v", file, err)
|
logger.Error("Failed to read file %q: %v", file, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
logger.Trace("Loaded %d bytes of data for file %q", len(fileData), file)
|
|
||||||
fileDataStr := string(fileData)
|
fileDataStr := string(fileData)
|
||||||
|
|
||||||
// Aggregate all the modifications and execute them
|
fileDataStr, err = RunIsolateCommands(association, file, fileDataStr, &fileMutex)
|
||||||
modifications := []utils.ReplaceCommand{}
|
|
||||||
for _, command := range commands {
|
|
||||||
logger.Info("Processing file %q with command %q", file, command.Regex)
|
|
||||||
commands, err := processor.ProcessRegex(fileDataStr, command)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("Failed to process file %q with command %q: %v", file, command.Regex, err)
|
logger.Error("Failed to run isolate commands for file %q: %v", file, err)
|
||||||
return
|
|
||||||
}
|
|
||||||
modifications = append(modifications, commands...)
|
|
||||||
// It is not guranteed that all the commands will be executed...
|
|
||||||
// TODO: Make this better
|
|
||||||
// We'd have to pass the map to executemodifications or something...
|
|
||||||
count, ok := stats.ModificationsPerCommand.Load(command.Name)
|
|
||||||
if !ok {
|
|
||||||
count = 0
|
|
||||||
}
|
|
||||||
stats.ModificationsPerCommand.Store(command.Name, count.(int)+len(commands))
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(modifications) == 0 {
|
|
||||||
logger.Info("No modifications found for file %q", file)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort commands in reverse order for safe replacements
|
fileDataStr, err = RunOtherCommands(file, fileDataStr, association, &fileMutex, commandLoggers)
|
||||||
fileDataStr, count := utils.ExecuteModifications(modifications, fileDataStr)
|
if err != nil {
|
||||||
|
logger.Error("Failed to run other commands for file %q: %v", file, err)
|
||||||
fileMutex.Lock()
|
return
|
||||||
stats.ProcessedFiles++
|
}
|
||||||
stats.TotalModifications += count
|
|
||||||
fileMutex.Unlock()
|
|
||||||
|
|
||||||
logger.Info("Executed %d modifications for file %q", count, file)
|
|
||||||
|
|
||||||
err = os.WriteFile(file, []byte(fileDataStr), 0644)
|
err = os.WriteFile(file, []byte(fileDataStr), 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -239,3 +253,75 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func RunOtherCommands(file string, fileDataStr string, association utils.FileCommandAssociation, fileMutex *sync.Mutex, commandLoggers map[string]*logger.Logger) (string, error) {
|
||||||
|
// Aggregate all the modifications and execute them
|
||||||
|
modifications := []utils.ReplaceCommand{}
|
||||||
|
for _, command := range association.Commands {
|
||||||
|
// Use command-specific logger if available, otherwise fall back to default logger
|
||||||
|
cmdLogger := logger.DefaultLogger
|
||||||
|
if cmdLog, ok := commandLoggers[command.Name]; ok {
|
||||||
|
cmdLogger = cmdLog
|
||||||
|
}
|
||||||
|
|
||||||
|
cmdLogger.Info("Processing file %q with command %q", file, command.Regex)
|
||||||
|
newModifications, err := processor.ProcessRegex(fileDataStr, command, file)
|
||||||
|
if err != nil {
|
||||||
|
return fileDataStr, fmt.Errorf("failed to process file %q with command %q: %w", file, command.Regex, err)
|
||||||
|
}
|
||||||
|
modifications = append(modifications, newModifications...)
|
||||||
|
// It is not guranteed that all the commands will be executed...
|
||||||
|
// TODO: Make this better
|
||||||
|
// We'd have to pass the map to executemodifications or something...
|
||||||
|
count, ok := stats.ModificationsPerCommand.Load(command.Name)
|
||||||
|
if !ok {
|
||||||
|
count = 0
|
||||||
|
}
|
||||||
|
stats.ModificationsPerCommand.Store(command.Name, count.(int)+len(newModifications))
|
||||||
|
|
||||||
|
cmdLogger.Debug("Command %q generated %d modifications", command.Name, len(newModifications))
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(modifications) == 0 {
|
||||||
|
logger.Info("No modifications found for file %q", file)
|
||||||
|
return fileDataStr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort commands in reverse order for safe replacements
|
||||||
|
var count int
|
||||||
|
fileDataStr, count = utils.ExecuteModifications(modifications, fileDataStr)
|
||||||
|
|
||||||
|
fileMutex.Lock()
|
||||||
|
stats.ProcessedFiles++
|
||||||
|
stats.TotalModifications += count
|
||||||
|
fileMutex.Unlock()
|
||||||
|
|
||||||
|
logger.Info("Executed %d modifications for file %q", count, file)
|
||||||
|
return fileDataStr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func RunIsolateCommands(association utils.FileCommandAssociation, file string, fileDataStr string, fileMutex *sync.Mutex) (string, error) {
|
||||||
|
for _, isolateCommand := range association.IsolateCommands {
|
||||||
|
logger.Info("Processing file %q with isolate command %q", file, isolateCommand.Regex)
|
||||||
|
modifications, err := processor.ProcessRegex(fileDataStr, isolateCommand, file)
|
||||||
|
if err != nil {
|
||||||
|
return fileDataStr, fmt.Errorf("failed to process file %q with isolate command %q: %w", file, isolateCommand.Regex, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(modifications) == 0 {
|
||||||
|
logger.Warning("No modifications found for file %q", file)
|
||||||
|
return fileDataStr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var count int
|
||||||
|
fileDataStr, count = utils.ExecuteModifications(modifications, fileDataStr)
|
||||||
|
|
||||||
|
fileMutex.Lock()
|
||||||
|
stats.ProcessedFiles++
|
||||||
|
stats.TotalModifications += count
|
||||||
|
fileMutex.Unlock()
|
||||||
|
|
||||||
|
logger.Info("Executed %d isolate modifications for file %q", count, file)
|
||||||
|
}
|
||||||
|
return fileDataStr, nil
|
||||||
|
}
|
||||||
|
@@ -6,7 +6,7 @@ import (
|
|||||||
|
|
||||||
lua "github.com/yuin/gopher-lua"
|
lua "github.com/yuin/gopher-lua"
|
||||||
|
|
||||||
"modify/logger"
|
"cook/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Maybe we make this an interface again for the shits and giggles
|
// Maybe we make this an interface again for the shits and giggles
|
||||||
|
@@ -9,8 +9,8 @@ import (
|
|||||||
|
|
||||||
lua "github.com/yuin/gopher-lua"
|
lua "github.com/yuin/gopher-lua"
|
||||||
|
|
||||||
"modify/logger"
|
"cook/logger"
|
||||||
"modify/utils"
|
"cook/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CaptureGroup struct {
|
type CaptureGroup struct {
|
||||||
@@ -21,7 +21,9 @@ type CaptureGroup struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ProcessContent applies regex replacement with Lua processing
|
// ProcessContent applies regex replacement with Lua processing
|
||||||
func ProcessRegex(content string, command utils.ModifyCommand) ([]utils.ReplaceCommand, error) {
|
// The filename here exists ONLY so we can pass it to the lua environment
|
||||||
|
// It's not used for anything else
|
||||||
|
func ProcessRegex(content string, command utils.ModifyCommand, filename string) ([]utils.ReplaceCommand, error) {
|
||||||
var commands []utils.ReplaceCommand
|
var commands []utils.ReplaceCommand
|
||||||
logger.Trace("Processing regex: %q", command.Regex)
|
logger.Trace("Processing regex: %q", command.Regex)
|
||||||
|
|
||||||
@@ -31,6 +33,11 @@ func ProcessRegex(content string, command utils.ModifyCommand) ([]utils.ReplaceC
|
|||||||
// We don't HAVE to do this multiple times for a pattern
|
// We don't HAVE to do this multiple times for a pattern
|
||||||
// But it's quick enough for us to not care
|
// But it's quick enough for us to not care
|
||||||
pattern := resolveRegexPlaceholders(command.Regex)
|
pattern := resolveRegexPlaceholders(command.Regex)
|
||||||
|
// I'm not too happy about having to trim regex, we could have meaningful whitespace or newlines
|
||||||
|
// But it's a compromise that allows us to use | in yaml
|
||||||
|
// Otherwise we would have to escape every god damn pair of quotation marks
|
||||||
|
// And a bunch of other shit
|
||||||
|
pattern = strings.TrimSpace(pattern)
|
||||||
logger.Debug("Compiling regex pattern: %s", pattern)
|
logger.Debug("Compiling regex pattern: %s", pattern)
|
||||||
|
|
||||||
patternCompileStart := time.Now()
|
patternCompileStart := time.Now()
|
||||||
@@ -79,6 +86,7 @@ func ProcessRegex(content string, command utils.ModifyCommand) ([]utils.ReplaceC
|
|||||||
logger.Error("Error creating Lua state: %v", err)
|
logger.Error("Error creating Lua state: %v", err)
|
||||||
return commands, fmt.Errorf("error creating Lua state: %v", err)
|
return commands, fmt.Errorf("error creating Lua state: %v", err)
|
||||||
}
|
}
|
||||||
|
L.SetGlobal("file", lua.LString(filename))
|
||||||
// Hmm... Maybe we don't want to defer this..
|
// Hmm... Maybe we don't want to defer this..
|
||||||
// Maybe we want to close them every iteration
|
// Maybe we want to close them every iteration
|
||||||
// We'll leave it as is for now
|
// We'll leave it as is for now
|
||||||
@@ -153,7 +161,11 @@ func ProcessRegex(content string, command utils.ModifyCommand) ([]utils.ReplaceC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Use the DeduplicateGroups flag to control whether to deduplicate capture groups
|
||||||
|
if !command.NoDedup {
|
||||||
|
logger.Debug("Deduplicating capture groups as specified in command settings")
|
||||||
captureGroups = deduplicateGroups(captureGroups)
|
captureGroups = deduplicateGroups(captureGroups)
|
||||||
|
}
|
||||||
|
|
||||||
if err := toLua(L, captureGroups); err != nil {
|
if err := toLua(L, captureGroups); err != nil {
|
||||||
logger.Error("Failed to set Lua variables: %v", err)
|
logger.Error("Failed to set Lua variables: %v", err)
|
||||||
@@ -205,7 +217,7 @@ func ProcessRegex(content string, command utils.ModifyCommand) ([]utils.ReplaceC
|
|||||||
|
|
||||||
for _, capture := range captureGroups {
|
for _, capture := range captureGroups {
|
||||||
if capture.Value == capture.Updated {
|
if capture.Value == capture.Updated {
|
||||||
logger.Info("Capture group unchanged: %s", capture.Value)
|
logger.Info("Capture group unchanged: %s", LimitString(capture.Value, 50))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -2,9 +2,8 @@ package processor
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"cook/utils"
|
||||||
"io"
|
"io"
|
||||||
"modify/utils"
|
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -38,7 +37,7 @@ func ApiAdaptor(content string, regex string, lua string) (string, int, int, err
|
|||||||
LogLevel: "TRACE",
|
LogLevel: "TRACE",
|
||||||
}
|
}
|
||||||
|
|
||||||
commands, err := ProcessRegex(content, command)
|
commands, err := ProcessRegex(content, command, "test")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", 0, 0, err
|
return "", 0, 0, err
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,7 @@ package processor
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
"modify/logger"
|
"cook/logger"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
package regression
|
package regression
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"modify/processor"
|
"cook/processor"
|
||||||
"modify/utils"
|
"cook/utils"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -15,7 +15,7 @@ func ApiAdaptor(content string, regex string, lua string) (string, int, int, err
|
|||||||
LogLevel: "TRACE",
|
LogLevel: "TRACE",
|
||||||
}
|
}
|
||||||
|
|
||||||
commands, err := processor.ProcessRegex(content, command)
|
commands, err := processor.ProcessRegex(content, command, "test")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", 0, 0, err
|
return "", 0, 0, err
|
||||||
}
|
}
|
||||||
|
@@ -10,7 +10,6 @@ var (
|
|||||||
// Deprecated
|
// Deprecated
|
||||||
ResetFlag = flag.Bool("reset", false, "Reset files to their original state")
|
ResetFlag = flag.Bool("reset", false, "Reset files to their original state")
|
||||||
LogLevel = flag.String("loglevel", "INFO", "Set log level: ERROR, WARNING, INFO, DEBUG, TRACE")
|
LogLevel = flag.String("loglevel", "INFO", "Set log level: ERROR, WARNING, INFO, DEBUG, TRACE")
|
||||||
Cookfile = flag.String("cook", "**/cook.yml", "Path to cook config files, can be globbed")
|
|
||||||
ParallelFiles = flag.Int("P", 100, "Number of files to process in parallel")
|
ParallelFiles = flag.Int("P", 100, "Number of files to process in parallel")
|
||||||
Filter = flag.String("filter", "", "Filter commands before running them")
|
Filter = flag.String("filter", "", "Filter commands before running them")
|
||||||
)
|
)
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
package utils
|
package utils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"cook/logger"
|
||||||
"fmt"
|
"fmt"
|
||||||
"modify/logger"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-git/go-git/v5/plumbing/object"
|
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing/object"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@@ -1,9 +1,10 @@
|
|||||||
package utils
|
package utils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"cook/logger"
|
||||||
"fmt"
|
"fmt"
|
||||||
"modify/logger"
|
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/bmatcuk/doublestar/v4"
|
"github.com/bmatcuk/doublestar/v4"
|
||||||
@@ -18,6 +19,8 @@ type ModifyCommand struct {
|
|||||||
Git bool `yaml:"git"`
|
Git bool `yaml:"git"`
|
||||||
Reset bool `yaml:"reset"`
|
Reset bool `yaml:"reset"`
|
||||||
LogLevel string `yaml:"loglevel"`
|
LogLevel string `yaml:"loglevel"`
|
||||||
|
Isolate bool `yaml:"isolate"`
|
||||||
|
NoDedup bool `yaml:"nodedup"`
|
||||||
}
|
}
|
||||||
type CookFile []ModifyCommand
|
type CookFile []ModifyCommand
|
||||||
|
|
||||||
@@ -39,6 +42,7 @@ func (c *ModifyCommand) Validate() error {
|
|||||||
|
|
||||||
// Ehh.. Not much better... Guess this wasn't the big deal
|
// Ehh.. Not much better... Guess this wasn't the big deal
|
||||||
var matchesMemoTable map[string]bool = make(map[string]bool)
|
var matchesMemoTable map[string]bool = make(map[string]bool)
|
||||||
|
|
||||||
func Matches(path string, glob string) (bool, error) {
|
func Matches(path string, glob string) (bool, error) {
|
||||||
key := fmt.Sprintf("%s:%s", path, glob)
|
key := fmt.Sprintf("%s:%s", path, glob)
|
||||||
if matches, ok := matchesMemoTable[key]; ok {
|
if matches, ok := matchesMemoTable[key]; ok {
|
||||||
@@ -53,10 +57,22 @@ func Matches(path string, glob string) (bool, error) {
|
|||||||
return matches, nil
|
return matches, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func AssociateFilesWithCommands(files []string, commands []ModifyCommand) (map[string][]ModifyCommand, error) {
|
type FileCommandAssociation struct {
|
||||||
|
File string
|
||||||
|
IsolateCommands []ModifyCommand
|
||||||
|
Commands []ModifyCommand
|
||||||
|
}
|
||||||
|
|
||||||
|
func AssociateFilesWithCommands(files []string, commands []ModifyCommand) (map[string]FileCommandAssociation, error) {
|
||||||
associationCount := 0
|
associationCount := 0
|
||||||
fileCommands := make(map[string][]ModifyCommand)
|
fileCommands := make(map[string]FileCommandAssociation)
|
||||||
|
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
|
fileCommands[file] = FileCommandAssociation{
|
||||||
|
File: file,
|
||||||
|
IsolateCommands: []ModifyCommand{},
|
||||||
|
Commands: []ModifyCommand{},
|
||||||
|
}
|
||||||
for _, command := range commands {
|
for _, command := range commands {
|
||||||
for _, glob := range command.Files {
|
for _, glob := range command.Files {
|
||||||
matches, err := Matches(file, glob)
|
matches, err := Matches(file, glob)
|
||||||
@@ -66,15 +82,25 @@ func AssociateFilesWithCommands(files []string, commands []ModifyCommand) (map[s
|
|||||||
}
|
}
|
||||||
if matches {
|
if matches {
|
||||||
logger.Debug("Found match for file %q and command %q", file, command.Regex)
|
logger.Debug("Found match for file %q and command %q", file, command.Regex)
|
||||||
fileCommands[file] = append(fileCommands[file], command)
|
association := fileCommands[file]
|
||||||
|
|
||||||
|
if command.Isolate {
|
||||||
|
association.IsolateCommands = append(association.IsolateCommands, command)
|
||||||
|
} else {
|
||||||
|
association.Commands = append(association.Commands, command)
|
||||||
|
}
|
||||||
|
fileCommands[file] = association
|
||||||
associationCount++
|
associationCount++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger.Debug("Found %d commands for file %q", len(fileCommands[file]), file)
|
logger.Debug("Found %d commands for file %q", len(fileCommands[file].Commands), file)
|
||||||
if len(fileCommands[file]) == 0 {
|
if len(fileCommands[file].Commands) == 0 {
|
||||||
logger.Info("No commands found for file %q", file)
|
logger.Info("No commands found for file %q", file)
|
||||||
}
|
}
|
||||||
|
if len(fileCommands[file].IsolateCommands) > 0 {
|
||||||
|
logger.Info("Found %d isolate commands for file %q", len(fileCommands[file].IsolateCommands), file)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
logger.Info("Found %d associations between %d files and %d commands", associationCount, len(files), len(commands))
|
logger.Info("Found %d associations between %d files and %d commands", associationCount, len(files), len(commands))
|
||||||
return fileCommands, nil
|
return fileCommands, nil
|
||||||
@@ -85,6 +111,8 @@ func AggregateGlobs(commands []ModifyCommand) map[string]struct{} {
|
|||||||
globs := make(map[string]struct{})
|
globs := make(map[string]struct{})
|
||||||
for _, command := range commands {
|
for _, command := range commands {
|
||||||
for _, glob := range command.Files {
|
for _, glob := range command.Files {
|
||||||
|
glob = strings.Replace(glob, "~", os.Getenv("HOME"), 1)
|
||||||
|
glob = strings.ReplaceAll(glob, "\\", "/")
|
||||||
globs[glob] = struct{}{}
|
globs[glob] = struct{}{}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -128,69 +156,38 @@ func ExpandGLobs(patterns map[string]struct{}) ([]string, error) {
|
|||||||
func LoadCommands(args []string) ([]ModifyCommand, error) {
|
func LoadCommands(args []string) ([]ModifyCommand, error) {
|
||||||
commands := []ModifyCommand{}
|
commands := []ModifyCommand{}
|
||||||
|
|
||||||
logger.Info("Loading commands from cook files: %s", *Cookfile)
|
logger.Info("Loading commands from cook files: %s", args)
|
||||||
newcommands, err := LoadCommandsFromCookFiles(*Cookfile)
|
for _, arg := range args {
|
||||||
|
newcommands, err := LoadCommandsFromCookFiles(arg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to load commands from cook files: %w", err)
|
return nil, fmt.Errorf("failed to load commands from cook files: %w", err)
|
||||||
}
|
}
|
||||||
logger.Info("Successfully loaded %d commands from cook files", len(newcommands))
|
logger.Info("Successfully loaded %d commands from cook iles", len(newcommands))
|
||||||
commands = append(commands, newcommands...)
|
commands = append(commands, newcommands...)
|
||||||
logger.Info("Now total commands: %d", len(commands))
|
logger.Info("Now total commands: %d", len(commands))
|
||||||
|
|
||||||
logger.Info("Loading commands from arguments: %v", args)
|
|
||||||
newcommands, err = LoadCommandFromArgs(args)
|
|
||||||
if err != nil {
|
|
||||||
if len(commands) == 0 {
|
|
||||||
return nil, fmt.Errorf("failed to load commands from args: %w", err)
|
|
||||||
}
|
}
|
||||||
logger.Warning("Failed to load commands from args: %v", err)
|
|
||||||
}
|
|
||||||
logger.Info("Successfully loaded %d commands from args", len(newcommands))
|
|
||||||
commands = append(commands, newcommands...)
|
|
||||||
logger.Info("Now total commands: %d", len(commands))
|
|
||||||
|
|
||||||
|
logger.Info("Loaded %d commands from all cook f", len(commands))
|
||||||
return commands, nil
|
return commands, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func LoadCommandFromArgs(args []string) ([]ModifyCommand, error) {
|
func LoadCommandsFromCookFiles(pattern string) ([]ModifyCommand, error) {
|
||||||
// Cannot reset without git, right?
|
|
||||||
if *ResetFlag {
|
|
||||||
*GitFlag = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(args) < 3 {
|
|
||||||
return nil, fmt.Errorf("at least %d arguments are required", 3)
|
|
||||||
}
|
|
||||||
|
|
||||||
command := ModifyCommand{
|
|
||||||
Regex: args[0],
|
|
||||||
Lua: args[1],
|
|
||||||
Files: args[2:],
|
|
||||||
Git: *GitFlag,
|
|
||||||
Reset: *ResetFlag,
|
|
||||||
LogLevel: *LogLevel,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := command.Validate(); err != nil {
|
|
||||||
return nil, fmt.Errorf("invalid command: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return []ModifyCommand{command}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func LoadCommandsFromCookFiles(s string) ([]ModifyCommand, error) {
|
|
||||||
cwd, err := os.Getwd()
|
cwd, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to get current working directory: %w", err)
|
return nil, fmt.Errorf("failed to get current working directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
commands := []ModifyCommand{}
|
commands := []ModifyCommand{}
|
||||||
cookFiles, err := doublestar.Glob(os.DirFS(cwd), *Cookfile)
|
cookFiles, err := doublestar.Glob(os.DirFS(cwd), pattern)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to glob cook files: %w", err)
|
return nil, fmt.Errorf("failed to glob cook files: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, cookFile := range cookFiles {
|
for _, cookFile := range cookFiles {
|
||||||
|
cookFile = filepath.Clean(cookFile)
|
||||||
|
cookFile = strings.ReplaceAll(cookFile, "\\", "/")
|
||||||
|
logger.Info("Loading commands from cook file: %s", cookFile)
|
||||||
|
|
||||||
cookFileData, err := os.ReadFile(cookFile)
|
cookFileData, err := os.ReadFile(cookFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to read cook file: %w", err)
|
return nil, fmt.Errorf("failed to read cook file: %w", err)
|
||||||
|
@@ -158,21 +158,24 @@ func TestAssociateFilesWithCommands(t *testing.T) {
|
|||||||
|
|
||||||
// The associations expected depends on the implementation
|
// The associations expected depends on the implementation
|
||||||
// Let's check the actual associations and verify they make sense
|
// Let's check the actual associations and verify they make sense
|
||||||
for file, cmds := range associations {
|
for file, assoc := range associations {
|
||||||
t.Logf("File %s is associated with %d commands", file, len(cmds))
|
t.Logf("File %s is associated with %d commands and %d isolate commands", file, len(assoc.Commands), len(assoc.IsolateCommands))
|
||||||
for i, cmd := range cmds {
|
for i, cmd := range assoc.Commands {
|
||||||
t.Logf(" Command %d: Pattern=%s, Files=%v", i, cmd.Regex, cmd.Files)
|
t.Logf(" Command %d: Pattern=%s, Files=%v", i, cmd.Regex, cmd.Files)
|
||||||
}
|
}
|
||||||
|
for i, cmd := range assoc.IsolateCommands {
|
||||||
|
t.Logf(" Isolate Command %d: Pattern=%s, Files=%v", i, cmd.Regex, cmd.Files)
|
||||||
|
}
|
||||||
|
|
||||||
// Specific validation based on our file types
|
// Specific validation based on our file types
|
||||||
switch file {
|
switch file {
|
||||||
case "file1.xml":
|
case "file1.xml":
|
||||||
if len(cmds) < 1 {
|
if len(assoc.Commands) < 1 {
|
||||||
t.Errorf("Expected at least 1 command for file1.xml, got %d", len(cmds))
|
t.Errorf("Expected at least 1 command for file1.xml, got %d", len(assoc.Commands))
|
||||||
}
|
}
|
||||||
// Verify at least one command with *.xml pattern
|
// Verify at least one command with *.xml pattern
|
||||||
hasXmlGlob := false
|
hasXmlGlob := false
|
||||||
for _, cmd := range cmds {
|
for _, cmd := range assoc.Commands {
|
||||||
for _, glob := range cmd.Files {
|
for _, glob := range cmd.Files {
|
||||||
if glob == "*.xml" {
|
if glob == "*.xml" {
|
||||||
hasXmlGlob = true
|
hasXmlGlob = true
|
||||||
@@ -187,12 +190,12 @@ func TestAssociateFilesWithCommands(t *testing.T) {
|
|||||||
t.Errorf("Expected command with *.xml glob for file1.xml")
|
t.Errorf("Expected command with *.xml glob for file1.xml")
|
||||||
}
|
}
|
||||||
case "file2.txt":
|
case "file2.txt":
|
||||||
if len(cmds) < 1 {
|
if len(assoc.Commands) < 1 {
|
||||||
t.Errorf("Expected at least 1 command for file2.txt, got %d", len(cmds))
|
t.Errorf("Expected at least 1 command for file2.txt, got %d", len(assoc.Commands))
|
||||||
}
|
}
|
||||||
// Verify at least one command with *.txt pattern
|
// Verify at least one command with *.txt pattern
|
||||||
hasTxtGlob := false
|
hasTxtGlob := false
|
||||||
for _, cmd := range cmds {
|
for _, cmd := range assoc.Commands {
|
||||||
for _, glob := range cmd.Files {
|
for _, glob := range cmd.Files {
|
||||||
if glob == "*.txt" {
|
if glob == "*.txt" {
|
||||||
hasTxtGlob = true
|
hasTxtGlob = true
|
||||||
@@ -207,12 +210,12 @@ func TestAssociateFilesWithCommands(t *testing.T) {
|
|||||||
t.Errorf("Expected command with *.txt glob for file2.txt")
|
t.Errorf("Expected command with *.txt glob for file2.txt")
|
||||||
}
|
}
|
||||||
case "subdir/file3.xml":
|
case "subdir/file3.xml":
|
||||||
if len(cmds) < 1 {
|
if len(assoc.Commands) < 1 {
|
||||||
t.Errorf("Expected at least 1 command for subdir/file3.xml, got %d", len(cmds))
|
t.Errorf("Expected at least 1 command for subdir/file3.xml, got %d", len(assoc.Commands))
|
||||||
}
|
}
|
||||||
// Should match both *.xml and subdir/* patterns
|
// Should match both *.xml and subdir/* patterns
|
||||||
matches := 0
|
matches := 0
|
||||||
for _, cmd := range cmds {
|
for _, cmd := range assoc.Commands {
|
||||||
for _, glob := range cmd.Files {
|
for _, glob := range cmd.Files {
|
||||||
if glob == "*.xml" || glob == "subdir/*" {
|
if glob == "*.xml" || glob == "subdir/*" {
|
||||||
matches++
|
matches++
|
||||||
@@ -393,10 +396,10 @@ func TestLoadCommandsFromCookFileSuccess(t *testing.T) {
|
|||||||
// Arrange
|
// Arrange
|
||||||
yamlData := []byte(`
|
yamlData := []byte(`
|
||||||
- name: command1
|
- name: command1
|
||||||
pattern: "*.txt"
|
regex: "*.txt"
|
||||||
lua: replace
|
lua: replace
|
||||||
- name: command2
|
- name: command2
|
||||||
pattern: "*.go"
|
regex: "*.go"
|
||||||
lua: delete
|
lua: delete
|
||||||
`)
|
`)
|
||||||
|
|
||||||
@@ -420,11 +423,11 @@ func TestLoadCommandsFromCookFileWithComments(t *testing.T) {
|
|||||||
yamlData := []byte(`
|
yamlData := []byte(`
|
||||||
# This is a comment
|
# This is a comment
|
||||||
- name: command1
|
- name: command1
|
||||||
pattern: "*.txt"
|
regex: "*.txt"
|
||||||
lua: replace
|
lua: replace
|
||||||
# Another comment
|
# Another comment
|
||||||
- name: command2
|
- name: command2
|
||||||
pattern: "*.go"
|
regex: "*.go"
|
||||||
lua: delete
|
lua: delete
|
||||||
`)
|
`)
|
||||||
|
|
||||||
@@ -445,7 +448,7 @@ func TestLoadCommandsFromCookFileWithComments(t *testing.T) {
|
|||||||
// Handle different YAML formatting styles (flow vs block)
|
// Handle different YAML formatting styles (flow vs block)
|
||||||
func TestLoadCommandsFromCookFileWithFlowStyle(t *testing.T) {
|
func TestLoadCommandsFromCookFileWithFlowStyle(t *testing.T) {
|
||||||
// Arrange
|
// Arrange
|
||||||
yamlData := []byte(`[ { name: command1, pattern: "*.txt", lua: replace }, { name: command2, pattern: "*.go", lua: delete } ]`)
|
yamlData := []byte(`[ { name: command1, regex: "*.txt", lua: replace }, { name: command2, regex: "*.go", lua: delete } ]`)
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
commands, err := LoadCommandsFromCookFile(yamlData)
|
commands, err := LoadCommandsFromCookFile(yamlData)
|
||||||
@@ -496,13 +499,13 @@ func TestLoadCommandsFromCookFileWithMultipleEntries(t *testing.T) {
|
|||||||
// Arrange
|
// Arrange
|
||||||
yamlData := []byte(`
|
yamlData := []byte(`
|
||||||
- name: command1
|
- name: command1
|
||||||
pattern: "*.txt"
|
regex: "*.txt"
|
||||||
lua: replace
|
lua: replace
|
||||||
- name: command2
|
- name: command2
|
||||||
pattern: "*.go"
|
regex: "*.go"
|
||||||
lua: delete
|
lua: delete
|
||||||
- name: command3
|
- name: command3
|
||||||
pattern: "*.md"
|
regex: "*.md"
|
||||||
lua: append
|
lua: append
|
||||||
`)
|
`)
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
package utils
|
package utils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"cook/logger"
|
||||||
"fmt"
|
"fmt"
|
||||||
"modify/logger"
|
|
||||||
"sort"
|
"sort"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user