update mkvtool:mkvlib bump to v2.1.7

3 files changed, 14 insertions, 16 deletions

diff --git a/mkvtool/go.mod b/mkvtool/go.mod
index 1158c2c..ddd9926 100644
--- a/mkvtool/go.mod
+++ b/mkvtool/go.mod
@@ -3,8 +3,9 @@ module github.com/MkvAutoSubset/MkvAutoSubset/mkvtool
 go 1.18
 
 require (
-	github.com/MkvAutoSubset/MkvAutoSubset/mkvlib v0.0.0-20220606025406-764408a7e701
+	github.com/MkvAutoSubset/MkvAutoSubset/mkvlib v0.0.0-20220607030816-fd235e02741f
 	github.com/fatih/color v1.13.0
+	github.com/mattn/go-colorable v0.1.9
 )
 
 require (
@@ -13,7 +14,6 @@ require (
 	github.com/asticode/go-astikit v0.29.1 // indirect
 	github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
 	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
diff --git a/mkvtool/main.go b/mkvtool/main.go
index ce470ba..e3de316 100644
--- a/mkvtool/main.go
+++ b/mkvtool/main.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/MkvAutoSubset/MkvAutoSubset/mkvlib"
 	"github.com/fatih/color"
+	"github.com/mattn/go-colorable"
 	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"os"
 	"path"
@@ -17,7 +17,7 @@ import (
 )
 
 const appName = "MKV Tool"
-const appVer = "v4.1.8"
+const appVer = "v4.1.9"
 const tTitle = appName + " " + appVer
 
 var appFN = fmt.Sprintf("%s %s %s/%s", appName, appVer, runtime.GOOS, runtime.GOARCH)
@@ -116,13 +116,11 @@ func main() {
 	if flog != "" {
 		lf, err := os.Create(flog)
 		if err != nil {
-			mkvlib.PrintLog(nil, mkvlib.LogError, `Failed to create log file: "%s"`, flog)
+			color.Red(`Failed to create log file: "%s"`, flog)
 		}
-		mw := io.MultiWriter(os.Stdout, lf)
-		log.SetOutput(mw)
+		mw := io.MultiWriter(colorable.NewColorableStdout(), lf)
+		color.Output = mw
 		color.NoColor = true
-	} else {
-		log.SetOutput(color.Output)
 	}
 
 	ec := 0
@@ -160,7 +158,7 @@ func main() {
 				color.HiGreen("\tTypes:\t%s\n", strings.Join(info.Types[_i], "\n\t\t"))
 			}
 		} else {
-			mkvlib.PrintLog(nil, mkvlib.LogError, "Failed to get font info: [%s]", i)
+			color.Red("Failed to get font info: [%s]", i)
 			ec++
 		}
 		return
@@ -175,7 +173,7 @@ func main() {
 		el := len(list)
 		if el > 0 {
 			ec++
-			mkvlib.PrintLog(nil, mkvlib.LogInfo, "Error list:(%d)\n%s", el, strings.Join(list, "\n"))
+			color.Yellow("Error list:(%d)\n%s", el, strings.Join(list, "\n"))
 		}
 		return
 	}
@@ -236,7 +234,7 @@ func main() {
 			if err {
 				ec++
 			} else {
-				mkvlib.PrintLog(nil, mkvlib.LogInfo, "Need font subset: %v", !r)
+				color.Blue("Need font subset: %v", !r)
 			}
 			return
 
@@ -246,14 +244,14 @@ func main() {
 		if q {
 			lines := processer.QueryFolder(s, nil)
 			if len(lines) > 0 {
-				mkvlib.PrintLog(nil, mkvlib.LogInfo, "Has item(s).")
+				color.Blue("Has item(s).")
 				data := []byte(strings.Join(lines, "\n"))
 				if os.WriteFile("list.txt", data, os.ModePerm) != nil {
-					mkvlib.PrintLog(nil, mkvlib.LogError, "Failed to write the result file")
+					color.Red("Failed to write the result file")
 					ec++
 				}
 			} else {
-				mkvlib.PrintLog(nil, mkvlib.LogInfo, "No item.")
+				color.Blue("No item.")
 			}
 			return
 		}
diff --git a/mkvtool/title_windows.go b/mkvtool/title_windows.go
index b53fe23..2f714bd 100644
--- a/mkvtool/title_windows.go
+++ b/mkvtool/title_windows.go
@@ -15,7 +15,7 @@ func setWindowTitle(title string) {
 		if err == nil {
 			ptr, err := syscall.UTF16PtrFromString(title)
 			if err == nil {
-				syscall.Syscall(setConsoleTitle, 1, uintptr(unsafe.Pointer(ptr)), 0, 0)
+				syscall.SyscallN(setConsoleTitle, 1, uintptr(unsafe.Pointer(ptr)), 0, 0)
 			}
 		}
 	}