Merge pull request #791 from openset/develop

A: v1.6.1

Author: Shuo

internal/base/base.go

@@ -10,50 +10,13 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
 )
 
-// CmdName - base.CmdName
-const (
-	CmdName = "leetcode"
-	URL     = "https://github.com/openset/leetcode/tree/master"
-)
-
-// base var
-var (
-	Commands []*Command
-	Mutex    sync.Mutex
-)
-
-// Command - base.Command
-type Command struct {
-	Run       func(cmd *Command, args []string)
-	UsageLine string
-	Short     string
-	Long      string
-	Hidden    bool
-}
-
-// Name - base.Name
-func (c *Command) Name() string {
-	name := c.UsageLine
-	if i := strings.Index(name, " "); i > 0 {
-		name = name[0:i]
-	}
-	return name
-}
+// URL - base.URL
+const URL = "https://github.com/openset/leetcode/tree/master"
 
-// Usage - base.Usage
-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())
-}
-
-// UsageHelp - base.UsageHelp
-func (c *Command) UsageHelp() {
-	fmt.Printf("usage: %s %s\n\n", CmdName, c.UsageLine)
-	fmt.Println(c.Long)
-}
+// CmdName - base.CmdName
+var CmdName = filepath.Base(os.Args[0])
 
 // Usage - base.Usage
 func Usage() {

internal/base/cmd.go

@@ -0,0 +1,45 @@
+// Package base provides base support.
+package base
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Commands - base.Commands
+var Commands []*Command
+
+// Command - base.Command
+type Command struct {
+	Run       func(cmd *Command, args []string)
+	UsageLine string
+	Short     string
+	Long      string
+	Hidden    bool
+}
+
+// Name - base.Command.Name
+func (c *Command) Name() string {
+	name := c.UsageLine
+	if i := strings.Index(name, " "); i > 0 {
+		name = name[0:i]
+	}
+	return name
+}
+
+// Usage - base.Command.Usage
+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())
+}
+
+// UsageHelp - base.Command.UsageHelp
+func (c *Command) UsageHelp() {
+	fmt.Printf("usage: %s %s\n\n", CmdName, c.UsageLine)
+	fmt.Println(c.Long)
+}
+
+// Register - base.Register
+func Register(cmds ...*Command) {
+	Commands = append(Commands, cmds...)
+}

internal/base/run.go

@@ -0,0 +1,25 @@
+package base
+
+import (
+	"flag"
+	"fmt"
+)
+
+func Run() {
+	flag.Usage = Usage
+	flag.Parse()
+	if flag.NArg() < 1 {
+		flag.Usage()
+		return
+	}
+	args := flag.Args()
+	cmdName := flag.Arg(0)
+	for _, cmd := range Commands {
+		if cmd.Name() == cmdName {
+			cmd.Run(cmd, args[1:])
+			return
+		}
+	}
+	fmt.Printf("%s %s: unknown command\n\n", CmdName, cmdName)
+	fmt.Printf("Run '%s help' for usage.\n", CmdName)
+}

internal/leetcode/topic_tag.go

@@ -9,12 +9,13 @@ import (
 	"regexp"
 	"sort"
 	"strconv"
+	"sync"
 
-	"github.com/openset/leetcode/internal/base"
 	"github.com/openset/leetcode/internal/client"
 )
 
 var (
+	mu       sync.Mutex
 	initTags []TagType
 	tagsFile = filepath.Join("tag", "tags.json")
 )
@@ -135,10 +136,10 @@ func GetTopicTag(slug string) (tt TopicTagType) {
 }
 
 func saveTags(tags []TagType) {
-	base.Mutex.Lock()
+	mu.Lock()
+	defer mu.Unlock()
 	tags = append(GetTags(), tags...)
 	filePutContents(tagsFile, jsonEncode(tagsUnique(tags)))
-	base.Mutex.Unlock()
 }
 
 func tagsUnique(tags []TagType) []TagType {

internal/version/version.go

@@ -8,7 +8,7 @@ import (
 	"github.com/openset/leetcode/internal/base"
 )
 
-const version = "1.6.0"
+const version = "1.6.1"
 
 // CmdVersion - version.CmdVersion
 var CmdVersion = &base.Command{

main.go

@@ -2,9 +2,6 @@
 package main
 
 import (
-	"flag"
-	"fmt"
-
 	"github.com/openset/leetcode/internal/base"
 	"github.com/openset/leetcode/internal/build"
 	"github.com/openset/leetcode/internal/clean"
@@ -22,8 +19,8 @@ import (
 	"github.com/openset/leetcode/internal/version"
 )
 
-func init() {
-	base.Commands = []*base.Command{
+func main() {
+	base.Register(
 		readme.CmdReadme,
 		page.CmdPage,
 		tag.CmdTag,
@@ -38,24 +35,6 @@ func init() {
 		version.CmdVersion,
 		help.CmdHelp,
 		post.CmdPost,
-	}
-}
-
-func main() {
-	flag.Usage = base.Usage
-	flag.Parse()
-	if flag.NArg() < 1 {
-		flag.Usage()
-		return
-	}
-	args := flag.Args()
-	cmdName := flag.Arg(0)
-	for _, cmd := range base.Commands {
-		if cmd.Name() == cmdName {
-			cmd.Run(cmd, args[1:])
-			return
-		}
-	}
-	fmt.Printf("%s %s: unknown command\n\n", base.CmdName, cmdName)
-	fmt.Printf("Run '%s help' for usage.\n", base.CmdName)
+	)
+	base.Run()
 }