chore: 更新依赖项

caixw · Oct 15, 2023 · c51fe81 · c51fe81
1 parent cc8d4ae
commit c51fe81
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 62 deletions.
diff --git a/cmd/gobuild/cmd.go b/cmd/gobuild/cmd.go
@@ -43,39 +43,22 @@ func Exec() error {
 }
 
 func getPrinter() *localeutil.Printer {
-	tag, _ := localeutil.DetectUserLanguageTag()
-	c := catalog.NewBuilder(catalog.Fallback(tag))
-
-	l1, err := serialize.LoadFSGlob(&cl.Locales, "*.yaml", yaml.Unmarshal)
-	if err != nil {
-		panic(err)
-	}
-	for _, l := range l1 {
-		if err := l.Catalog(c); err != nil {
-			panic(err)
-		}
-	}
-
-	l2, err := serialize.LoadFSGlob(&locales.Locales, "*.yaml", yaml.Unmarshal)
-	if err != nil {
-		panic(err)
-	}
-	for _, l := range l2 {
-		if err := l.Catalog(c); err != nil {
-			panic(err)
-		}
-	}
-
 	p, err := os.Executable()
 	if err != nil { // 这里不退出
 		fmt.Fprintln(os.Stderr, err)
 	}
 
-	l3, err := serialize.LoadFSGlob(os.DirFS(filepath.Dir(p)), "*.yaml", yaml.Unmarshal)
+	ls, err := serialize.LoadFSGlob(func(s string) serialize.UnmarshalFunc {
+		return yaml.Unmarshal
+	}, "*.yaml", cl.Locales, locales.Locales, os.DirFS(filepath.Dir(p)))
 	if err != nil {
 		panic(err)
 	}
-	for _, l := range l3 {
+
+	tag, _ := localeutil.DetectUserLanguageTag()
+	c := catalog.NewBuilder(catalog.Fallback(tag))
+
+	for _, l := range ls {
 		if err := l.Catalog(c); err != nil {
 			panic(err)
 		}

diff --git a/cmd/gobuild/go.mod b/cmd/gobuild/go.mod
@@ -3,9 +3,9 @@ module github.com/caixw/gobuild/cmd
 go 1.21
 
 require (
-	github.com/caixw/gobuild v1.5.0
+	github.com/caixw/gobuild v1.6.4
 	github.com/issue9/cmdopt v0.13.0
-	github.com/issue9/localeutil v0.21.1
+	github.com/issue9/localeutil v0.23.0
 	golang.org/x/text v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -14,10 +14,10 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/issue9/errwrap v0.3.1 // indirect
 	github.com/issue9/sliceutil v0.15.0 // indirect
-	github.com/issue9/source v0.6.1 // indirect
-	github.com/issue9/term/v3 v3.2.2 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	github.com/issue9/source v0.6.2 // indirect
+	github.com/issue9/term/v3 v3.2.3 // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 )
 
 replace github.com/caixw/gobuild => ../../
diff --git a/cmd/gobuild/go.sum b/cmd/gobuild/go.sum
@@ -1,24 +1,24 @@
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/issue9/assert/v3 v3.0.5 h1:Mlz/4v2Ph6ZDm3Fk3A1jhitH4M/2dkHeHNKe7tTZdH8=
-github.com/issue9/assert/v3 v3.0.5/go.mod h1:yft/uaskRpwQTyBT3n1zRl91SR1wNlO4fLZHzOa4bdM=
+github.com/issue9/assert/v3 v3.1.0 h1:oxLFXS7QnBKI4lB31pRoYO96yErkWAJtR7iv+LNjAPg=
+github.com/issue9/assert/v3 v3.1.0/go.mod h1:yft/uaskRpwQTyBT3n1zRl91SR1wNlO4fLZHzOa4bdM=
 github.com/issue9/cmdopt v0.13.0 h1:mLaa7R94a6MbCf+1GIt4YgFDW6fdt/nnL0AjgKgf8jQ=
 github.com/issue9/cmdopt v0.13.0/go.mod h1:l//IcugcBwX+vCc2KrgC4ylU6rEzhjQyxno7hWoLCDE=
 github.com/issue9/errwrap v0.3.1 h1:8g4lYJaGnoiXyZ1oZyH/7zPDGgw5RNiE9Q6ri9kE6Z8=
 github.com/issue9/errwrap v0.3.1/go.mod h1:HLR0e5iimd2aJXM9YrThOsRj3/6lMtk77lVp7zyvJ4E=
-github.com/issue9/localeutil v0.21.1 h1:b8TOk8TLvOtvCFOlJWyQAGaPX/avoaGmbMNHzClhuDU=
-github.com/issue9/localeutil v0.21.1/go.mod h1:9dzswqLF6egbK1vVvOaTg1/LW8tkrW6G94pd+TA2RII=
+github.com/issue9/localeutil v0.23.0 h1:UMxzF8wN42f6Rw6lkcbVIlSd/Zm9leH0syjDogXvYyg=
+github.com/issue9/localeutil v0.23.0/go.mod h1:yRWCkWMfZY8lCSyT1usICiXsNkhW3cfQlE8kHAmc614=
 github.com/issue9/sliceutil v0.15.0 h1:E6Xnl3FY5h0ZGNzyx1VEFAfGdParaq/BkX1QQR0uFwI=
 github.com/issue9/sliceutil v0.15.0/go.mod h1:n9meV7AamDhmehOBuV4GrxW3yw7O1cZmLx3Xizg1bps=
-github.com/issue9/source v0.6.1 h1:Kp0meiXRa5ufaW0m5cPJTpnlgujzzHVd30F7I1D7QlQ=
-github.com/issue9/source v0.6.1/go.mod h1:Q8AlOSRvkLWkNPIn3+G6vtPXV+5tfZkHHzOW3d7kP+Q=
-github.com/issue9/term/v3 v3.2.2 h1:Vp6atRzFDGbzRlo8jN2Ldjwnod2jWQJ3AItwR4LJTWc=
-github.com/issue9/term/v3 v3.2.2/go.mod h1:nVpa9D/rr25cdAC1rpfQ4sxx6arYlOcreB4jyg73h4Y=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+github.com/issue9/source v0.6.2 h1:PiqCb9NV3AugftI0ZkUqQxeWh6UeSqfx1NxpWoy3VRs=
+github.com/issue9/source v0.6.2/go.mod h1:1NgNRDdcw9snxGhgLAXcqYkhEokq/YsIEZUdBSXXMtI=
+github.com/issue9/term/v3 v3.2.3 h1:C5gCSaW788vc9zh+h7MQ8Ser7Jvw8BnWFtXyDKXm39I=
+github.com/issue9/term/v3 v3.2.3/go.mod h1:IOy2GsDHEWatSt/63IhTUjbY/+i26/ekz3GMqUj9HG8=
+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/go.mod b/go.mod
@@ -2,19 +2,19 @@ module github.com/caixw/gobuild
 
 require (
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/issue9/assert/v3 v3.0.5
-	github.com/issue9/localeutil v0.21.1
-	github.com/issue9/source v0.6.1
-	github.com/issue9/term/v3 v3.2.2
+	github.com/issue9/assert/v3 v3.1.0
+	github.com/issue9/localeutil v0.23.0
+	github.com/issue9/source v0.6.2
+	github.com/issue9/term/v3 v3.2.3
 	golang.org/x/text v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/issue9/errwrap v0.3.1 // indirect
 	github.com/issue9/sliceutil v0.15.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 )
 
 go 1.18
diff --git a/go.sum b/go.sum
@@ -1,22 +1,22 @@
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/issue9/assert/v3 v3.0.5 h1:Mlz/4v2Ph6ZDm3Fk3A1jhitH4M/2dkHeHNKe7tTZdH8=
-github.com/issue9/assert/v3 v3.0.5/go.mod h1:yft/uaskRpwQTyBT3n1zRl91SR1wNlO4fLZHzOa4bdM=
+github.com/issue9/assert/v3 v3.1.0 h1:oxLFXS7QnBKI4lB31pRoYO96yErkWAJtR7iv+LNjAPg=
+github.com/issue9/assert/v3 v3.1.0/go.mod h1:yft/uaskRpwQTyBT3n1zRl91SR1wNlO4fLZHzOa4bdM=
 github.com/issue9/errwrap v0.3.1 h1:8g4lYJaGnoiXyZ1oZyH/7zPDGgw5RNiE9Q6ri9kE6Z8=
 github.com/issue9/errwrap v0.3.1/go.mod h1:HLR0e5iimd2aJXM9YrThOsRj3/6lMtk77lVp7zyvJ4E=
-github.com/issue9/localeutil v0.21.1 h1:b8TOk8TLvOtvCFOlJWyQAGaPX/avoaGmbMNHzClhuDU=
-github.com/issue9/localeutil v0.21.1/go.mod h1:9dzswqLF6egbK1vVvOaTg1/LW8tkrW6G94pd+TA2RII=
+github.com/issue9/localeutil v0.23.0 h1:UMxzF8wN42f6Rw6lkcbVIlSd/Zm9leH0syjDogXvYyg=
+github.com/issue9/localeutil v0.23.0/go.mod h1:yRWCkWMfZY8lCSyT1usICiXsNkhW3cfQlE8kHAmc614=
 github.com/issue9/sliceutil v0.15.0 h1:E6Xnl3FY5h0ZGNzyx1VEFAfGdParaq/BkX1QQR0uFwI=
 github.com/issue9/sliceutil v0.15.0/go.mod h1:n9meV7AamDhmehOBuV4GrxW3yw7O1cZmLx3Xizg1bps=
-github.com/issue9/source v0.6.1 h1:Kp0meiXRa5ufaW0m5cPJTpnlgujzzHVd30F7I1D7QlQ=
-github.com/issue9/source v0.6.1/go.mod h1:Q8AlOSRvkLWkNPIn3+G6vtPXV+5tfZkHHzOW3d7kP+Q=
-github.com/issue9/term/v3 v3.2.2 h1:Vp6atRzFDGbzRlo8jN2Ldjwnod2jWQJ3AItwR4LJTWc=
-github.com/issue9/term/v3 v3.2.2/go.mod h1:nVpa9D/rr25cdAC1rpfQ4sxx6arYlOcreB4jyg73h4Y=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+github.com/issue9/source v0.6.2 h1:PiqCb9NV3AugftI0ZkUqQxeWh6UeSqfx1NxpWoy3VRs=
+github.com/issue9/source v0.6.2/go.mod h1:1NgNRDdcw9snxGhgLAXcqYkhEokq/YsIEZUdBSXXMtI=
+github.com/issue9/term/v3 v3.2.3 h1:C5gCSaW788vc9zh+h7MQ8Ser7Jvw8BnWFtXyDKXm39I=
+github.com/issue9/term/v3 v3.2.3/go.mod h1:IOy2GsDHEWatSt/63IhTUjbY/+i26/ekz3GMqUj9HG8=
+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/watch/log.go b/watch/log.go
@@ -99,6 +99,6 @@ func NewConsoleLogger(showIgnore bool, out io.Writer, colors map[int8]colors.Col
 	}
 }
 
-func (b *builder) systemLog(typ int8, msg localeutil.LocaleStringer) {
+func (b *builder) systemLog(typ int8, msg localeutil.Stringer) {
 	b.logs.Output(System, typ, msg.LocaleString(b.p))
 }