fix uloc display for no complexity · boyter/scc@9d3008f

Original file line numberDiff line numberDiff line change

@@ -39,6 +39,8 @@ var tabularShortFormatBodyNoComplexity = "%-22s %11d %11d %10d %11d %9d\n"

3939

var tabularShortFormatFileNoComplexity = "%s %11d %10d %11d %9d\n"

4040

var longNameTruncate = 22

4141
42+

var tabularShortUlocLanguageFormatBodyNoComplexity = "(ULOC) %39d\n"

43+
4244

var tabularWideBreak = "─────────────────────────────────────────────────────────────────────────────────────────────────────────────\n"

4345

var tabularWideBreakCi = "-------------------------------------------------------------------------------------------------------------\n"

4446

var tabularWideFormatHead = "%-33s %9s %9s %8s %9s %8s %10s %16s\n"

@@ -1094,7 +1096,12 @@ func fileSummarizeShort(input chan *FileJob) string {

10941096

}

10951097
10961098

if UlocMode {

1097-

str.WriteString(fmt.Sprintf(tabularShortUlocLanguageFormatBody, len(ulocLanguageCount[summary.Name])))

1099+

if !Complexity {

1100+

str.WriteString(fmt.Sprintf(tabularShortUlocLanguageFormatBody, len(ulocLanguageCount[summary.Name])))

1101+

} else {

1102+

str.WriteString(fmt.Sprintf(tabularShortUlocLanguageFormatBodyNoComplexity, len(ulocLanguageCount[summary.Name])))

1103+

}

1104+
10981105

if !Files && summary.Name != language[len(language)-1].Name {

10991106

str.WriteString(tabularShortBreakCi)

11001107

}

@@ -1207,8 +1214,7 @@ func calculateSize(sumBytes int64, str *strings.Builder) {

12071214

size = float64(sumBytes) / 1_024_000

12081215

case "xkcd-kb":

12091216

str.WriteString("1000 bytes during leap years, 1024 otherwise\n")

1210-

tim := time.Now()

1211-

if isLeapYear(tim.Year()) {

1217+

if isLeapYear(time.Now().Year()) {

12121218

size = float64(sumBytes) / 1_000_000

12131219

}

12141220

case "xkcd-kelly":