feat(sync): allow continue sync when code conflict (#6)

base32.go

@@ -0,0 +1,19 @@
+package dx
+
+import "encoding/base32"
+
+var b32encoding *base32.Encoding
+
+func init() {
+	b32encoding = base32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567").
+		WithPadding(base32.NoPadding)
+}
+
+func b32en(name string) string {
+	return b32encoding.EncodeToString([]byte(name))
+}
+
+func b32de(encode string) (string, error) {
+	b, err := b32encoding.DecodeString(encode)
+	return string(b), err
+}

cmd/dx/dx.go

@@ -8,7 +8,8 @@ import (
 )
 
 func main() {
-	err := dx.Main.Execute()
+	cmd := dx.NewMainCmd()
+	err := cmd.Execute()
 	if err != nil {
 		slog.Info(err.Error())
 		os.Exit(2)

commit.go

@@ -8,19 +8,21 @@ import (
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
-var CmdCommit = &cobra.Command{
-	Use:     "commit [flags]",
-	Example: "commit -m \"commit message\"",
-	Args:    cobra.NoArgs,
-	RunE:    cmdCommitRun,
-}
+func NewCommitCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "commit [flags]",
+		Example: "commit -m \"commit message\"",
+		Args:    cobra.NoArgs,
+		RunE:    cmdCommitRun,
+	}
 
-func init() {
-	CmdCommit.PersistentFlags().StringP("message", "m", "", "message")
-	err := CmdCommit.MarkPersistentFlagRequired("message")
+	cmd.PersistentFlags().StringP("message", "m", "", "message")
+	err := cmd.MarkPersistentFlagRequired("message")
 	if err != nil {
 		panic(err)
 	}
+
+	return cmd
 }
 
 func cmdCommitRun(cmd *cobra.Command, _ []string) error {

dx.go

@@ -6,15 +6,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Main = &cobra.Command{
-	Use:               "dx [flags] [command]",
-	PersistentPreRunE: cmdMainPreRun,
-}
+func NewMainCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:               "dx [flags] [command]",
+		PersistentPreRunE: cmdMainPreRun,
+	}
+
+	cmd.PersistentFlags().BoolP("debug", "d", false, "print debug info")
+
+	cmd.AddCommand(NewCommitCmd())
+	cmd.AddCommand(NewSyncCmd())
 
-func init() {
-	Main.PersistentFlags().BoolP("debug", "d", false, "print debug info")
-	Main.AddCommand(CmdCommit)
-	Main.AddCommand(CmdSync)
+	return cmd
 }
 
 func cmdMainPreRun(cmd *cobra.Command, _ []string) error {