bolt replace json file

Author: gladmo

.gitignore

@@ -16,5 +16,4 @@
 
 leetcode
 /solutions/
-questions/all_problems.json
 .private.db

.leetcode.db

@@ -36,7 +36,7 @@ var backupCmd = &cobra.Command{
 			}
 
 			info := leet.GetQuestionInfo(param)
-			info.Print(withDetail)
+			leet.InfoPrint(info, withDetail)
 
 			for _, dir := range info.SaveDir {
 				err = leet.BackupClear{

cmd/command/backup.go

@@ -36,7 +36,7 @@ var baseCmd = &cobra.Command{
 			}
 
 			info := leet.GetQuestionInfo(param)
-			info.Print(withDetail)
+			leet.InfoPrint(info, withDetail)
 
 			for idx, dir := range info.SaveDir {
 

cmd/command/base.go

@@ -40,7 +40,7 @@ var clearCmd = &cobra.Command{
 			}
 
 			info := leet.GetQuestionInfo(param)
-			info.Print(withDetail)
+			leet.InfoPrint(info, withDetail)
 			fmt.Println(fmt.Sprintf("%s: %s", info.QuestionID, info.Title))
 
 			for _, dir := range info.SaveDir {

cmd/command/clear.go

@@ -52,7 +52,7 @@ leetcode get https://leetcode-cn.com/problems/k-th-symbol-in-grammar/solution/
 
 		res.Download(override)
 
-		leet.GetQuestionInfo(param).Print(withDetail)
+		leet.InfoPrint(leet.GetQuestionInfo(param), withDetail)
 	},
 }
 

cmd/command/get.go

@@ -29,7 +29,8 @@ var infoCmd = &cobra.Command{
 			fmt.Println(err.Error())
 		}
 
-		leet.GetQuestionInfo(param).Print(withDetail)
+		fmt.Println(leet.GetQuestionInfo(param))
+		leet.InfoPrint(leet.GetQuestionInfo(param), withDetail)
 	},
 }
 

cmd/command/info.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"os"
-	"path"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/gladmo/leetcode/store"
 )
 
 const UA = `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36`
@@ -60,12 +60,7 @@ const (
 // param: leetcode-cn.com/problems/k-th-symbol-in-grammar
 func Parse(param string) string {
 	if match, err := regexp.MatchString(`\d+`, param); err == nil && match {
-		stat, err := ProblemID2name(param, true)
-		if err == nil {
-			return stat.QuestionTitleSlug
-		}
-
-		stat, err = ProblemID2name(param, false)
+		stat, err := ProblemID2name(param)
 		if err == nil {
 			return stat.QuestionTitleSlug
 		}
@@ -99,15 +94,11 @@ func ParseFromURL(param string) string {
 }
 
 // ProblemID2name return problem info
-func ProblemID2name(id string, cache bool) (stats QuestionStats, err error) {
-	allProblemsDir := path.Join("questions", "all_problems.json")
-
-	if cache {
-		// 文件是否存在 / 结果是否过期
-		f, err := os.Stat(allProblemsDir)
-
-		if err == nil && !f.IsDir() && f.ModTime().After(time.Now().Add(-cacheDuration)) {
-			return problemID2name(id)
+func ProblemID2name(id string) (stats store.QuestionStats, err error) {
+	if ok, err := store.ProblemInfoIsExpire(); err == nil && !ok {
+		stats, err = store.GetProblemsInfo(id)
+		if err == nil {
+			return stats, err
 		}
 	}
 
@@ -116,41 +107,22 @@ func ProblemID2name(id string, cache bool) (stats QuestionStats, err error) {
 		return
 	}
 
-	b, err := json.Marshal(allProblemsResult)
-	if err != nil {
-		return
-	}
-
-	err = ioutil.WriteFile(allProblemsDir, b, 0755)
-	if err != nil {
-		return
+	var infos []store.QuestionStats
+	for _, pair := range allProblemsResult.StatStatusPairs {
+		infos = append(infos, pair.Stat)
 	}
 
-	return problemID2name(id)
-}
-
-func problemID2name(id string) (stats QuestionStats, err error) {
-	allProblemsDir := path.Join("questions", "all_problems.json")
-
-	b, err := ioutil.ReadFile(allProblemsDir)
+	err = store.UpdateProblems(infos)
 	if err != nil {
-		return
+		fmt.Println(err.Error())
 	}
 
-	var apr AllProblemsResult
-	err = json.Unmarshal(b, &apr)
+	err = store.ProblemsTTL(time.Now().Add(cacheDuration))
 	if err != nil {
 		return
 	}
 
-	for _, pair := range apr.StatStatusPairs {
-		if fmt.Sprint(pair.Stat.QuestionID) == id {
-			return pair.Stat, nil
-		}
-	}
-
-	err = fmt.Errorf(`problem id: %s,  not found`, id)
-	return
+	return store.GetProblemsInfo(id)
 }
 
 func allProblems() (apr AllProblemsResult, err error) {
@@ -198,8 +170,8 @@ type AllProblemsResult struct {
 	AcMedium        int    `json:"ac_medium"`
 	AcHard          int    `json:"ac_hard"`
 	StatStatusPairs []struct {
-		Stat       QuestionStats `json:"stat"`
-		Status     interface{}   `json:"status"`
+		Stat       store.QuestionStats `json:"stat"`
+		Status     interface{}         `json:"status"`
 		Difficulty struct {
 			Level int `json:"level"`
 		} `json:"difficulty"`
@@ -213,18 +185,6 @@ type AllProblemsResult struct {
 	CategorySlug  string `json:"category_slug"`
 }
 
-type QuestionStats struct {
-	QuestionID          int    `json:"question_id"`
-	QuestionTitle       string `json:"question__title"`
-	QuestionTitleSlug   string `json:"question__title_slug"`
-	QuestionHide        bool   `json:"question__hide"`
-	TotalAcs            int    `json:"total_acs"`
-	TotalSubmitted      int    `json:"total_submitted"`
-	TotalColumnArticles int    `json:"total_column_articles"`
-	FrontendQuestionID  string `json:"frontend_question_id"`
-	IsNewQuestion       bool   `json:"is_new_question"`
-}
-
 func Fetch(title string) (qd QuestionDetail, err error) {
 	URL := "https://leetcode-cn.com/graphql/"
 

leet/leetcode.go

@@ -1,66 +1,35 @@
 package leet
 
 import (
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
-	"path"
 	"strings"
 
 	"github.com/olekukonko/tablewriter"
-)
-
-var store = make(map[string]Store)
-var storeFile = path.Join("questions", "store.json")
 
-func init() {
-	updateCache()
-}
-
-func updateCache() (err error) {
-	b, err := ioutil.ReadFile(storeFile)
-	if err != nil {
-		return
-	}
+	"github.com/gladmo/leetcode/store"
+)
 
-	err = json.Unmarshal(b, &store)
-	if err != nil {
+func InfoPrint(info store.Store, withDetail bool) {
+	if info.QuestionID == "" {
+		fmt.Println("问题还未下载到本地，请先使用 get 命令下载")
 		return
 	}
-
-	return
-}
-
-type Store struct {
-	Title           string   `json:"title"`
-	TranslatedTitle string   `json:"translated_title"`
-	QuestionID      string   `json:"question_id"`
-	Languages       []string `json:"language"`
-	Tags            []string `json:"tags"`
-
-	Difficulty string   `json:"difficulty"`
-	SaveDir    []string `json:"save_dir"`
-	TitleSlug  string   `json:"title_slug"`
-	Question   string   `json:"question"`
-}
-
-func (th Store) Print(withDetail bool) {
 	table := tablewriter.NewWriter(os.Stdout)
 	table.SetRowLine(true)
 
-	table.Append([]string{"标题", th.Title})
-	table.Append([]string{"问题ID", th.QuestionID})
-	table.Append([]string{"中文标题", th.TranslatedTitle})
-	// table.Append([]string{"语言列表", strings.Join(th.Languages, ",")})
-	table.Append([]string{"标签", strings.Join(th.Tags, ",")})
-	table.Append([]string{"难度", th.Difficulty})
-	codeLine := fmt.Sprintf("%s/README.md:2", th.SaveDir[0])
+	table.Append([]string{"标题", info.Title})
+	table.Append([]string{"问题ID", info.QuestionID})
+	table.Append([]string{"中文标题", info.TranslatedTitle})
+	// table.Append([]string{"语言列表", strings.Join(info.Languages, ",")})
+	table.Append([]string{"标签", strings.Join(info.Tags, ",")})
+	table.Append([]string{"难度", info.Difficulty})
+	codeLine := fmt.Sprintf("%s/README.md:2", info.SaveDir[0])
 	table.Append([]string{"题目描述", codeLine})
 	goFileDir := fmt.Sprintf(
 		"%s/golang/solution/%s.go",
-		th.SaveDir[0],
-		th.TitleSlug)
+		info.SaveDir[0],
+		info.TitleSlug)
 	goCodeLine := fmt.Sprintf(
 		"%s:%d",
 		goFileDir,
@@ -71,33 +40,38 @@ func (th Store) Print(withDetail bool) {
 	table.Render()
 
 	if withDetail {
-		fmt.Println(th.Question)
+		fmt.Println(info.Question)
 	}
 }
 
-func GetQuestionInfo(titleSlug string) (info Store) {
-	s, ok := store[titleSlug]
-	if !ok {
-		return
+func GetQuestionInfoByID(questionID string) (info store.Store) {
+	var err error
+	info, err = store.QuestionInfo(questionID)
+	if err != nil {
+		fmt.Println(err.Error())
 	}
-
-	return s
+	return
 }
 
-func GetAllQuestionTitleSlug() (res []string) {
-	for titleSlug := range store {
-		res = append(res, titleSlug)
+func GetQuestionInfo(titleSlug string) (info store.Store) {
+	var err error
+	info, err = store.QuestionInfo(titleSlug)
+	if err != nil {
+		fmt.Println(err.Error())
 	}
-
 	return
 }
 
-func UpdateQuestionInfo(que Question, local Localization) {
-	err := updateCache()
+func GetAllQuestionTitleSlug() (res []string) {
+	var err error
+	res, err = store.AllQuestionTitleSlug()
 	if err != nil {
 		fmt.Println(err.Error())
 	}
+	return
+}
 
+func UpdateQuestionInfo(que Question, local Localization) {
 	var tags []string
 	for _, topicTag := range que.TopicTags {
 		tags = append(tags, topicTag.TranslatedName)
@@ -108,7 +82,7 @@ func UpdateQuestionInfo(que Question, local Localization) {
 		langs = append(langs, lan.LangSlug)
 	}
 
-	info := Store{
+	info := store.Store{
 		Title:           que.Title,
 		TranslatedTitle: que.TranslatedTitle,
 		QuestionID:      local.QuestionID,
@@ -120,14 +94,7 @@ func UpdateQuestionInfo(que Question, local Localization) {
 		Question:        local.Question,
 	}
 
-	store[info.TitleSlug] = info
-	b, err := json.Marshal(store)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	err = ioutil.WriteFile(storeFile, b, 0755)
+	err := store.UpdateQuestionInfo(info)
 	if err != nil {
 		fmt.Println(err.Error())
 	}