feat: 更新扩展命令以支持大小写变体的处理和测试

This commit is contained in:
2025-10-31 14:49:24 +08:00
parent 67140ff8b3
commit f0414ec32b
7 changed files with 161 additions and 69 deletions

View File

@@ -87,6 +87,9 @@ renamer extension <source-ext...> <target-ext> [flags]
fails if any token omits the leading dot or repeats the target exactly. fails if any token omits the leading dot or repeats the target exactly.
- Source extensions are normalized case-insensitively; duplicates and no-op tokens are surfaced as - Source extensions are normalized case-insensitively; duplicates and no-op tokens are surfaced as
warnings in the preview rather than silently ignored. warnings in the preview rather than silently ignored.
- Case variants of the target extension (for example `.JPG` when targeting `.jpg`) remain untouched
unless you include them in the source list, ensuring casing changes happen only when explicitly
requested.
- Preview output lists every candidate with `changed`, `no change`, or `skipped` status so scripts - Preview output lists every candidate with `changed`, `no change`, or `skipped` status so scripts
can detect conflicts before applying. Conflicting targets block apply and exit with a non-zero can detect conflicts before applying. Conflicting targets block apply and exit with a non-zero
code. code.

View File

@@ -48,13 +48,6 @@ func BuildPlan(ctx context.Context, req *ExtensionRequest) (*PlanResult, error)
sourceSet[CanonicalExtension(source)] = struct{}{} sourceSet[CanonicalExtension(source)] = struct{}{}
} }
// Include the target extension so preview surfaces existing matches as no-ops.
matchable := make(map[string]struct{}, len(sourceSet)+1)
for ext := range sourceSet {
matchable[ext] = struct{}{}
}
matchable[targetCanonical] = struct{}{}
filterSet := make(map[string]struct{}, len(req.ExtensionFilter)) filterSet := make(map[string]struct{}, len(req.ExtensionFilter))
for _, filter := range req.ExtensionFilter { for _, filter := range req.ExtensionFilter {
filterSet[CanonicalExtension(filter)] = struct{}{} filterSet[CanonicalExtension(filter)] = struct{}{}
@@ -94,7 +87,10 @@ func BuildPlan(ctx context.Context, req *ExtensionRequest) (*PlanResult, error)
} }
} }
if _, ok := matchable[canonicalExt]; !ok { _, sourceMatch := sourceSet[canonicalExt]
targetMatch := canonicalExt == targetCanonical && rawExt == targetExt
if !sourceMatch && !targetMatch {
return nil return nil
} }
@@ -105,7 +101,7 @@ func BuildPlan(ctx context.Context, req *ExtensionRequest) (*PlanResult, error)
targetRelative := relative targetRelative := relative
targetAbsolute := originalAbsolute targetAbsolute := originalAbsolute
if canonicalExt == targetCanonical && rawExt == targetExt { if targetMatch {
status = PreviewStatusNoChange status = PreviewStatusNoChange
} }

View File

@@ -55,7 +55,7 @@ func ParseArgs(args []string) (ParseResult, error) {
filteredDisplay := make([]string, 0, len(display)) filteredDisplay := make([]string, 0, len(display))
noOps := make([]string, 0) noOps := make([]string, 0)
for i, canon := range canonical { for i, canon := range canonical {
if canon == targetCanonical { if canon == targetCanonical && display[i] == target {
noOps = append(noOps, display[i]) noOps = append(noOps, display[i])
continue continue
} }

View File

@@ -37,29 +37,12 @@ func TestExtensionPreviewAndApply(t *testing.T) {
req := extension.NewRequest(scope) req := extension.NewRequest(scope)
req.SetExecutionMode(true, false) req.SetExecutionMode(true, false)
sources := []string{".jpeg", ".JPG", ".jpg"} parsed, err := extension.ParseArgs([]string{".jpeg", ".JPG", ".jpg"})
canonical, display, duplicates := extension.NormalizeSourceExtensions(sources) if err != nil {
target := extension.NormalizeTargetExtension(".jpg") t.Fatalf("parse args: %v", err)
targetCanonical := extension.CanonicalExtension(target)
filteredCanonical := make([]string, 0, len(canonical))
filteredDisplay := make([]string, 0, len(display))
noOps := make([]string, 0)
for i, canon := range canonical {
if canon == targetCanonical {
noOps = append(noOps, display[i])
continue
} }
filteredCanonical = append(filteredCanonical, canon) req.SetExtensions(parsed.SourcesCanonical, parsed.SourcesDisplay, parsed.Target)
filteredDisplay = append(filteredDisplay, display[i]) req.SetWarnings(parsed.Duplicates, parsed.NoOps)
}
if len(filteredCanonical) == 0 {
t.Fatalf("expected canonical sources after filtering")
}
req.SetExtensions(filteredCanonical, filteredDisplay, target)
req.SetWarnings(duplicates, noOps)
var buf bytes.Buffer var buf bytes.Buffer
summary, planned, err := extension.Preview(context.Background(), req, &buf) summary, planned, err := extension.Preview(context.Background(), req, &buf)
@@ -94,8 +77,8 @@ func TestExtensionPreviewAndApply(t *testing.T) {
t.Fatalf("expected summary line, output: %s", output) t.Fatalf("expected summary line, output: %s", output)
} }
if len(summary.Warnings) == 0 { if len(summary.Warnings) != 0 {
t.Fatalf("expected warnings for duplicates/no-ops") t.Fatalf("did not expect preview warnings, got %#v", summary.Warnings)
} }
req.SetExecutionMode(false, true) req.SetExecutionMode(false, true)
@@ -126,6 +109,77 @@ func TestExtensionPreviewAndApply(t *testing.T) {
} }
} }
func TestExtensionSkipsCaseVariantsWithoutSource(t *testing.T) {
t.Parallel()
tmp := t.TempDir()
writeTestFile(t, filepath.Join(tmp, "photo.jpeg"))
writeTestFile(t, filepath.Join(tmp, "poster.JPG"))
writeTestFile(t, filepath.Join(tmp, "logo.jpg"))
scope := &listing.ListingRequest{
WorkingDir: tmp,
IncludeDirectories: false,
Recursive: false,
IncludeHidden: false,
Extensions: nil,
Format: listing.FormatTable,
}
if err := scope.Validate(); err != nil {
t.Fatalf("validate scope: %v", err)
}
req := extension.NewRequest(scope)
req.SetExecutionMode(true, false)
parsed, err := extension.ParseArgs([]string{".jpeg", ".jpg"})
if err != nil {
t.Fatalf("parse args: %v", err)
}
req.SetExtensions(parsed.SourcesCanonical, parsed.SourcesDisplay, parsed.Target)
req.SetWarnings(parsed.Duplicates, parsed.NoOps)
var buf bytes.Buffer
summary, planned, err := extension.Preview(context.Background(), req, &buf)
if err != nil {
t.Fatalf("preview error: %v", err)
}
if summary.TotalCandidates != 2 {
t.Fatalf("expected 2 candidates, got %d", summary.TotalCandidates)
}
if summary.TotalChanged != 1 {
t.Fatalf("expected 1 changed entry, got %d", summary.TotalChanged)
}
if summary.NoChange != 1 {
t.Fatalf("expected 1 no-change entry, got %d", summary.NoChange)
}
if len(planned) != 1 {
t.Fatalf("expected exactly one planned rename, got %d", len(planned))
}
output := buf.String()
if strings.Contains(output, "poster.JPG -> poster.jpg") {
t.Fatalf("expected poster.JPG to be excluded from plan, output: %s", output)
}
req.SetExecutionMode(false, true)
entry, err := extension.Apply(context.Background(), req, planned, summary)
if err != nil {
t.Fatalf("apply error: %v", err)
}
if len(entry.Operations) != len(planned) {
t.Fatalf("expected %d ledger operations, got %d", len(planned), len(entry.Operations))
}
if _, err := os.Stat(filepath.Join(tmp, "photo.jpg")); err != nil {
t.Fatalf("expected photo.jpg after apply: %v", err)
}
if _, err := os.Stat(filepath.Join(tmp, "poster.JPG")); err != nil {
t.Fatalf("expected poster.JPG to remain unchanged: %v", err)
}
}
func writeTestFile(t *testing.T, path string) { func writeTestFile(t *testing.T, path string) {
t.Helper() t.Helper()
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {

View File

@@ -37,24 +37,12 @@ func TestExtensionApplyMetadataCaptured(t *testing.T) {
req := extension.NewRequest(scope) req := extension.NewRequest(scope)
req.SetExecutionMode(true, false) req.SetExecutionMode(true, false)
sources := []string{".jpeg", ".JPG", ".jpg"} parsed, err := extension.ParseArgs([]string{".jpeg", ".JPG", ".jpg"})
canonical, display, duplicates := extension.NormalizeSourceExtensions(sources) if err != nil {
target := extension.NormalizeTargetExtension(".jpg") t.Fatalf("parse args: %v", err)
targetCanonical := extension.CanonicalExtension(target)
filteredCanonical := make([]string, 0, len(canonical))
filteredDisplay := make([]string, 0, len(display))
noOps := make([]string, 0)
for i, canon := range canonical {
if canon == targetCanonical {
noOps = append(noOps, display[i])
continue
} }
filteredCanonical = append(filteredCanonical, canon) req.SetExtensions(parsed.SourcesCanonical, parsed.SourcesDisplay, parsed.Target)
filteredDisplay = append(filteredDisplay, display[i]) req.SetWarnings(parsed.Duplicates, parsed.NoOps)
}
req.SetExtensions(filteredCanonical, filteredDisplay, target)
req.SetWarnings(duplicates, noOps)
summary, planned, err := extension.Preview(context.Background(), req, nil) summary, planned, err := extension.Preview(context.Background(), req, nil)
if err != nil { if err != nil {
@@ -72,15 +60,15 @@ func TestExtensionApplyMetadataCaptured(t *testing.T) {
} }
sourcesMeta, ok := entry.Metadata["sourceExtensions"].([]string) sourcesMeta, ok := entry.Metadata["sourceExtensions"].([]string)
if !ok || len(sourcesMeta) != len(filteredDisplay) { if !ok || len(sourcesMeta) != len(parsed.SourcesDisplay) {
t.Fatalf("sourceExtensions metadata mismatch: %#v", entry.Metadata["sourceExtensions"]) t.Fatalf("sourceExtensions metadata mismatch: %#v", entry.Metadata["sourceExtensions"])
} }
if sourcesMeta[0] != ".jpeg" { if sourcesMeta[0] != parsed.SourcesDisplay[0] || sourcesMeta[1] != parsed.SourcesDisplay[1] {
t.Fatalf("expected .jpeg in source metadata, got %v", sourcesMeta) t.Fatalf("expected display sources preserved in metadata, got %v", sourcesMeta)
} }
targetMeta, ok := entry.Metadata["targetExtension"].(string) targetMeta, ok := entry.Metadata["targetExtension"].(string)
if !ok || targetMeta != target { if !ok || targetMeta != parsed.Target {
t.Fatalf("targetExtension metadata mismatch: %v", targetMeta) t.Fatalf("targetExtension metadata mismatch: %v", targetMeta)
} }
@@ -107,13 +95,8 @@ func TestExtensionApplyMetadataCaptured(t *testing.T) {
t.Fatalf("includeHidden should be false, got %v", includeHidden) t.Fatalf("includeHidden should be false, got %v", includeHidden)
} }
warnings, ok := entry.Metadata["warnings"].([]string) if _, ok := entry.Metadata["warnings"]; ok {
if !ok || len(warnings) == 0 { t.Fatalf("did not expect warnings metadata when no duplicates were provided: %#v", entry.Metadata["warnings"])
t.Fatalf("warnings metadata missing: %#v", entry.Metadata["warnings"])
}
joined := strings.Join(warnings, " ")
if !strings.Contains(joined, "duplicate source extension") {
t.Fatalf("expected duplicate warning in metadata: %v", warnings)
} }
ledger := filepath.Join(tmp, ".renamer") ledger := filepath.Join(tmp, ".renamer")

View File

@@ -28,20 +28,29 @@ func TestParseArgsValidation(t *testing.T) {
} }
} }
_, err := extension.ParseArgs([]string{".jpg", ".JPG"}) if _, err := extension.ParseArgs([]string{".jpg", ".jpg"}); err == nil {
if err == nil { t.Fatalf("expected error when source exactly matches target")
t.Fatalf("expected error when all sources match target") }
if _, err := extension.ParseArgs([]string{".jpg", ".JPG"}); err != nil {
t.Fatalf("expected case-variant source to be accepted: %v", err)
} }
parsed, err := extension.ParseArgs([]string{".jpeg", ".JPG", ".jpg"}) parsed, err := extension.ParseArgs([]string{".jpeg", ".JPG", ".jpg"})
if err != nil { if err != nil {
t.Fatalf("unexpected error for valid args: %v", err) t.Fatalf("unexpected error for valid args: %v", err)
} }
if len(parsed.SourcesCanonical) != 1 || parsed.SourcesCanonical[0] != ".jpeg" { if len(parsed.SourcesCanonical) != 2 {
t.Fatalf("expected canonical list to contain .jpeg only, got %#v", parsed.SourcesCanonical) t.Fatalf("expected canonical list to contain two entries, got %#v", parsed.SourcesCanonical)
} }
if len(parsed.NoOps) != 1 { if parsed.SourcesCanonical[0] != ".jpeg" || parsed.SourcesCanonical[1] != ".jpg" {
t.Fatalf("expected .jpg to be treated as no-op") t.Fatalf("unexpected canonical ordering: %#v", parsed.SourcesCanonical)
}
if len(parsed.SourcesDisplay) != 2 || parsed.SourcesDisplay[1] != ".JPG" {
t.Fatalf("expected display list to preserve .JPG, got %#v", parsed.SourcesDisplay)
}
if len(parsed.NoOps) != 0 {
t.Fatalf("expected no-ops to be empty, got %#v", parsed.NoOps)
} }
} }

View File

@@ -76,3 +76,50 @@ func TestExtensionCommandFlow(t *testing.T) {
t.Fatalf("expected poster.JPG after undo: %v", err) t.Fatalf("expected poster.JPG after undo: %v", err)
} }
} }
func TestExtensionCommandSkipsCaseVariantsWithoutSource(t *testing.T) {
t.Parallel()
tmp := t.TempDir()
createFile(t, filepath.Join(tmp, "image.jpeg"))
createFile(t, filepath.Join(tmp, "poster.JPG"))
createFile(t, filepath.Join(tmp, "logo.jpg"))
var previewOut bytes.Buffer
preview := renamercmd.NewRootCommand()
preview.SetOut(&previewOut)
preview.SetErr(&previewOut)
preview.SetArgs([]string{"extension", ".jpeg", ".jpg", "--dry-run", "--path", tmp})
if err := preview.Execute(); err != nil {
t.Fatalf("preview command failed: %v\noutput: %s", err, previewOut.String())
}
output := previewOut.String()
if !strings.Contains(output, "image.jpeg -> image.jpg") {
t.Fatalf("expected preview output to include image rename, got:\n%s", output)
}
if strings.Contains(output, "poster.JPG -> poster.jpg") {
t.Fatalf("expected poster.JPG to be excluded from preview, got:\n%s", output)
}
var applyOut bytes.Buffer
apply := renamercmd.NewRootCommand()
apply.SetOut(&applyOut)
apply.SetErr(&applyOut)
apply.SetArgs([]string{"extension", ".jpeg", ".jpg", "--yes", "--path", tmp})
if err := apply.Execute(); err != nil {
t.Fatalf("apply command failed: %v\noutput: %s", err, applyOut.String())
}
if _, err := os.Stat(filepath.Join(tmp, "image.jpg")); err != nil {
t.Fatalf("expected image.jpg after apply: %v", err)
}
if _, err := os.Stat(filepath.Join(tmp, "poster.JPG")); err != nil {
t.Fatalf("expected poster.JPG to remain uppercase: %v", err)
}
if _, err := os.Stat(filepath.Join(tmp, "poster.jpg")); !os.IsNotExist(err) {
t.Fatalf("expected poster.jpg not to exist, err=%v", err)
}
}