更新README.md

Author: aQua

README.md

@@ -157,7 +157,7 @@
 |565|[Array Nesting](./Algorithms/0565.array-nesting)|☆ ☆|49%||
 |566|[Reshape the Matrix](./Algorithms/0566.reshape-the-matrix)|☆|58%||
 |581|[Shortest Unsorted Continuous Subarray](./Algorithms/0581.shortest-unsorted-continuous-subarray)|☆|29%|❤|
-|605|[Can Place Flowers](./Algorithms/0605.can-place-flowers)|☆|30%|❤|
+|605|[Can Place Flowers](./Algorithms/0605.can-place-flowers)|☆|29%|❤|
 |611|[Valid Triangle Number](./Algorithms/0611.valid-triangle-number)|☆ ☆|41%|❤|
 |621|[Task Scheduler](./Algorithms/0621.task-scheduler)|☆ ☆|42%|❤|
 |628|[Maximum Product of Three Numbers](./Algorithms/0628.maximum-product-of-three-numbers)|☆|45%|❤|

helper.v4/data.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"sort"
@@ -11,8 +13,13 @@ import (
 
 func update(categories []string) *leetcode {
 	newLC := lastest(categories)
-	oldLC := readFile()
-	diff(newLC, oldLC)
+	oldLC, err := readLeetCodeRecord()
+	if err != nil {
+		log.Println("LeetCode 记录读取失败，无法与新记录对比:", err)
+	} else {
+		diff(newLC, oldLC)
+	}
+
 	saveLC(newLC)
 
 	return newLC
@@ -33,20 +40,20 @@ func lastest(categories []string) *leetcode {
 	return lc
 }
 
-func readFile() *leetcode {
-	lc := leetcode{}
+func readLeetCodeRecord() (*leetcode, error) {
 	if !GoKit.Exist(lcFile) {
-		log.Printf("%s 不存在", lcFile)
-		return &lc
+		msg := fmt.Sprintf("%s 不存在", lcFile)
+		return nil, errors.New(msg)
 	}
 
 	raw := read(lcFile)
-
+	lc := leetcode{}
 	if err := json.Unmarshal(raw, &lc); err != nil {
-		log.Fatalf("获取 %s 失败：%s", lcFile, err)
+		msg := fmt.Sprintf("获取 %s 失败：%s", lcFile, err)
+		return nil, errors.New(msg)
 	}
 
-	return &lc
+	return &lc, nil
 }
 
 func diff(new, old *leetcode) {
@@ -101,6 +108,8 @@ func saveLC(lc *leetcode) {
 	if err = ioutil.WriteFile(lcFile, raw, 0666); err != nil {
 		log.Fatal("无法把Marshal后的lc保存到文件: ", err)
 	}
+
+	log.Println("最新的 LeetCode 记录已经保存。")
 }
 
 // data 保存API信息

helper.v4/main.go

@@ -3,10 +3,12 @@ package main
 import (
 	"fmt"
 	"log"
+	"net/http"
 	"os"
 	"strconv"
 
 	"github.com/BurntSushi/toml"
+	"github.com/mozillazg/request"
 )
 
 // 程序辅助设置
@@ -28,6 +30,9 @@ func init() {
 		log.Fatalf(err.Error())
 	}
 	log.Printf("Hi, %s. \n", cfg.Login)
+
+	// 对 req 赋值
+	req = request.NewRequest(new(http.Client))
 }
 
 func main() {
@@ -49,7 +54,10 @@ func main() {
 
 	// 下载题目资料不需要登录 leetcode
 	if problemNum > 0 {
-		lc := readFile()
+		lc, err := readLeetCodeRecord()
+		if err != nil {
+			log.Fatalln("读取 LeetCode 记录失败: ", err)
+		}
 		makeProblemDir(lc.Problems, problemNum)
 		return
 	}

helper.v4/net.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"net/http"
 	"regexp"
 	"strings"
 
@@ -24,7 +23,6 @@ func signin() {
 	log.Println("正在登录中...")
 
 	// 配置request
-	req = request.NewRequest(new(http.Client))
 	req.Headers = map[string]string{
 		"Accept-Encoding": "",
 		"Referer":         "https://leetcode.com/",
@@ -89,12 +87,12 @@ func getRaw(URL string) []byte {
 	log.Printf("开始下载 %s 的数据", URL)
 	resp, err := req.Get(URL)
 	if err != nil {
-		log.Fatal("getJSON: Get Error: " + err.Error())
+		log.Fatal("getRaw: Get Error: " + err.Error())
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		log.Fatal("getJSON: Read Error: " + err.Error())
+		log.Fatal("getRaw: Read Error: " + err.Error())
 	}
 	return body
 }

helper.v4/problem.go

@@ -16,6 +16,8 @@ import (
 func makeProblemDir(ps problems, problemNum int) {
 	var pb problem
 	var isFound bool
+
+	// 根据题号，获取题目信息
 	for _, p := range ps {
 		if p.ID == problemNum {
 			pb = p
@@ -25,21 +27,16 @@ func makeProblemDir(ps problems, problemNum int) {
 	}
 
 	if !isFound {
-		log.Printf("没有发现 %d 题，此题不存在，或者需要付费，或者不在已关注的种类中。", problemNum)
-		return
-	}
-
-	if pb.IsAccepted && GoKit.Exist(pb.Dir) {
-		log.Printf("第 %d 题已经accepted，请删除 %s 文件夹后，再尝试。", pb.ID, pb.Dir)
+		log.Printf("没有发现 %d 题，存在以下可能：1.此题不存在；2.需要付费；3.不在已关注的种类中。", problemNum)
 		return
 	}
 
 	pb.build()
 }
 
 func (p problem) build() {
-	if err := os.RemoveAll(p.Dir); err != nil {
-		log.Fatalln("无法删除目录", p.Dir)
+	if p.IsAccepted && GoKit.Exist(p.Dir) {
+		log.Fatalf("第 %d 题已经accepted，请**删除**或**重命名**  %s 文件夹后，再尝试。", p.ID, p.Dir)
 	}
 
 	mask := syscall.Umask(0)