change direcotry structure

Author: colinz2

.gitignore

@@ -5,6 +5,10 @@
 *.so
 *.dylib
 
+*.idea
+.password
+all_problems.json
+
 # Test binary, built with `go test -c`
 *.test
 

cmd/collect_all.go

@@ -1,38 +1,20 @@
 package main
 
 import (
-	"github.com/realzhangm/leetcode_collector/collector"
+	collector "github.com/realzhangm/leetcode_collector/pkg/collector"
+	"github.com/realzhangm/leetcode_collector/pkg/doa"
 )
 
 // 实现简单的功能
-// 将 Leetcode 上的提交的代码，同步到本地，并生产一个 Markdown 汇总文件。
-func extractOneMarkDown() {
+// 将 LeetCode 上的提交的代码，同步到本地，并生产一个 Markdown 汇总文件。
+func run() {
 	c := collector.NewCollector(collector.GetConfig())
-	if err := c.LoadInfo(); err != nil {
-		panic(err)
-	}
-
-	err := c.FetchFromLeetCode()
-	if err != nil {
-		panic(err)
-	}
-
-	//err = c.ExtractOneMarkDown()
-	//if err != nil {
-	//	panic(err)
-	//}
-}
-
-func json2Md() {
-	c := collector.NewCollector(collector.GetConfig())
-	if err := c.LoadInfo(); err != nil {
-		panic(err)
-	}
-	c.Json2MD()
-	c.OutputSolutions()
+	doa.MustOK(c.LoadInfo())
+	doa.MustOK(c.FetchAllFromLeetCode())
+	doa.MustOK(c.JsonToMarkDown())
+	doa.MustOK(c.OutputSolutionsCode())
 }
 
 func main() {
-	extractOneMarkDown()
-	json2Md()
+	run()
 }

collector/bufferpool/bufferpool.go renamed to pkg/bufferpool/bufferpool.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	leetcode_cli2 "github.com/realzhangm/leetcode_collector/pkg/collector/leetcode_cli"
+	"github.com/realzhangm/leetcode_collector/pkg/collector/model"
+	"github.com/realzhangm/leetcode_collector/pkg/util"
 	"os"
 	"path"
 	"strconv"
@@ -14,9 +17,6 @@ import (
 
 import (
 	"github.com/pkg/errors"
-	"github.com/realzhangm/leetcode_collector/collector/leetcode_cli"
-	"github.com/realzhangm/leetcode_collector/collector/model"
-	"github.com/realzhangm/leetcode_collector/collector/util"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -26,22 +26,22 @@ var (
 )
 
 type Collector struct {
-	ltClit *leetcode_cli.Client
+	ltClit *leetcode_cli2.Client
 	conf   Config
 
 	personInfo model.PersonInfoNode
 }
 
 func NewCollector(c *Config) *Collector {
 	collector := &Collector{
-		ltClit: leetcode_cli.NewClient(&c.ltClientConf),
+		ltClit: leetcode_cli2.NewClient(&c.ltClientConf),
 		conf:   *c,
 		personInfo: model.PersonInfoNode{
 			Mutex:            sync.Mutex{},
 			InfoNode:         model.InfoNode{},
-			AcProblems:       make(map[string]leetcode_cli.ProblemStatus),
-			AcProblemsDetail: make(map[string]leetcode_cli.Question),
-			AcSubmissions:    make(map[string]map[string]leetcode_cli.SubmissionDetail),
+			AcProblems:       make(map[string]leetcode_cli2.ProblemStatus),
+			AcProblemsDetail: make(map[string]leetcode_cli2.Question),
+			AcSubmissions:    make(map[string]map[string]leetcode_cli2.SubmissionDetail),
 		},
 	}
 	return collector
@@ -69,7 +69,7 @@ func (c *Collector) fetchAcProblemsDetail() error {
 		return nil
 	})
 
-	tmpMap := make(map[string]*leetcode_cli.Question)
+	tmpMap := make(map[string]*leetcode_cli2.Question)
 	mu := new(sync.Mutex)
 	for i := 0; i < reqRoutineNum; i++ {
 		g.Go(func() error {
@@ -148,8 +148,8 @@ func tryNTimes(n int, f func(i int) error) error {
 }
 
 // 从sbl中选择
-func (c *Collector) submissionForOneLang(sbl []leetcode_cli.Submission) map[string]leetcode_cli.Submission {
-	langSubmissionMap := make(map[string]leetcode_cli.Submission)
+func (c *Collector) submissionForOneLang(sbl []leetcode_cli2.Submission) map[string]leetcode_cli2.Submission {
+	langSubmissionMap := make(map[string]leetcode_cli2.Submission)
 	for _, sb := range sbl {
 		v, e := langSubmissionMap[sb.Lang]
 		if !e || strings.Compare(v.Timestamp, sb.Timestamp) < 0 {
@@ -232,7 +232,7 @@ func (c *Collector) fetchAllSubmissionsXX() error {
 	g, ctx := errgroup.WithContext(context.TODO())
 
 	slugChan := make(chan string)
-	submissionsChan := make(chan *leetcode_cli.SubmissionsByQuestionResponse)
+	submissionsChan := make(chan *leetcode_cli2.SubmissionsByQuestionResponse)
 
 	g.Go(func() error {
 		defer close(slugChan)
@@ -265,7 +265,7 @@ func (c *Collector) fetchAllSubmissionsXX() error {
 
 	g.Go(func() error {
 		for sbs := range submissionsChan {
-			langSubmissionMap := make(map[string]leetcode_cli.Submission)
+			langSubmissionMap := make(map[string]leetcode_cli2.Submission)
 			for _, sb := range sbs.SubmissionList.Submissions {
 				v, e := langSubmissionMap[sb.Lang]
 				if !e || strings.Compare(v.Timestamp, sb.Timestamp) < 0 {
@@ -309,7 +309,7 @@ func (c *Collector) LoadInfo() error {
 	return nil
 }
 
-func (c *Collector) FetchFromLeetCode() error {
+func (c *Collector) FetchAllFromLeetCode() error {
 	// 所有的AC
 	if err := c.fetchAllProblems(); err != nil {
 		return err
@@ -366,24 +366,11 @@ func (c *Collector) dumpInfo() error {
 	return nil
 }
 
-func (c *Collector) ExtractOneMarkDown() error {
-	for slug, v := range c.personInfo.AcProblems {
-		fmt.Printf("slug=%s %v %s \n", slug, v.IsFavor, c.personInfo.AcProblemsDetail[slug].QuestionID)
-	}
-
-	for slug, v := range c.personInfo.AcProblemsDetail {
-		fmt.Printf("slugPD=%s %v \n", slug, v.QuestionID)
-	}
-
-	fmt.Println("len(c.personInfo.AcProblemsDetail)=", len(c.personInfo.AcProblemsDetail))
-	return nil
-}
-
-func (c *Collector) Json2MD() error {
+func (c *Collector) JsonToMarkDown() error {
 	mdPath := path.Join(c.conf.OutputDir, "README.md")
 	return c.personInfo.Json2Md(mdPath)
 }
 
-func (c *Collector) OutputSolutions() error {
+func (c *Collector) OutputSolutionsCode() error {
 	return c.personInfo.OutputSolutions(c.conf.SolutionsDir)
 }

collector/collector.go renamed to pkg/collector/collector.go

@@ -3,6 +3,7 @@ package collector
 import (
 	"bufio"
 	"fmt"
+	"github.com/realzhangm/leetcode_collector/pkg/collector/leetcode_cli"
 	"os"
 	"path"
 	"strings"
@@ -12,7 +13,6 @@ import (
 	"github.com/howeyc/gopass"
 	"github.com/jinzhu/configor"
 	"github.com/pkg/errors"
-	"github.com/realzhangm/leetcode_collector/collector/leetcode_cli"
 )
 
 type Config struct {

collector/config.go renamed to pkg/collector/config.go

@@ -5,6 +5,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/realzhangm/leetcode_collector/pkg/bufferpool"
+	"github.com/realzhangm/leetcode_collector/pkg/util"
 	"io"
 	"log"
 	"net"
@@ -18,8 +20,6 @@ import (
 import (
 	"github.com/machinebox/graphql"
 	"github.com/pkg/errors"
-	"github.com/realzhangm/leetcode_collector/collector/bufferpool"
-	"github.com/realzhangm/leetcode_collector/collector/util"
 )
 
 const (

collector/leetcode_cli/client.go renamed to pkg/collector/leetcode_cli/client.go

@@ -2,6 +2,8 @@ package model
 
 import (
 	"fmt"
+	"github.com/realzhangm/leetcode_collector/pkg/bufferpool"
+	leetcode_cli2 "github.com/realzhangm/leetcode_collector/pkg/collector/leetcode_cli"
 	"os"
 	"sort"
 	"strconv"
@@ -10,11 +12,6 @@ import (
 	"time"
 )
 
-import (
-	"github.com/realzhangm/leetcode_collector/collector/bufferpool"
-	"github.com/realzhangm/leetcode_collector/collector/leetcode_cli"
-)
-
 const markdownTemplate = `
 <p align="center"><img width="300" src="https://raw.githubusercontent.com/KivenCkl/LeetCode_Helper/master/imgs/leetcode-logo.png"></p>
 <p align="center">
@@ -42,8 +39,8 @@ const TableLine1 = `|{frontend_id}|{title}{paid_only}{is_favor}|{solutions}|{ac_
 
 type TableLineFormat struct {
 	slug string
-	ps   *leetcode_cli.ProblemStatus
-	q    *leetcode_cli.Question
+	ps   *leetcode_cli2.ProblemStatus
+	q    *leetcode_cli2.Question
 }
 
 func (t TableLineFormat) frontendId() string {
@@ -61,7 +58,7 @@ func (t TableLineFormat) solutions() string {
 
 func (t TableLineFormat) title() string {
 	return fmt.Sprintf("[%s](%s%s)",
-		t.ps.Stat.QuestionTitle, leetcode_cli.UrlProblems, t.ps.Stat.QuestionTitleSlug)
+		t.ps.Stat.QuestionTitle, leetcode_cli2.UrlProblems, t.ps.Stat.QuestionTitleSlug)
 }
 
 func (t TableLineFormat) paidOnly() string {
@@ -93,7 +90,7 @@ func (t TableLineFormat) tags() string {
 	res := ""
 	for _, tag := range t.q.TopicTags {
 		res += fmt.Sprintf("[%s](%s%s)",
-			tag.TranslatedName, leetcode_cli.UrlTag, tag.Slug) + "<br>"
+			tag.TranslatedName, leetcode_cli2.UrlTag, tag.Slug) + "<br>"
 	}
 	return res
 }
@@ -123,15 +120,15 @@ func (t *TableLineFormat) templateExe() string {
 	return buffer.String()
 }
 
-type SubmissionDetailSlice []leetcode_cli.SubmissionDetail
+type SubmissionDetailSlice []leetcode_cli2.SubmissionDetail
 
 func (s SubmissionDetailSlice) Len() int      { return len(s) }
 func (s SubmissionDetailSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
 func (s SubmissionDetailSlice) Less(i, j int) bool {
 	return strings.Compare(s[i].Lang, s[i].Lang) < 0
 }
 
-type ProblemStatusSlice []leetcode_cli.ProblemStatus
+type ProblemStatusSlice []leetcode_cli2.ProblemStatus
 
 func (s ProblemStatusSlice) Len() int      { return len(s) }
 func (s ProblemStatusSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }

collector/leetcode_cli/graphql.go renamed to pkg/collector/leetcode_cli/graphql.go

@@ -3,6 +3,9 @@ package model
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/realzhangm/leetcode_collector/pkg/bufferpool"
+	leetcode_cli2 "github.com/realzhangm/leetcode_collector/pkg/collector/leetcode_cli"
+	"github.com/realzhangm/leetcode_collector/pkg/util"
 	"os"
 	"path"
 	"sort"
@@ -11,12 +14,6 @@ import (
 	"time"
 )
 
-import (
-	"github.com/realzhangm/leetcode_collector/collector/bufferpool"
-	"github.com/realzhangm/leetcode_collector/collector/leetcode_cli"
-	"github.com/realzhangm/leetcode_collector/collector/util"
-)
-
 // 题目描述 README 中文模板
 const SolutionReadme = `
 # {{title_cn}}
@@ -68,15 +65,15 @@ type SolutionReadMeFormatter struct {
 	slug       string
 	preSlug    string
 	nextSlug   string
-	subLangMap map[string]leetcode_cli.SubmissionDetail
-	question   *leetcode_cli.Question
+	subLangMap map[string]leetcode_cli2.SubmissionDetail
+	question   *leetcode_cli2.Question
 	p          *PersonInfoNode
 }
 
 // 支持函数参数
 func (s SolutionReadMeFormatter) titleCn() string {
 	return fmt.Sprintf("[%s](%s%s)",
-		s.question.TranslatedTitle, leetcode_cli.UrlProblems, s.slug)
+		s.question.TranslatedTitle, leetcode_cli2.UrlProblems, s.slug)
 }
 
 func (s SolutionReadMeFormatter) contentCn() string {
@@ -107,7 +104,7 @@ func (s SolutionReadMeFormatter) tagsCn() string {
 	res := ""
 	for _, tag := range s.question.TopicTags {
 		res += fmt.Sprintf("- [%s](%s%s) \n",
-			tag.TranslatedName, leetcode_cli.UrlTag, tag.Slug)
+			tag.TranslatedName, leetcode_cli2.UrlTag, tag.Slug)
 	}
 	return res
 }
@@ -167,7 +164,7 @@ func (s *SolutionReadMeFormatter) outPutSolutionReadme(slugDir string) {
 	}
 }
 
-func (p *PersonInfoNode) writeOneSourceCode(slugDir, slug string, subDetail *leetcode_cli.SubmissionDetail) {
+func (p *PersonInfoNode) writeOneSourceCode(slugDir, slug string, subDetail *leetcode_cli2.SubmissionDetail) {
 	lang := subDetail.Lang
 	dst := path.Join(slugDir, slug+findExt(lang))
 	buff := bufferpool.GetBuffer()
@@ -185,7 +182,7 @@ func (p *PersonInfoNode) writeOneSourceCode(slugDir, slug string, subDetail *lee
 	buff.WriteString(time.Unix(int64(subDetail.Timestamp), 0).Format(time.RFC3339))
 	buff.WriteString("\n")
 	buff.WriteString("// @URL: ")
-	buff.WriteString(leetcode_cli.UrlProblems + slug)
+	buff.WriteString(leetcode_cli2.UrlProblems + slug)
 	buff.WriteString("\n")
 	buff.WriteString("\n")
 	buff.WriteString("\n")

collector/leetcode_cli/message.go renamed to pkg/collector/leetcode_cli/message.go

@@ -2,15 +2,12 @@ package model
 
 import (
 	"fmt"
+	"github.com/realzhangm/leetcode_collector/pkg/collector/leetcode_cli"
 	"strconv"
 	"strings"
 	"sync"
 )
 
-import (
-	"github.com/realzhangm/leetcode_collector/collector/leetcode_cli"
-)
-
 type InfoNode struct {
 	UserName  string `json:"user_name"`
 	NumSolved int    `json:"num_solved"`

collector/model/2md.go renamed to pkg/collector/model/main_markdown.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gocolly/colly"
-	"github.com/realzhangm/leetcode_collector/collector/leetcode_cli"
+	"github.com/realzhangm/leetcode_collector/pkg/collector/leetcode_cli"
 	"log"
 	"net/http"
 )

collector/model/output_solutions.go renamed to pkg/collector/model/output_solutions.go

@@ -0,0 +1,7 @@
+package doa
+
+func MustOK(err error) {
+	if err != nil {
+		panic(err)
+	}
+}