fix bug that not saving scoring result

Author: wongoo

README.md

@@ -24,8 +24,15 @@ go get github.com/wongoo/namer
 }
 ```
 说明: 
+- `last_name`: 姓
+- `year`: 年
+- `month`: 月
+- `day`: 日
+- `hour`: 时
+- `minute`: 分
 - `gender`: 0-男, 1-女
 - `min_candidate_score`: 最小候选分数
+- `first_name_key_words`: 关键字
 
 3. 最后, 执行命令 `namer -c config.json`, 命令会输出分数排名前10的名字列表:
 ```bash
@@ -44,4 +51,4 @@ score: 82, names: [王习意 王习义 王习复 王开习 王书望]
 ## 注意
 - 配置可以修改以后再次执行;
 - 可以`ctrl+c`中断执行,立即给出已经检测的结果;
-- 命令会生成缓存文件 `config.json.score`，请勿删除;
+- 命令会在配置文件同目录下生成后缀为`.data`的缓存文件，请勿删除;

namer.go

@@ -8,7 +8,6 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -19,6 +18,15 @@ import (
 	"time"
 )
 
+func fatal(err error) {
+	fmt.Println(err)
+	os.Exit(1)
+}
+
+func fatalf(format string, err error) {
+	fmt.Printf(format, err)
+}
+
 const (
 	dataFileSuffix          = ".data"
 	dataCandidateFileSuffix = ".candidate.data"
@@ -57,8 +65,8 @@ type Config struct {
 	Hour              int    `json:"hour"`
 	Minute            int    `json:"minute"`
 	Gender            int    `json:"gender"`
-	FirstNameKeyWords string `json:"first_name_key_words"`
 	MinCandidateScore int    `json:"min_candidate_score"`
+	FirstNameKeyWords string `json:"first_name_key_words"`
 }
 
 func buildNameTestUrlPrefix() {
@@ -89,7 +97,7 @@ func getNameScore(firstName string) (int, error) {
 
 	scoreStr := content[:index]
 	score, err := strconv.Atoi(scoreStr)
-	log.Printf("name score: %s = %d", firstName, score)
+	fmt.Printf("name score: %s%s = %d\n", config.LastName, firstName, score)
 	return score, err
 
 }
@@ -147,11 +155,11 @@ func statCalculate(score *NameScore, name string) {
 func writeScoreData() {
 	bt, err := json.Marshal(scoreDB)
 	if err != nil {
-		log.Fatalf("marshal err: %v", err)
+		fatalf("marshal err: %v\n", err)
 	}
 	err = ioutil.WriteFile(*configFile+dataFileSuffix, bt, 0666)
 	if err != nil {
-		log.Fatalf("write score file error: %v", err)
+		fatalf("write score file error: %v\n", err)
 	}
 }
 
@@ -164,11 +172,11 @@ func printCandidates() {
 func writeCandidateData() {
 	bt, err := json.Marshal(candidates)
 	if err != nil {
-		log.Fatalf("marshal err: %v", err)
+		fatalf("marshal err: %v\n", err)
 	}
 	err = ioutil.WriteFile(*configFile+dataCandidateFileSuffix, bt, 0666)
 	if err != nil {
-		log.Fatalf("write candidate file error: %v", err)
+		fatalf("write candidate file error: %v\n", err)
 	}
 }
 
@@ -215,7 +223,7 @@ func oneFirstNameScoring(parent *NameScore, firstName rune) error {
 
 func twoFirstNameLoopScoring() error {
 	for i := 0; i < len(keyWords); i++ {
-		for j := 1; j < len(keyWords); j++ {
+		for j := 0; j < len(keyWords); j++ {
 			firstName1 := keyWords[i]
 			firstName2 := keyWords[j]
 
@@ -254,11 +262,14 @@ func addToTree(nameScore *NameScore, score int, firstName ...rune) {
 			parent.More = make(map[rune]*NameScore, 2)
 		}
 		name := firstName[i]
-		if _, ok := parent.More[name]; ok {
+		if child, ok := parent.More[name]; ok {
+			parent = child
 			continue
 		}
 		if i < size-1 {
-			parent.More[name] = newScore(0)
+			child := newScore(0)
+			parent.More[name] = child
+			parent = child
 			continue
 		}
 		parent.More[name] = newScore(score)
@@ -304,7 +315,7 @@ var (
 func loopScoring() {
 	defer func() {
 		if err := recover(); err != nil {
-			log.Printf("namer error: %v", err)
+			fmt.Printf("namer error: %v\n", err)
 		}
 		finishChan <- 1
 	}()
@@ -328,7 +339,7 @@ func printTop10() {
 func startCandidate() {
 	defer func() {
 		if err := recover(); err != nil {
-			log.Printf("candidate error: %v", err)
+			fmt.Printf("candidate error: %v\n", err)
 		}
 		finishChan <- 1
 	}()
@@ -374,7 +385,7 @@ func startCandidate() {
 func main() {
 	err := parseConfig()
 	if err != nil {
-		log.Fatal(err)
+		fatal(err)
 	}
 
 	go loopScoring()
@@ -384,9 +395,9 @@ func main() {
 
 	select {
 	case sig := <-signalChan:
-		log.Printf("receive stop signal: %s", sig)
+		fmt.Printf("receive stop signal: %s\n", sig)
 	case <-finishChan:
-		log.Println("scoring finish")
+		fmt.Println("scoring finish")
 	}
 
 	writeScoreData()
@@ -397,9 +408,9 @@ func main() {
 
 	select {
 	case sig := <-signalChan:
-		log.Printf("receive stop signal: %s", sig)
+		fmt.Printf("receive stop signal: %s\n", sig)
 	case <-finishChan:
-		log.Println("candidate finish")
+		fmt.Println("candidate finish")
 	}
 
 	writeScoreData()