Skip to content

Commit c907e55

Browse files
author
Shuo
authored
Merge pull request #714 from openset/develop
Update: structure
2 parents 5500965 + b908914 commit c907e55

File tree

11 files changed

+363
-363
lines changed

11 files changed

+363
-363
lines changed

‎internal/base/base.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,6 @@ func JSONIndent(src []byte) []byte {
9191
return buf.Bytes()
9292
}
9393

94-
func getFilePath(filename string) string {
95-
if dir := filepath.Dir(filename); dir != "" {
96-
if err := os.MkdirAll(dir, 0755); err != nil {
97-
CheckErr(err)
98-
}
99-
}
100-
return filename
101-
}
102-
10394
// CheckErr - base.CheckErr
10495
func CheckErr(err error) {
10596
if err != nil {
@@ -117,3 +108,12 @@ func AuthInfo(cmd string) string {
117108
format += "<!--+----------------------------------------------------------------------+-->\n"
118109
return fmt.Sprintf(format, cmd, strings.Repeat(" ", 15-len(cmd)))
119110
}
111+
112+
func getFilePath(filename string) string {
113+
if dir := filepath.Dir(filename); dir != "" {
114+
if err := os.MkdirAll(dir, 0755); err != nil {
115+
CheckErr(err)
116+
}
117+
}
118+
return filename
119+
}

‎internal/client/client.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@ import (
1313

1414
var err error
1515

16-
func init() {
17-
http.DefaultClient.Jar, err = cookiejar.New(nil)
18-
base.CheckErr(err)
19-
http.DefaultClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
20-
req.Header.Set("Referer", req.URL.String())
21-
if len(via) >= 3 {
22-
return errors.New("stopped after 3 redirects")
23-
}
24-
return nil
25-
}
26-
}
27-
2816
// Get - client.Get
2917
func Get(url string) []byte {
3018
if resp, err := http.Get(url); err == nil {
@@ -46,3 +34,15 @@ func PostJSON(url, jsonStr string) []byte {
4634
}
4735
return nil
4836
}
37+
38+
func init() {
39+
http.DefaultClient.Jar, err = cookiejar.New(nil)
40+
base.CheckErr(err)
41+
http.DefaultClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
42+
req.Header.Set("Referer", req.URL.String())
43+
if len(via) >= 3 {
44+
return errors.New("stopped after 3 redirects")
45+
}
46+
return nil
47+
}
48+
}

‎internal/leetcode/base.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ var (
2424
translationSet = make(map[int]string)
2525
)
2626

27+
// Clean - leetcode.Clean
28+
func Clean() {
29+
dir := getCachePath("")
30+
err := os.RemoveAll(dir)
31+
checkErr(err)
32+
}
33+
2734
func graphQLRequest(graphQL, jsonStr, filename string, days int, v interface{}) {
2835
data := remember(filename, days, func() []byte {
2936
return client.PostJSON(graphQL, jsonStr)
@@ -64,13 +71,6 @@ func getCachePath(f string) string {
6471
return filepath.Join(dir, ".leetcode", f)
6572
}
6673

67-
// Clean - leetcode.Clean
68-
func Clean() {
69-
dir := getCachePath("")
70-
err := os.RemoveAll(dir)
71-
checkErr(err)
72-
}
73-
7474
func fileGetContents(filename string) []byte {
7575
if cts, err := ioutil.ReadFile(filename); err == nil {
7676
return cts

‎internal/leetcode/problems_all.go‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ import (
99
"github.com/openset/leetcode/internal/client"
1010
)
1111

12-
// ProblemsAll - leetcode.ProblemsAll
13-
func ProblemsAll() (ps ProblemsType) {
14-
data := remember(problemsAllFile, 2, func() []byte {
15-
return client.Get(apiProblemsAllURL)
16-
})
17-
jsonDecode(data, &ps)
18-
sort.Slice(ps.StatStatusPairs, func(i, j int) bool {
19-
return ps.StatStatusPairs[i].Stat.FrontendQuestionID > ps.StatStatusPairs[j].Stat.FrontendQuestionID
20-
})
21-
return
22-
}
23-
2412
// ProblemsType - leetcode.ProblemsType
2513
type ProblemsType struct {
2614
UserName string `json:"user_name"`
@@ -46,6 +34,17 @@ type StatStatusPairsType struct {
4634
Progress int `json:"progress"`
4735
}
4836

37+
// WriteRow - leetcode.WriteRow
38+
func (problem *StatStatusPairsType) WriteRow(buf *bytes.Buffer) {
39+
format := "| <span id=\"%d\">%d</span> | [%s](https://leetcode.com/problems/%s%s)%s | [%s](https://github.com/openset/leetcode/tree/master/problems/%s) | %s |\n"
40+
id := problem.Stat.FrontendQuestionID
41+
stat := problem.Stat
42+
title := strings.TrimSpace(problem.Stat.QuestionTitle)
43+
titleSlug := stat.QuestionTitleSlug
44+
levelName := problem.Difficulty.LevelName()
45+
buf.WriteString(fmt.Sprintf(format, id, id, title, titleSlug, stat.TranslationTitle(), problem.PaidOnly.Str(), stat.Lang(), titleSlug, levelName))
46+
}
47+
4948
type statType struct {
5049
QuestionID int `json:"question_id"`
5150
QuestionArticleLive bool `json:"question__article__live"`
@@ -59,28 +58,8 @@ type statType struct {
5958
IsNewQuestion bool `json:"is_new_question"`
6059
}
6160

62-
type difficultyType struct {
63-
Level int `json:"level"`
64-
}
65-
66-
type paidType bool
67-
68-
// WriteRow - leetcode.WriteRow
69-
func (problem *StatStatusPairsType) WriteRow(buf *bytes.Buffer) {
70-
format := "| <span id=\"%d\">%d</span> | [%s](https://leetcode.com/problems/%s%s)%s | [%s](https://github.com/openset/leetcode/tree/master/problems/%s) | %s |\n"
71-
id := problem.Stat.FrontendQuestionID
72-
stat := problem.Stat
73-
title := strings.TrimSpace(problem.Stat.QuestionTitle)
74-
titleSlug := stat.QuestionTitleSlug
75-
levelName := problem.Difficulty.LevelName()
76-
buf.WriteString(fmt.Sprintf(format, id, id, title, titleSlug, stat.TranslationTitle(), problem.PaidOnly.Str(), stat.Lang(), titleSlug, levelName))
77-
}
78-
79-
func (p paidType) Str() string {
80-
if p {
81-
return LockStr
82-
}
83-
return ""
61+
func (s *statType) Lang() string {
62+
return getLang(s.QuestionTitleSlug)
8463
}
8564

8665
func (s *statType) QuestionTitleSnake() string {
@@ -95,8 +74,8 @@ func (s *statType) TranslationTitle() string {
9574
return title
9675
}
9776

98-
func (s *statType) Lang() string {
99-
return getLang(s.QuestionTitleSlug)
77+
type difficultyType struct {
78+
Level int `json:"level"`
10079
}
10180

10281
func (d *difficultyType) LevelName() string {
@@ -107,3 +86,24 @@ func (d *difficultyType) LevelName() string {
10786
}
10887
return m[d.Level]
10988
}
89+
90+
type paidType bool
91+
92+
func (p paidType) Str() string {
93+
if p {
94+
return LockStr
95+
}
96+
return ""
97+
}
98+
99+
// ProblemsAll - leetcode.ProblemsAll
100+
func ProblemsAll() (ps ProblemsType) {
101+
data := remember(problemsAllFile, 2, func() []byte {
102+
return client.Get(apiProblemsAllURL)
103+
})
104+
jsonDecode(data, &ps)
105+
sort.Slice(ps.StatStatusPairs, func(i, j int) bool {
106+
return ps.StatStatusPairs[i].Stat.FrontendQuestionID > ps.StatStatusPairs[j].Stat.FrontendQuestionID
107+
})
108+
return
109+
}

‎internal/leetcode/problems_status.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package leetcode
22

3-
// IsSolved - leetcode.IsSolved
4-
func IsSolved(id int) bool {
5-
return problemStatus[id]
6-
}
7-
83
var problemStatus = map[int]bool{
94
1: true,
105
2: true,
@@ -229,3 +224,8 @@ var problemStatus = map[int]bool{
229224
1189: true,
230225
1221: true,
231226
}
227+
228+
// IsSolved - leetcode.IsSolved
229+
func IsSolved(id int) bool {
230+
return problemStatus[id]
231+
}

0 commit comments

Comments
 (0)