opt

Author: quixote-liu

README.md

@@ -19,7 +19,36 @@
 ## 示例
 
 ```shell
-cloc /src -sort code -order desc
+cloc /src -sort code -order asc
+```
+会打印输出为：
+```
+│----.gitignore
+│----LICENSE
+│----README.md
+│----cloc
+│----dir_command.go ---------->[codes: 112]
+│----go.mod
+│----go.sum
+│----main.go ---------->[codes: 58]
+│----options.go ---------->[codes: 112]
+│----options_test.go ---------->[codes: 37]
+│----page_command.go ---------->[codes: 44]
+│----page_judge.go ---------->[codes: 65]
+│----page_point.go ---------->[codes: 67]
+│----testdata
+│----│----dir
+│----│----│----heihei
+│----│----│----│----here
+│----│----│----hello.go ---------->[codes: 0]
+│----│----│----text
+│----│----heihei.go ---------->[codes: 37]
+│----│----hello.html ---------->[codes: 0]
+│----│----text
+│----util.go ---------->[codes: 20]
+
+[codes total]: 552
+
 ```
 
 ## 参数说明

dir_command.go

@@ -12,7 +12,10 @@ type dirCmd struct {
 	orderOpt Optioner
 	sortOpt  Optioner
 
-	files int
+	files         int64
+	codesTotal    int64
+	blanksTotal   int64
+	commentsTotal int64
 }
 
 func newDirCmd(path string) cmder {
@@ -30,9 +33,19 @@ func (cmd *dirCmd) run(opts map[string]string) (int, error) {
 		return ExitCodeFailed, fmt.Errorf("the count of directory does not support options: [%s]", serializeMap(opts))
 	}
 	cmd.readFileNames(cmd.path, "")
-	if cmd.sortOpt.value() == sortValueFiles {
-		fmt.Println()
+	fmt.Println()
+	switch cmd.sortOpt.value() {
+	case sortValueFiles:
 		fmt.Printf("the all files number: %d\n", cmd.files)
+	case sortValueBlank:
+		fmt.Printf("[blanks total]: %d\n", cmd.blanksTotal)
+	case sortValueCode:
+		fmt.Printf("[codes total]: %d\n", cmd.codesTotal)
+	case sortValueComment:
+		fmt.Printf("[comments total]: %d\n", cmd.commentsTotal)
+	default:
+		fmt.Printf("[total]: codes: %d, comments: %d, blanks: %d\n\n", cmd.codesTotal,
+			cmd.commentsTotal, cmd.blanksTotal)
 	}
 	return ExitCodeSuccess, nil
 }
@@ -74,6 +87,13 @@ func (cmd *dirCmd) readFileNames(path, prefix string) {
 			fmt.Println(prefix + e.Name() + " [ERROR: read failed]")
 			continue
 		}
+
+		// total directory page messages
+		cmd.codesTotal += int64(pp.codes)
+		cmd.commentsTotal += int64(pp.comments)
+		cmd.blanksTotal += int64(pp.blanks)
+
+		// print the result
 		var tail string
 		switch sortValue {
 		case sortValueCode:

page_judge.go

@@ -25,16 +25,16 @@ func (pj *pageJudge) notHaveNotes() bool {
 
 func (pj *pageJudge) beginWithMultilineNotes(line string) bool {
 	begin := pj.multilineNotesChars[0]
-	return strings.HasPrefix(line, begin)
+	return strings.HasPrefix(strings.TrimSpace(line), begin)
 }
 
 func (pj *pageJudge) tailWithMultilineNotes(line string) bool {
 	tail := pj.multilineNotesChars[1]
-	return strings.HasSuffix(line, tail)
+	return strings.HasSuffix(strings.TrimSpace(line), tail)
 }
 
 func (pj *pageJudge) isSingleLineNotes(line string) bool {
-	return strings.HasPrefix(line, pj.singleLineNotesChar)
+	return strings.HasPrefix(strings.TrimSpace(line), pj.singleLineNotesChar)
 }
 
 func (pj *pageJudge) isBlank(line string) bool {