optimize directory reading logic

Author: quixote-liu

dir_command.go

@@ -10,21 +10,30 @@ import (
 type dirCmd struct {
 	path     string
 	orderOpt Optioner
+	sortOpt  Optioner
+
+	files int
 }
 
 func newDirCmd(path string) cmder {
 	return &dirCmd{
 		path:     path,
 		orderOpt: newOrderOption(),
+		sortOpt:  newSortOption(),
 	}
 }
 
 func (cmd *dirCmd) run(opts map[string]string) (int, error) {
 	opts = cmd.orderOpt.extract(opts)
+	opts = cmd.sortOpt.extract(opts)
 	if len(opts) != 0 {
 		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.Printf("the all files number: %d\n", cmd.files)
+	}
 	return ExitCodeSuccess, nil
 }
 
@@ -35,14 +44,48 @@ func (cmd *dirCmd) readFileNames(path, prefix string) {
 		os.Exit(ExitCodeFailed)
 	}
 	entries = cmd.sortEntries(entries)
+	sortValue := cmd.sortOpt.value()
 	prefix += "│----"
 	for _, e := range entries {
-		fmt.Println(prefix + e.Name())
+		// deal directory
+		p := filepath.Join(path, e.Name())
 		if e.IsDir() {
-			p := filepath.Join(path, e.Name())
+			fmt.Println(prefix + e.Name())
 			cmd.readFileNames(p, prefix)
 			continue
 		}
+
+		// increment files number
+		cmd.files++
+		if sortValue == sortValueFiles {
+			fmt.Println(prefix + e.Name())
+			continue
+		}
+
+		// read file points
+		ext := filepath.Ext(p)
+		pj, miss := newPageJudger(ext)
+		if miss {
+			fmt.Println(prefix + e.Name())
+			continue
+		}
+		pp := newPagePoint()
+		if err := pp.extract(p, pj); err != nil {
+			fmt.Println(prefix + e.Name() + " [ERROR: read failed]")
+			continue
+		}
+		var tail string
+		switch sortValue {
+		case sortValueCode:
+			tail = fmt.Sprintf("[codes: %d]", pp.codes)
+		case sortValueBlank:
+			tail = fmt.Sprintf("[blanks: %d]", pp.blanks)
+		case sortValueComment:
+			tail = fmt.Sprintf("[comments: %d]", pp.comments)
+		default:
+			tail = fmt.Sprintf("[codes: %d, comments: %d, blanks: %d]", pp.codes, pp.comments, pp.blanks)
+		}
+		fmt.Println(prefix + e.Name() + " ---------->" + tail)
 	}
 }