Merge pull request #635 from openset/develop

Shuo · web-flow · commit af58d23c7db2 · 2019-09-13T20:53:01.000+08:00
Remove: Exit
diff --git a/internal/base/base.go b/internal/base/base.go
@@ -38,13 +38,11 @@ func (c *Command) Name() string {
 func (c *Command) Usage() {
 	fmt.Printf("usage: %s %s\n\n", CmdName, c.UsageLine)
 	fmt.Printf("Run '%s help %s' for details.\n", CmdName, c.Name())
-	Exit()
 }
 
 func (c *Command) UsageHelp() {
 	fmt.Printf("usage: %s %s\n\n", CmdName, c.UsageLine)
 	fmt.Println(c.Long)
-	Exit()
 }
 
 func Usage() {
@@ -58,7 +56,6 @@ func Usage() {
 		}
 	}
 	fmt.Printf("\nUse \"%s help <command>\" for more information about a command.\n", CmdName)
-	Exit()
 }
 
 func FilePutContents(filename string, data []byte) []byte {
@@ -99,10 +96,6 @@ func CheckErr(err error) {
 	}
 }
 
-func Exit() {
-	os.Exit(0)
-}
-
 func AuthInfo(cmd string) string {
 	format := "<!--|This file generated by command(leetcode %s); DO NOT EDIT.%s|-->\n"
 	format += "<!--+----------------------------------------------------------------------+-->\n"
diff --git a/internal/build/build.go b/internal/build/build.go
@@ -23,6 +23,7 @@ var CmdBuild = &base.Command{
 func runBuild(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	target := map[string][]string{
 		"darwin":  {"amd64"},
diff --git a/internal/clean/clean.go b/internal/clean/clean.go
@@ -15,6 +15,7 @@ var CmdClean = &base.Command{
 func runClean(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	leetcode.Clean()
 }
diff --git a/internal/description/description.go b/internal/description/description.go
@@ -18,6 +18,7 @@ var CmdDescription = &base.Command{
 func runDescription(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	var wg sync.WaitGroup
 	limit := 1 << 7
diff --git a/internal/help/help.go b/internal/help/help.go
@@ -16,6 +16,7 @@ var CmdHelp = &base.Command{
 func runHelp(cmd *base.Command, args []string) {
 	if len(args) < 1 {
 		base.Usage()
+		return
 	}
 	cmdName := args[0]
 	for _, cmd := range base.Commands {
diff --git a/internal/helper/helper.go b/internal/helper/helper.go
@@ -17,6 +17,7 @@ var CmdHelper = &base.Command{
 func runHelper(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	var buf bytes.Buffer
 	buf.WriteString(base.AuthInfo("helper"))
diff --git a/internal/open/open.go b/internal/open/open.go
@@ -18,6 +18,7 @@ var CmdOpen = &base.Command{
 func runOpen(cmd *base.Command, args []string) {
 	if len(args) != 1 {
 		cmd.Usage()
+		return
 	}
 	questionId, err := strconv.Atoi(args[0])
 	base.CheckErr(err)
diff --git a/internal/page/page.go b/internal/page/page.go
@@ -15,6 +15,7 @@ var CmdPage = &base.Command{
 func runPage(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	readme.CmdReadme.Run(readme.CmdReadme, []string{"page"})
 }
diff --git a/internal/post/post.go b/internal/post/post.go
@@ -24,6 +24,7 @@ var CmdPost = &base.Command{
 func runPost(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	formatFilename := "%s-%s.md"
 	formatTopicTag := "  [[%s](https://github.com/openset/leetcode/tree/master/tag/%s/README.md)]\n"
diff --git a/internal/question/question.go b/internal/question/question.go
@@ -18,6 +18,7 @@ var CmdQuestion = &base.Command{
 func runQuestion(cmd *base.Command, args []string) {
 	if len(args) != 1 {
 		cmd.Usage()
+		return
 	}
 	if questionId, err := strconv.Atoi(args[0]); err == nil {
 		problems := leetcode.ProblemsAll()
diff --git a/internal/readme/readme.go b/internal/readme/readme.go
@@ -24,6 +24,7 @@ func runReadme(cmd *base.Command, args []string) {
 	}
 	if len(args) > 1 {
 		cmd.Usage()
+		return
 	}
 	var buf bytes.Buffer
 	buf.WriteString(base.AuthInfo(buildCmd))
diff --git a/internal/tag/tag.go b/internal/tag/tag.go
@@ -20,6 +20,7 @@ var CmdTag = &base.Command{
 func runTag(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	var wg sync.WaitGroup
 	var buf bytes.Buffer
diff --git a/internal/test/test.go b/internal/test/test.go
@@ -19,6 +19,7 @@ var CmdTest = &base.Command{
 func runTest(cmd *base.Command, args []string) {
 	if len(args) > 1 {
 		cmd.Usage()
+		return
 	}
 	if _, err := os.Stat("problems"); err == nil {
 		target := "./..."
diff --git a/internal/update/update.go b/internal/update/update.go
@@ -18,6 +18,7 @@ var CmdUpdate = &base.Command{
 func runUpdate(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	err := exec.Command("go", "get", "-u", "github.com/openset/leetcode").Run()
 	base.CheckErr(err)
diff --git a/internal/version/version.go b/internal/version/version.go
@@ -19,6 +19,7 @@ var CmdVersion = &base.Command{
 func runVersion(cmd *base.Command, args []string) {
 	if len(args) != 0 {
 		cmd.Usage()
+		return
 	}
 	fmt.Printf("%s version %s %s/%s\n", base.CmdName, version, runtime.GOOS, runtime.GOARCH)
 }
diff --git a/main.go b/main.go
@@ -45,6 +45,7 @@ func main() {
 	flag.Parse()
 	if flag.NArg() < 1 {
 		flag.Usage()
+		return
 	}
 	args := flag.Args()
 	cmdName := args[0]
diff --git a/tag/README.md b/tag/README.md
@@ -16,8 +16,8 @@
 | 9 | [Greedy](https://github.com/openset/leetcode/tree/master/tag/greedy/README.md) | [贪心算法](https://github.com/openset/leetcode/tree/master/tag/greedy/README.md) | | 10 | [Two Pointers](https://github.com/openset/leetcode/tree/master/tag/two-pointers/README.md) | [双指针](https://github.com/openset/leetcode/tree/master/tag/two-pointers/README.md) | 
 | 11 | [Breadth-first Search](https://github.com/openset/leetcode/tree/master/tag/breadth-first-search/README.md) | [广度优先搜索](https://github.com/openset/leetcode/tree/master/tag/breadth-first-search/README.md) | | 12 | [Stack](https://github.com/openset/leetcode/tree/master/tag/stack/README.md) | [栈](https://github.com/openset/leetcode/tree/master/tag/stack/README.md) | 
 | 13 | [Backtracking](https://github.com/openset/leetcode/tree/master/tag/backtracking/README.md) | [回溯算法](https://github.com/openset/leetcode/tree/master/tag/backtracking/README.md) | | 14 | [Design](https://github.com/openset/leetcode/tree/master/tag/design/README.md) | [设计](https://github.com/openset/leetcode/tree/master/tag/design/README.md) | 
-| 15 | [Linked List](https://github.com/openset/leetcode/tree/master/tag/linked-list/README.md) | [链表](https://github.com/openset/leetcode/tree/master/tag/linked-list/README.md) | | 16 | [Bit Manipulation](https://github.com/openset/leetcode/tree/master/tag/bit-manipulation/README.md) | [位运算](https://github.com/openset/leetcode/tree/master/tag/bit-manipulation/README.md) | 
-| 17 | [Graph](https://github.com/openset/leetcode/tree/master/tag/graph/README.md) | [图](https://github.com/openset/leetcode/tree/master/tag/graph/README.md) | | 18 | [Sort](https://github.com/openset/leetcode/tree/master/tag/sort/README.md) | [排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md) | 
+| 15 | [Linked List](https://github.com/openset/leetcode/tree/master/tag/linked-list/README.md) | [链表](https://github.com/openset/leetcode/tree/master/tag/linked-list/README.md) | | 16 | [Sort](https://github.com/openset/leetcode/tree/master/tag/sort/README.md) | [排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md) | 
+| 17 | [Bit Manipulation](https://github.com/openset/leetcode/tree/master/tag/bit-manipulation/README.md) | [位运算](https://github.com/openset/leetcode/tree/master/tag/bit-manipulation/README.md) | | 18 | [Graph](https://github.com/openset/leetcode/tree/master/tag/graph/README.md) | [图](https://github.com/openset/leetcode/tree/master/tag/graph/README.md) | 
 | 19 | [Heap](https://github.com/openset/leetcode/tree/master/tag/heap/README.md) | [堆](https://github.com/openset/leetcode/tree/master/tag/heap/README.md) | | 20 | [Union Find](https://github.com/openset/leetcode/tree/master/tag/union-find/README.md) | [并查集](https://github.com/openset/leetcode/tree/master/tag/union-find/README.md) | 
 | 21 | [Sliding Window](https://github.com/openset/leetcode/tree/master/tag/sliding-window/README.md) | [Sliding Window](https://github.com/openset/leetcode/tree/master/tag/sliding-window/README.md) | | 22 | [Divide and Conquer](https://github.com/openset/leetcode/tree/master/tag/divide-and-conquer/README.md) | [分治算法](https://github.com/openset/leetcode/tree/master/tag/divide-and-conquer/README.md) | 
 | 23 | [Trie](https://github.com/openset/leetcode/tree/master/tag/trie/README.md) | [字典树](https://github.com/openset/leetcode/tree/master/tag/trie/README.md) | | 24 | [Recursion](https://github.com/openset/leetcode/tree/master/tag/recursion/README.md) | [递归](https://github.com/openset/leetcode/tree/master/tag/recursion/README.md) | 
diff --git a/tag/binary-search/README.md b/tag/binary-search/README.md
@@ -9,6 +9,7 @@
 
 | # | 题名 | 标签 | 难度 |
 | :-: | - | - | :-: |
+| 1182 | [与目标颜色间的最短距离](https://github.com/openset/leetcode/tree/master/problems/shortest-distance-to-target-color) 🔒 | [[二分查找](https://github.com/openset/leetcode/tree/master/tag/binary-search/README.md)]  | Medium |
 | 1150 | [检查一个数是否在数组中占绝大多数](https://github.com/openset/leetcode/tree/master/problems/check-if-a-number-is-majority-element-in-a-sorted-array) 🔒 | [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[二分查找](https://github.com/openset/leetcode/tree/master/tag/binary-search/README.md)]  | Easy |
 | 1095 | [山脉数组中查找目标值](https://github.com/openset/leetcode/tree/master/problems/find-in-mountain-array) | [[二分查找](https://github.com/openset/leetcode/tree/master/tag/binary-search/README.md)]  | Hard |
 | 1064 | [不动点](https://github.com/openset/leetcode/tree/master/problems/fixed-point) 🔒 | [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[二分查找](https://github.com/openset/leetcode/tree/master/tag/binary-search/README.md)]  | Easy |
diff --git a/tag/math/README.md b/tag/math/README.md
@@ -9,6 +9,8 @@
 
 | # | 题名 | 标签 | 难度 |
 | :-: | - | - | :-: |
+| 1183 | [矩阵中 1 的最大数量](https://github.com/openset/leetcode/tree/master/problems/maximum-number-of-ones) 🔒 | [[排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md)] [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)]  | Hard |
+| 1180 | [统计只含单一字母的子串](https://github.com/openset/leetcode/tree/master/problems/count-substrings-with-only-one-distinct-letter) 🔒 | [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)] [[字符串](https://github.com/openset/leetcode/tree/master/tag/string/README.md)]  | Easy |
 | 1175 | [质数排列](https://github.com/openset/leetcode/tree/master/problems/prime-arrangements) | [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)]  | Easy |
 | 1134 | [阿姆斯特朗数](https://github.com/openset/leetcode/tree/master/problems/armstrong-number) 🔒 | [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)]  | Easy |
 | 1121 | [将数组分成几个递增序列](https://github.com/openset/leetcode/tree/master/problems/divide-array-into-increasing-sequences) 🔒 | [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)]  | Hard |
diff --git a/tag/sort/README.md b/tag/sort/README.md
@@ -9,6 +9,7 @@
 
 | # | 题名 | 标签 | 难度 |
 | :-: | - | - | :-: |
+| 1183 | [矩阵中 1 的最大数量](https://github.com/openset/leetcode/tree/master/problems/maximum-number-of-ones) 🔒 | [[排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md)] [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)]  | Hard |
 | 1152 | [用户网站访问行为分析](https://github.com/openset/leetcode/tree/master/problems/analyze-user-website-visit-pattern) 🔒 | [[排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md)] [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[哈希表](https://github.com/openset/leetcode/tree/master/tag/hash-table/README.md)]  | Medium |
 | 1122 | [数组的相对排序](https://github.com/openset/leetcode/tree/master/problems/relative-sort-array) | [[排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md)] [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)]  | Easy |
 | 1086 | [前五科的均分](https://github.com/openset/leetcode/tree/master/problems/high-five) 🔒 | [[排序](https://github.com/openset/leetcode/tree/master/tag/sort/README.md)] [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[哈希表](https://github.com/openset/leetcode/tree/master/tag/hash-table/README.md)]  | Easy |
diff --git a/tag/string/README.md b/tag/string/README.md
@@ -9,6 +9,8 @@
 
 | # | 题名 | 标签 | 难度 |
 | :-: | - | - | :-: |
+| 1181 | [前后拼接](https://github.com/openset/leetcode/tree/master/problems/before-and-after-puzzle) 🔒 | [[字符串](https://github.com/openset/leetcode/tree/master/tag/string/README.md)]  | Medium |
+| 1180 | [统计只含单一字母的子串](https://github.com/openset/leetcode/tree/master/problems/count-substrings-with-only-one-distinct-letter) 🔒 | [[数学](https://github.com/openset/leetcode/tree/master/tag/math/README.md)] [[字符串](https://github.com/openset/leetcode/tree/master/tag/string/README.md)]  | Easy |
 | 1177 | [构建回文串检测](https://github.com/openset/leetcode/tree/master/problems/can-make-palindrome-from-substring) | [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[字符串](https://github.com/openset/leetcode/tree/master/tag/string/README.md)]  | Medium |
 | 1170 | [比较字符串最小字母出现频次](https://github.com/openset/leetcode/tree/master/problems/compare-strings-by-frequency-of-the-smallest-character) | [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[字符串](https://github.com/openset/leetcode/tree/master/tag/string/README.md)]  | Easy |
 | 1169 | [查询无效交易](https://github.com/openset/leetcode/tree/master/problems/invalid-transactions) | [[数组](https://github.com/openset/leetcode/tree/master/tag/array/README.md)] [[字符串](https://github.com/openset/leetcode/tree/master/tag/string/README.md)]  | Easy |
diff --git a/tag/tags.json b/tag/tags.json
@@ -74,6 +74,11 @@
 		"Slug": "linked-list",
 		"TranslatedName": "链表"
 	},
+	{
+		"Name": "Sort",
+		"Slug": "sort",
+		"TranslatedName": "排序"
+	},
 	{
 		"Name": "Bit Manipulation",
 		"Slug": "bit-manipulation",
@@ -84,11 +89,6 @@
 		"Slug": "graph",
 		"TranslatedName": "图"
 	},
-	{
-		"Name": "Sort",
-		"Slug": "sort",
-		"TranslatedName": "排序"
-	},
 	{
 		"Name": "Heap",
 		"Slug": "heap",

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,11 @@ func (c *Command) Name() string {`
`38`	`38`	`func (c *Command) Usage() {`
`39`	`39`	`fmt.Printf("usage: %s %s\n\n", CmdName, c.UsageLine)`
`40`	`40`	`fmt.Printf("Run '%s help %s' for details.\n", CmdName, c.Name())`
`41`		`- Exit()`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`func (c *Command) UsageHelp() {`
`45`	`44`	`fmt.Printf("usage: %s %s\n\n", CmdName, c.UsageLine)`
`46`	`45`	`fmt.Println(c.Long)`
`47`		`- Exit()`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`func Usage() {`
`@@ -58,7 +56,6 @@ func Usage() {`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`	`fmt.Printf("\nUse \"%s help <command>\" for more information about a command.\n", CmdName)`
`61`		`- Exit()`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`func FilePutContents(filename string, data []byte) []byte {`
`@@ -99,10 +96,6 @@ func CheckErr(err error) {`
`99`	`96`	`}`
`100`	`97`	`}`
`101`	`98`
`102`		`-func Exit() {`
`103`		`- os.Exit(0)`
`104`		`-}`
`105`		`-`
`106`	`99`	`func AuthInfo(cmd string) string {`
`107`	`100`	`format := "<!--\|This file generated by command(leetcode %s); DO NOT EDIT.%s\|-->\n"`
`108`	`101`	`format += "<!--+----------------------------------------------------------------------+-->\n"`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ var CmdBuild = &base.Command{`
`23`	`23`	`func runBuild(cmd *base.Command, args []string) {`
`24`	`24`	`if len(args) != 0 {`
`25`	`25`	`cmd.Usage()`
	`26`	`+ return`
`26`	`27`	`}`
`27`	`28`	`target := map[string][]string{`
`28`	`29`	`"darwin": {"amd64"},`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ var CmdClean = &base.Command{`
`15`	`15`	`func runClean(cmd *base.Command, args []string) {`
`16`	`16`	`if len(args) != 0 {`
`17`	`17`	`cmd.Usage()`
	`18`	`+ return`
`18`	`19`	`}`
`19`	`20`	`leetcode.Clean()`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ var CmdDescription = &base.Command{`
`18`	`18`	`func runDescription(cmd *base.Command, args []string) {`
`19`	`19`	`if len(args) != 0 {`
`20`	`20`	`cmd.Usage()`
	`21`	`+ return`
`21`	`22`	`}`
`22`	`23`	`var wg sync.WaitGroup`
`23`	`24`	`limit := 1 << 7`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ var CmdHelp = &base.Command{`
`16`	`16`	`func runHelp(cmd *base.Command, args []string) {`
`17`	`17`	`if len(args) < 1 {`
`18`	`18`	`base.Usage()`
	`19`	`+ return`
`19`	`20`	`}`
`20`	`21`	`cmdName := args[0]`
`21`	`22`	`for _, cmd := range base.Commands {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ var CmdHelper = &base.Command{`
`17`	`17`	`func runHelper(cmd *base.Command, args []string) {`
`18`	`18`	`if len(args) != 0 {`
`19`	`19`	`cmd.Usage()`
	`20`	`+ return`
`20`	`21`	`}`
`21`	`22`	`var buf bytes.Buffer`
`22`	`23`	`buf.WriteString(base.AuthInfo("helper"))`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ var CmdOpen = &base.Command{`
`18`	`18`	`func runOpen(cmd *base.Command, args []string) {`
`19`	`19`	`if len(args) != 1 {`
`20`	`20`	`cmd.Usage()`
	`21`	`+ return`
`21`	`22`	`}`
`22`	`23`	`questionId, err := strconv.Atoi(args[0])`
`23`	`24`	`base.CheckErr(err)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ var CmdPage = &base.Command{`
`15`	`15`	`func runPage(cmd *base.Command, args []string) {`
`16`	`16`	`if len(args) != 0 {`
`17`	`17`	`cmd.Usage()`
	`18`	`+ return`
`18`	`19`	`}`
`19`	`20`	`readme.CmdReadme.Run(readme.CmdReadme, []string{"page"})`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ var CmdPost = &base.Command{`
`24`	`24`	`func runPost(cmd *base.Command, args []string) {`
`25`	`25`	`if len(args) != 0 {`
`26`	`26`	`cmd.Usage()`
	`27`	`+ return`
`27`	`28`	`}`
`28`	`29`	`formatFilename := "%s-%s.md"`
`29`	`30`	`formatTopicTag := " [[%s](https://github.com/openset/leetcode/tree/master/tag/%s/README.md)]\n"`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ var CmdQuestion = &base.Command{`
`18`	`18`	`func runQuestion(cmd *base.Command, args []string) {`
`19`	`19`	`if len(args) != 1 {`
`20`	`20`	`cmd.Usage()`
	`21`	`+ return`
`21`	`22`	`}`
`22`	`23`	`if questionId, err := strconv.Atoi(args[0]); err == nil {`
`23`	`24`	`problems := leetcode.ProblemsAll()`