Skip to content
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

Jump to bottom

Use strings.EqualFold in case-insensitive comparisons #479

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Use strings.EqualFold in case-insensitive comparisons #479

Show file tree
Hide file tree
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
24 changes: 12 additions & 12 deletions processor/formatters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,27 +784,27 @@ func fileSummarize(input chan *FileJob) string {
}

switch {
case More || strings.ToLower(Format) == "wide":
case More || strings.EqualFold(Format, "wide"):
return fileSummarizeLong(input)
case strings.ToLower(Format) == "json":
case strings.EqualFold(Format, "json"):
return toJSON(input)
case strings.ToLower(Format) == "json2":
case strings.EqualFold(Format, "json2"):
return toJSON2(input)
case strings.ToLower(Format) == "cloc-yaml" || strings.ToLower(Format) == "cloc-yml":
case strings.EqualFold(Format, "cloc-yaml") || strings.EqualFold(Format, "cloc-yml"):
return toClocYAML(input)
case strings.ToLower(Format) == "csv":
case strings.EqualFold(Format, "csv"):
return toCSV(input)
case strings.ToLower(Format) == "csv-stream":
case strings.EqualFold(Format, "csv-stream"):
return toCSVStream(input)
case strings.ToLower(Format) == "html":
case strings.EqualFold(Format, "html"):
return toHtml(input)
case strings.ToLower(Format) == "html-table":
case strings.EqualFold(Format, "html-table"):
return toHtmlTable(input)
case strings.ToLower(Format) == "sql":
case strings.EqualFold(Format, "sql"):
return toSql(input)
case strings.ToLower(Format) == "sql-insert":
case strings.EqualFold(Format, "sql-insert"):
return toSqlInsert(input)
case strings.ToLower(Format) == "openmetrics":
case strings.EqualFold(Format, "openmetrics"):
return toOpenMetrics(input)
}

Expand Down Expand Up @@ -1413,7 +1413,7 @@ func calculateSize(sumBytes int64, str *strings.Builder) {
SizeUnit = "SI"
}

if strings.ToLower(SizeUnit) != "xkcd-imaginary" {
if !strings.EqualFold(SizeUnit, "xkcd-imaginary") {
str.WriteString(fmt.Sprintf("Processed %d bytes, %.3f megabytes (%s)\n", sumBytes, size, strings.ToUpper(SizeUnit)))
}
}
Expand Down
2 changes: 1 addition & 1 deletion processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func setupCountAs() {
// See if we can identify based on language name which is the most
// reliable as the name should be unique
for name := range languageDatabase {
if strings.ToLower(name) == strings.ToLower(t[1]) {
if strings.EqualFold(name, t[1]) {
apocelipes marked this conversation as resolved.
Show resolved Hide resolved
ExtensionToLanguage[strings.ToLower(t[0])] = []string{name}
identified = true
if Debug {
Expand Down
Loading