vtqe/tools/attach.go

@@ -24,14 +24,14 @@ var attachcmd = &cobra.Command{
 			out, _ = this.Flags().GetString("out")
 		}
 		if src == "" || dst == "" {
-			starlog.Criticalln("ERROR PATH")
+			starlog.Println("ERROR PATH", "red", "b")
 			this.Help()
 			return
 		}
 		cryp := new(starainrt.StarCrypto)
 		err := cryp.Attach(src, dst, out)
 		if err != nil {
-			starlog.Criticalln(err.Error)
+			starlog.Println(err.Error, "red", "b")
 		} else {
 			fmt.Println("完成")
 		}

vtqe/tools/base64.go

@@ -17,7 +17,7 @@ var b64cmd = &cobra.Command{
 		ok, _ := this.Flags().GetBool("file")
 		de, _ := this.Flags().GetBool("decode")
 		if len(args) != 1 {
-			starlog.Criticalln("参数不足，请输入文件地址或字符串")
+			starlog.Println("参数不足，请输入文件地址或字符串", "red", "b")
 			this.Help()
 			return
 		}
@@ -47,7 +47,7 @@ var b64cmd = &cobra.Command{
 			}
 		}
 		if err != nil {
-			starlog.Criticalln(err)
+			starlog.Println(err, "red", "b")
 			return
 		}
 	},

vtqe/tools/cd.go

@@ -4,13 +4,10 @@ package tools
 
 import (
 	"bufio"
-	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 
-	"b612.me/starainrt"
-
 	"github.com/spf13/cobra"
 )
 
@@ -21,8 +18,7 @@ var cdcmd = &cobra.Command{
 	Run: func(this *cobra.Command, args []string) {
 		fileInfo, _ := os.Stdin.Stat()
 		if (fileInfo.Mode() & os.ModeNamedPipe) != os.ModeNamedPipe {
-			fmt.Println(args)
+			if len(args) != 1 {
-			if len(args) != 0 {
 				os.Exit(1)
 			} else {
 				exec.Command("cmd.exe", "/c", "explorer "+filepath.Dir(args[0])).Run()
@@ -31,12 +27,7 @@ var cdcmd = &cobra.Command{
 		}
 		s := bufio.NewScanner(os.Stdin)
 		for s.Scan() {
-			dir := s.Text()
+			exec.Command("cmd.exe", "/c", "explorer "+filepath.Dir(s.Text())).Run()
-			if starainrt.IsFile(dir) {
-				exec.Command("cmd.exe", "/c", "explorer /n,/select,"+dir).Run()
-			} else {
-				exec.Command("cmd.exe", "/c", "explorer "+dir).Run()
-			}
 			return
 		}
 	},

vtqe/tools/cmd.go

@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Version string = "0.1.25"
+var Version string = "0.1.20"
 
 var Maincmd = &cobra.Command{
 	Use:   "",
@@ -14,6 +14,5 @@ var Maincmd = &cobra.Command{
 
 func init() {
 	cobra.MousetrapHelpText = ""
-	Maincmd.Flags().BoolP("version", "v", false, "查看版本号")
 	Maincmd.Version = Version
 }

vtqe/tools/curl.go

@@ -73,7 +73,7 @@ var curlcmd = &cobra.Command{
 		if h != "" {
 			head := strings.Split(h, ",")
 			for _, v := range head {
-				hp := strings.Split(v, ":")
+				hp := strings.Split(v, "=")
 				if len(hp) != 2 {
 					continue
 				}

vtqe/tools/detach.go

@@ -25,14 +25,14 @@ var detachcmd = &cobra.Command{
 		}
 		num, _ := this.Flags().GetInt("num")
 		if src == "" || dst == "" {
-			starlog.Criticalln("ERROR PATH")
+			starlog.Println("ERROR PATH", "red", "b")
 			this.Help()
 			return
 		}
 		cryp := new(starainrt.StarCrypto)
 		err := cryp.Detach(src, num, dst, out)
 		if err != nil {
-			starlog.Criticalln(err.Error)
+			starlog.Println(err.Error, "red", "b")
 		} else {
 			fmt.Println("完成")
 		}

vtqe/tools/generate.go

@@ -2,8 +2,6 @@ package tools
 
 import (
 	"fmt"
-	"os"
-	"time"
 
 	"b612.me/starainrt"
 	"github.com/spf13/cobra"
@@ -16,38 +14,26 @@ var gencmd = &cobra.Command{
 	Run: func(this *cobra.Command, args []string) {
 		sum, _ := this.Flags().GetInt("sum")
 		num, _ := this.Flags().GetInt("num")
-		cap, _ := this.Flags().GetInt("cap")
 		if len(args) != 1 {
 			this.Help()
 			return
 		}
-		if num <= 0 {
+		err := starainrt.FillWithRandom(args[0], num, 1024*1024, sum, func(pect float64) {
-			fmt.Println("num不合法，不应该小于1！")
+			if pect == 100 {
-			os.Exit(2)
+				fmt.Println("文件已处理：100.000000%")
-		}
+			} else {
-		if sum <= 0 {
+				fmt.Printf("文件已处理：%f%%\r", pect)
-			fmt.Println("sum不合法，不应该小于1！")
+			}
-			os.Exit(2)
-		}
-		if cap <= 0 {
-			fmt.Println("cap不合法，不应该小于1！")
-			os.Exit(2)
-		}
-		err := starainrt.FillWithRandom(args[0], num, cap, sum, func(pect float64) {
-			fmt.Printf("文件已处理：%f%%\r", pect)
 		})
 		if err != nil {
 			fmt.Println("err:" + err.Error())
 		}
-		fmt.Println("文件已处理：100.0000000%")
-		time.Sleep(time.Millisecond * 10)
 	},
 }
 
 func init() {
 	gencmd.Flags().IntP("sum", "s", 3, "随机的种子组数")
 	gencmd.Flags().IntP("num", "n", 1024, "生成的文件大小")
-	gencmd.Flags().IntP("cap", "c", 1048576, "bufcap大小")
 	gencmd.MarkFlagRequired("num")
 	Maincmd.AddCommand(gencmd)
 }

vtqe/tools/hash.go

@@ -49,7 +49,7 @@ var hashcmd = &cobra.Command{
 			result, err = crypto.SumAll([]byte(args[0]), method)
 		}
 		if err != nil {
-			starlog.Criticalln("错误：" + err.Error())
+			starlog.Println("错误："+err.Error(), "red", "")
 		}
 		for _, v := range method {
 			fmt.Printf("%s：%s\n", v, result[v])

vtqe/tools/http.go

@@ -1,7 +1,6 @@
 package tools
 
 import (
-	"encoding/base64"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -20,48 +19,27 @@ import (
 
 var port, ip, path string
 var up bool
-var basicAuth, certKey string
 
 type TraceHandler struct {
 	h http.Handler
 }
 
-func init() {
-	httpcmd.Flags().StringVarP(&port, "port", "p", "80", "监听端口")
-	httpcmd.Flags().StringVarP(&ip, "ip", "i", "0.0.0.0", "监听ip")
-	httpcmd.Flags().StringVarP(&path, "folder", "f", "./", "本地文件地址")
-	httpcmd.Flags().BoolVarP(&up, "upload", "u", false, "是否开启文件上传")
-	httpcmd.Flags().StringVarP(&basicAuth, "auth", "a", "", "HTTP BASIC AUTH认证(用户名:密码)")
-	httpcmd.Flags().StringVarP(&certKey, "cert", "c", "", "TLS证书路径，用:分割证书与密钥")
-	Maincmd.AddCommand(httpcmd)
-}
-
 // httpCmd represents the http command
 var httpcmd = &cobra.Command{
 	Use:   "http",
 	Short: "HTTP文件服务器",
 	Long:  `HTTP文件服务器`,
 	Run: func(cmd *cobra.Command, args []string) {
-		var err error
 		http.HandleFunc("/", httplisten)
 		path, _ = filepath.Abs(path)
-		starlog.Infoln("Listening On Port:" + port)
+		fmt.Println("Listening On Port:" + port)
 		if up {
-			starlog.Infoln("upload is openned,path is /vtqeupload1127")
+			fmt.Println("upload is openned,path is /vtqeupload1127")
 			http.HandleFunc("/vtqeupload1127", uploadfile)
 		}
-		if certKey == "" {
+		err := http.ListenAndServe(ip+":"+port, nil)
-			err = http.ListenAndServe(ip+":"+port, nil)
-		} else {
-			certs := strings.Split(certKey, ":")
-			if len(certs) != 2 {
-				starlog.Criticalln("证书不正确！")
-				return
-			}
-			err = http.ListenAndServeTLS(ip+":"+port, certs[0], certs[1], nil)
-		}
 		if err != nil {
-			starlog.Criticalln("Error:" + err.Error())
+			starlog.Println("Error:"+err.Error(), "red", "")
 		}
 	},
 }
@@ -74,18 +52,18 @@ func uploadfile(w http.ResponseWriter, r *http.Request) {
 	r.ParseMultipartForm(10485760)
 	file, handler, err := r.FormFile("victorique")
 	if err != nil {
-		starlog.Errorln(err)
+		fmt.Println(err)
 		w.WriteHeader(502)
 		w.Write([]byte(err.Error()))
 		return
 	}
 	defer file.Close()
-	starlog.Noticef("Upload %s From %s\n", handler.Filename, r.RemoteAddr)
+	fmt.Printf("Upload %s From %s\n", handler.Filename, r.RemoteAddr)
 	fmt.Fprintf(w, `<html><body><p>%v</p><h2><a href="./vtqeupload1127/web">Return To Web Page</a></h2></body></html>`, handler.Header)
 	os.Mkdir("./vtqeupload1127", 0755)
 	f, err := os.OpenFile("./vtqeupload1127/"+handler.Filename, os.O_WRONLY|os.O_CREATE, 0755)
 	if err != nil {
-		starlog.Errorln(err)
+		fmt.Println(err)
 		return
 	}
 	defer f.Close()
@@ -93,40 +71,10 @@ func uploadfile(w http.ResponseWriter, r *http.Request) {
 }
 
 func httplisten(w http.ResponseWriter, r *http.Request) {
-	log := starlog.Std.NewFlag()
 	w.Header().Set("Server", "Vicorique")
-	w.Header().Set("Powered", "B612.ME")
-	write401 := func() {
-		w.Header().Set("WWW-Authenticate", ` Basic realm="Please Enter Passwd"`)
-		w.WriteHeader(401)
-		w.Write([]byte(`
-			<html>
-			<head><title>401 Authorization Required</title></head>
-			<body>
-			<center><h1>401 Authorization Required</h1></center>
-			<hr><center>B612 HTTP SERVER</center>
-			</body>
-			</html>`))
-	}
-	if basicAuth != "" {
-		authHeader := strings.TrimSpace(r.Header.Get("Authorization"))
-		if len(authHeader) == 0 {
-			log.Noticeln("No Authed! Get Path is", r.URL.Path, r.RemoteAddr)
-			write401()
-			return
-		} else {
-			userAuth := base64.StdEncoding.EncodeToString([]byte(basicAuth))
-			authStr := strings.Split(authHeader, " ")
-			if strings.TrimSpace(authStr[1]) != userAuth {
-				log.Noticeln("Auth Failed! Get Path is", r.URL.Path, r.RemoteAddr, "pwd enter is", authHeader)
-				write401()
-				return
-			}
-		}
-	}
 	p := r.URL.Path
 	cmd := r.URL.Query()["cmd"]
-	log.Noticeln("Get " + p + "  " + r.RemoteAddr)
+	fmt.Println("Get " + p + "  " + r.RemoteAddr)
 	fullpath, _ := filepath.Abs(path + p)
 
 	if p == "/" {
@@ -136,7 +84,7 @@ func httplisten(w http.ResponseWriter, r *http.Request) {
 	if up {
 		if p == "/vtqeupload1127/web" {
 			w.Write([]byte(`<html><body><form id= "uploadForm" action= "../vtqeupload1127" method= "post" enctype ="multipart/form-data">    
-			<h1 >B612 File Upload Page </h1>
+			<h1 >Victorique's File Upload Page </h1>
 			<p >上传文件： <input type ="file" name="victorique" /></p>      
 			<input type ="submit" value="上传"/>    
 	   </form>
@@ -164,7 +112,7 @@ func httplisten(w http.ResponseWriter, r *http.Request) {
 	}
 	fpdst, err := os.Open(fullpath)
 	if err != nil {
-		log.Errorln(err)
+		fmt.Println(err)
 		w.WriteHeader(403)
 		w.Write([]byte("<h1>403 NO ACCESS</h1>"))
 		return
@@ -189,122 +137,32 @@ func httplisten(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/download")
 		w.Header().Set("Content-Disposition", "attachment;filename="+name)
 	}
-	etag := new(starainrt.StarCrypto).MD5([]byte(fpinfo.ModTime().String()))
 	w.Header().Set("Content-Transfer-Encoding", "binary")
 	w.Header().Set("Accept-Ranges", "bytes")
-	w.Header().Set("ETag", etag)
+	w.Header().Set("Content-Length", strconv.Itoa(int(fpinfo.Size())))
-	w.Header().Set("Last-Modified", strings.ReplaceAll(fpinfo.ModTime().UTC().Format("Mon, 2 Jan 2006 15:04:05 MST"), "UTC", "GMT"))
+	w.WriteHeader(200)
-	isRange := false
-	var rangeStart, rangeEnd int64
-	rangeEnd = -1
-	for k, v := range r.Header {
-		if strings.ToLower(k) == "range" {
-			if strings.Index(v[0], "bytes=") < 0 {
-				break
-			}
-			v[0] = strings.Replace(v[0], "bytes=", "", -1)
-			data := strings.Split(v[0], "-")
-			if len(data) == 0 {
-				break
-			}
-			rangeStart, _ = strconv.ParseInt(data[0], 10, 64)
-			if len(data) == 2 {
-				rangeEnd, _ = strconv.ParseInt(data[1], 10, 64)
-			}
-			//w.WriteHeader(206) //206 支持断点续传
-			isRange = true
-			break
-		}
-	}
 	defer fpdst.Close()
-	var transferData int
+	for {
-	if !isRange {
+		buf := make([]byte, 1048576)
-		w.Header().Set("Content-Length", strconv.FormatInt(fpinfo.Size(), 10))
+		n, err := fpdst.Read(buf)
-		w.WriteHeader(200)
+		if err != nil {
-		for {
+			if err == io.EOF {
-			buf := make([]byte, 1048576)
-			n, err := fpdst.Read(buf)
-			if n != 0 {
-				ns, err := w.Write(buf[0:n])
-				transferData += ns
-				if err != nil {
-					starlog.Errorln("Transfer Error:", err)
-				}
-			}
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
 				break
 			}
+			return
 		}
-	} else {
+		w.Write(buf[0:n])
-		w.Header().Set("Content-Length", strconv.FormatInt(fpinfo.Size(), 10))
-		if rangeEnd == -1 {
-			w.Header().Set("Content-Range", `bytes `+strconv.FormatInt(rangeStart, 10)+"-"+strconv.FormatInt(fpinfo.Size(), 10)+"/"+strconv.FormatInt(fpinfo.Size(), 10))
-			//w.Header().Set("Content-Length", strconv.FormatInt(fpinfo.Size()-rangeStart, 10))
-		} else {
-			w.Header().Set("Content-Range", `bytes `+strconv.FormatInt(rangeStart, 10)+"-"+strconv.FormatInt(rangeEnd, 10)+"/"+strconv.FormatInt(fpinfo.Size(), 10))
-			//w.Header().Set("Content-Length", strconv.FormatInt(1+rangeEnd-rangeStart, 10))
-		}
-		w.WriteHeader(206)
-		fpdst.Seek(int64(rangeStart), 0)
-		count := rangeStart
-		for {
-			buf := make([]byte, 1048576)
-			n, err := fpdst.Read(buf)
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				return
-			}
-			if rangeEnd == -1 {
-				ns, err := w.Write(buf[0:n])
-				transferData += ns
-				if err != nil {
-					starlog.Errorln("Transfer Error:", err)
-				}
-			} else {
-				if count > rangeEnd {
-					break
-				}
-				if count+int64(n) > rangeEnd {
-					w.Write(buf[0 : rangeEnd-count+1])
-					break
-				} else {
-					ns, err := w.Write(buf[0:n])
-					transferData += ns
-					if err != nil {
-						starlog.Errorln("Transfer Error:", err)
-					}
-					count += int64(n)
-				}
-			}
-		}
 	}
-	var tani string
-	tani = fmt.Sprintf("%v Byte", transferData)
-	if f64 := float64(transferData) / 1024; f64 > 1 {
-		tani = fmt.Sprintf("%v KB", f64)
-		if f64 = float64(f64) / 1024; f64 > 1 {
-			tani = fmt.Sprintf("%v MB", f64)
-			if f64 = float64(f64) / 1024; f64 > 1 {
-				tani = fmt.Sprintf("%v GB", f64)
-			}
-		}
-	}
-	log.Infoln(fpinfo.Name(), "客户端下载已结束，共传输大小："+tani)
 }
 
 func ReadFolder(w http.ResponseWriter, r *http.Request, fullpath string, isroot bool) {
 	dir, err := ioutil.ReadDir(fullpath)
 	if err != nil {
-		starlog.Errorln(err)
+		fmt.Println(err)
 		w.WriteHeader(403)
 		w.Write([]byte("<h1>May Cannot Access!</h1>"))
 	}
-	w.Write([]byte("<html>\n<style>\np{margin: 2px auto}\n</style>\n<h1>B612 Http Server - " + Version + "</h1>"))
+	w.Write([]byte("<html>\n<style>\np{margin: 2px auto}\n</style>\n<h1>Victorique Http Server - " + Version + "</h1>"))
 	if up {
 		w.Write([]byte("<a href=/vtqeupload1127/web>Upload Web Page Is Openned!</a><br /><br />"))
 	}
@@ -329,3 +187,10 @@ func ReadFolder(w http.ResponseWriter, r *http.Request, fullpath string, isroot
 	w.Write([]byte("</pre>\n</html>"))
 	return
 }
+func init() {
+	httpcmd.Flags().StringVarP(&port, "port", "p", "80", "监听端口")
+	httpcmd.Flags().StringVarP(&ip, "ip", "i", "0.0.0.0", "监听ip")
+	httpcmd.Flags().StringVarP(&path, "folder", "f", "./", "本地文件地址")
+	httpcmd.Flags().BoolVarP(&up, "upload", "u", false, "是否开启文件上传")
+	Maincmd.AddCommand(httpcmd)
+}

vtqe/tools/image-basic.go

@@ -1,194 +0,0 @@
-package tools
-
-import (
-	"errors"
-	"image"
-	"io/ioutil"
-	"os"
-
-	"github.com/golang/freetype"
-
-	"github.com/nfnt/resize"
-
-	"image/color"
-	"image/draw"
-	_ "image/gif"
-	_ "image/jpeg"
-	"image/png"
-	_ "image/png"
-
-	"b612.me/starainrt"
-)
-
-func OpenImage(name string) (image.Image, error) {
-	if !starainrt.Exists(name) {
-		return nil, errors.New("File Not Exists")
-	}
-	fso, err := os.Open(name)
-	if err != nil {
-		return nil, err
-	}
-	img, _, err := image.Decode(fso)
-	if err != nil {
-		return nil, err
-	}
-	return img, nil
-}
-
-func MergePhoto(big, small image.Image, bigsize, smallsize uint, x, y int) image.Image {
-	big = resize.Resize(bigsize, bigsize, big, resize.Lanczos3)
-	small = resize.Resize(smallsize, smallsize, small, resize.Lanczos3)
-	offset := image.Pt(x, y)
-	b := big.Bounds()
-	nimg := image.NewRGBA(b)
-	draw.Draw(nimg, b, big, image.ZP, draw.Src)
-	draw.Draw(nimg, small.Bounds(), small, offset, draw.Over)
-	return nimg
-}
-
-func SavePhoto(path string, img image.Image) error {
-	imgf, err := os.Create(path)
-	if err != nil {
-		return err
-	}
-	defer imgf.Close()
-	return png.Encode(imgf, img)
-}
-
-func SetAlpha(img image.Image, alpha uint8) image.Image {
-	size := img.Bounds()
-	nimg := image.NewRGBA(size)
-	for x := 0; x < size.Dx(); x++ {
-		for y := 0; y < size.Dy(); y++ {
-			r, g, b, a := img.At(x, y).RGBA()
-			r = r >> 8
-			g = g >> 8
-			b = b >> 8
-			a = a >> 8
-			nimg.Set(x, y, color.NRGBA{uint8(r), uint8(g), uint8(b), alpha})
-			//nimg.Set(x, y, color.Alpha{alpha})
-			//nimg.Set(x, y, img.At(x, y))
-		}
-	}
-	return nimg
-}
-
-func AddText(text string, img image.Image, x, y int, dpi, size float64, colors color.RGBA, ttf string) (image.Image, error) {
-	if !starainrt.Exists(ttf) {
-		return nil, errors.New("File Not Exists")
-	}
-	fontbyte, err := ioutil.ReadFile(ttf)
-	if err != nil {
-		return nil, err
-	}
-	font, err := freetype.ParseFont(fontbyte)
-	if err != nil {
-		return nil, err
-	}
-	nimg, ok := img.(draw.Image)
-	if !ok {
-		size := img.Bounds()
-		nimg = image.NewRGBA(img.Bounds())
-		for x := 0; x < size.Dx(); x++ {
-			for y := 0; y < size.Dy(); y++ {
-				r, g, b, a := img.At(x, y).RGBA()
-				nimg.Set(x, y, color.NRGBA{uint8(r), uint8(g), uint8(b), uint8(a)})
-			}
-		}
-	}
-	f := freetype.NewContext()
-	f.SetDPI(dpi)
-	f.SetFontSize(size)
-	f.SetFont(font)
-	f.SetClip(nimg.Bounds())
-	f.SetDst(nimg)
-	f.SetSrc(image.NewUniform(colors))
-	_, err = f.DrawString(text, freetype.Pt(x, y))
-	if err != nil {
-		return nil, err
-	}
-	return nimg, nil
-}
-
-type TextImg struct {
-	Text  string
-	X     int
-	Y     int
-	Dpi   float64
-	Size  float64
-	Color color.NRGBA
-}
-
-type TextList struct {
-	List []TextImg
-	TTF  []byte
-}
-
-func AddListTests(list TextList, img image.Image) (image.Image, error) {
-	font, err := freetype.ParseFont(list.TTF)
-	if err != nil {
-		return nil, err
-	}
-	nimg, ok := img.(draw.Image)
-	if !ok {
-		size := img.Bounds()
-		nimg = image.NewRGBA(img.Bounds())
-		for x := 0; x < size.Dx(); x++ {
-			for y := 0; y < size.Dy(); y++ {
-				r, g, b, a := img.At(x, y).RGBA()
-				nimg.Set(x, y, color.NRGBA{uint8(r), uint8(g), uint8(b), uint8(a)})
-			}
-		}
-	}
-	for _, v := range list.List {
-		f := freetype.NewContext()
-		f.SetDPI(v.Dpi)
-		f.SetFontSize(v.Size)
-		f.SetFont(font)
-		f.SetClip(nimg.Bounds())
-		f.SetDst(nimg)
-		f.SetSrc(image.NewUniform(v.Color))
-		_, err = f.DrawString(v.Text, freetype.Pt(v.X, v.Y))
-		if err != nil {
-			return nil, err
-		}
-	}
-	return nimg, nil
-}
-
-func AddTexts(text string, img image.Image, x, y int, dpi, size float64, colors color.NRGBA, ttf string) (image.Image, error) {
-	if !starainrt.Exists(ttf) {
-		return nil, errors.New("File Not Exists")
-	}
-	fontbyte, err := ioutil.ReadFile(ttf)
-	if err != nil {
-		return nil, err
-	}
-	font, err := freetype.ParseFont(fontbyte)
-	if err != nil {
-		return nil, err
-	}
-	nimg, ok := img.(draw.Image)
-	if !ok {
-		size := img.Bounds()
-		nimg = image.NewRGBA(img.Bounds())
-		for x := 0; x < size.Dx(); x++ {
-			for y := 0; y < size.Dy(); y++ {
-				r, g, b, a := img.At(x, y).RGBA()
-				nimg.Set(x, y, color.NRGBA{uint8(r), uint8(g), uint8(b), uint8(a)})
-			}
-		}
-	}
-	f := freetype.NewContext()
-	f.SetDPI(dpi)
-	f.SetFontSize(size)
-	f.SetFont(font)
-	f.SetClip(nimg.Bounds())
-	f.SetDst(nimg)
-	f.SetSrc(image.NewUniform(colors))
-	_, err = f.DrawString(text, freetype.Pt(x, y))
-	if err != nil {
-		return nil, err
-	}
-	return nimg, nil
-}

vtqe/tools/image.go

@@ -1,83 +0,0 @@
-package tools
-
-import (
-	"fmt"
-	"image"
-
-	"b612.me/starlog"
-	"github.com/spf13/cobra"
-)
-
-func init() {
-	imageCmd.AddCommand(imgMirrorCmd)
-	Maincmd.AddCommand(imageCmd)
-}
-
-var imageCmd = &cobra.Command{
-	Use:   "image",
-	Short: "图像处理",
-	Long:  "简单的图像处理工具",
-	Run: func(this *cobra.Command, args []string) {
-		this.Help()
-	},
-}
-
-var imgMirrorCmd = &cobra.Command{
-	Use:   "mirror",
-	Short: "图像镜像翻转",
-	Long:  "图像镜像翻转<水平>",
-	Run: func(this *cobra.Command, args []string) {
-		if len(args) == 0 {
-			starlog.Errorln("请指定需要转换的图像！")
-			return
-		}
-		for _, v := range args {
-			img, err := OpenImage(v)
-			if err != nil {
-				starlog.Errorln(err, v)
-				continue
-			}
-			size := img.Bounds()
-			nimg := image.NewRGBA(size)
-			for x := 0; x < size.Dx(); x++ {
-				for y := 0; y < size.Dy(); y++ {
-					nimg.Set(size.Dx()-x, y, img.At(x, y))
-				}
-			}
-			if err := SavePhoto(v, nimg); err != nil {
-				starlog.Errorln(err, v)
-				continue
-			} else {
-				fmt.Println(v, "转换已完成！")
-			}
-		}
-		fmt.Println("任务完成！")
-	},
-}
-
-var imgAlpha = &cobra.Command{
-	Use:   "alpha",
-	Short: "设置透明度",
-	Long:  "设置alpha通道透明度",
-	Run: func(this *cobra.Command, args []string) {
-		if len(args) == 0 {
-			starlog.Errorln("请指定需要转换的图像！")
-			return
-		}
-		for _, v := range args {
-			img, err := OpenImage(v)
-			if err != nil {
-				starlog.Errorln(err, v)
-				continue
-			}
-			img = SetAlpha(img, 4)
-			if err := SavePhoto(v, img); err != nil {
-				starlog.Errorln(err, v)
-				continue
-			} else {
-				fmt.Println(v, "转换已完成！")
-			}
-		}
-		fmt.Println("任务完成！")
-	},
-}

vtqe/tools/merge.go

@@ -35,7 +35,7 @@ var mergecmd = &cobra.Command{
 			}
 		})
 		if err != nil {
-			starlog.Errorln(err.Error)
+			starlog.Println(err.Error, "red", "")
 		}
 
 	},

vtqe/tools/net.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -669,24 +668,21 @@ func TcpNatServer(tcplocal *net.TCPAddr, pwd string) {
 					}()
 				}
 				return
-			} else {
+			}
-				isRun := false
+		}()
+		go func() {
+			if isconn {
 				buf := make([]byte, 7)
-				if strings.Split(conn.RemoteAddr().String(), ":")[0] == strings.Split(trueconn.RemoteAddr().String(), ":")[0] {
+				n, err := conn.Read(buf)
-					isRun = true
+				if n != 7 || err != nil {
-					n, err := conn.Read(buf)
+					conn.Close()
-					if n != 7 || err != nil {
+					return
-						conn.Close()
-						return
-					}
 				}
+
 				if string(buf) == "v%2^f&K" {
 					fmt.Println("穿透客户端已建立新连接")
 					if len(waitconn) != 0 {
-						if waitconn[0].Msg != nil {
+						conn.Write(waitconn[0].Msg)
-							conn.Write(waitconn[0].Msg)
-						}
-						waitconn[0].Msg = []byte{}
 						go TcpCopy(waitconn[0].Conn, conn)
 						go TcpCopy(conn, waitconn[0].Conn)
 						if len(waitconn) > 1 {
@@ -699,12 +695,7 @@ func TcpNatServer(tcplocal *net.TCPAddr, pwd string) {
 					}
 				} else {
 					fmt.Println("链接已加入等待列表")
-					var tcpnats tcpnat
+					tcpnats := tcpnat{Msg: buf, Conn: conn, Date: time.Now().Unix()}
-					if isRun {
-						tcpnats = tcpnat{Msg: buf, Conn: conn, Date: time.Now().Unix()}
-					} else {
-						tcpnats = tcpnat{Msg: nil, Conn: conn, Date: time.Now().Unix()}
-					}
 					waitconn = append(waitconn, tcpnats)
 					if trueconn == nil {
 						isconn = false

vtqe/tools/split.go

@@ -27,12 +27,12 @@ var splitcmd = &cobra.Command{
 			num, _ = this.Flags().GetInt("num")
 		}
 		if !starainrt.Exists(src) {
-			starlog.Errorln("源文件不存在")
+			starlog.Println("源文件不存在", "red", "b")
 			this.Help()
 			return
 		}
 		if num == 0 {
-			starlog.Errorln("参数num不合法", "red")
+			starlog.Println("参数num不合法", "red", "b")
 			this.Help()
 			return
 		}
@@ -46,7 +46,7 @@ var splitcmd = &cobra.Command{
 			}
 		})
 		if err != nil {
-			starlog.Errorln(err.Error)
+			starlog.Println(err.Error, "red", "")
 		}
 
 	},

vtqe/tools/tcp.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"b612.me/starainrt"
-	"b612.me/starlog"
 
 	"github.com/spf13/cobra"
 )
@@ -24,8 +23,7 @@ var tcpcmd = &cobra.Command{
 	Short: "发送并监听tcp数据包",
 	Long:  "发送并监听tcp数据包",
 	Run: func(this *cobra.Command, args []string) {
-		r, _ := this.Flags().GetBool("recvonly")
+		if len(args) != 1 {
-		if len(args) != 1 && !r {
 			fmt.Println("请指定远程tcp地址")
 			return
 		}
@@ -53,19 +51,19 @@ var tcpcmd = &cobra.Command{
 						fmt.Printf("Error Connect From %s : %s\n", conn.RemoteAddr(), err.Error())
 						continue
 					}
-					starlog.Infof("Accept Connect From %s\n", conn.RemoteAddr())
+					fmt.Printf("Accept Connect From %s\n", conn.RemoteAddr())
 					go func(conns *net.TCPConn) {
 						for {
 							buf := make([]byte, 204800)
 							n, err := conns.Read(buf)
 							if err != nil {
-								starlog.Infof("Error from %s Where Message=%s\n", conns.RemoteAddr(), err.Error())
+								fmt.Printf("Error from %s Where Message=%s\n", conns.RemoteAddr(), err.Error())
 								conn.Close()
 								return
 							}
-							starlog.Infof("Receive Msg From %s : %s\n", conns.RemoteAddr(), string(buf[0:n]))
+							fmt.Printf("Receive Msg From %s : %s\n", conns.RemoteAddr(), string(buf[0:n]))
 							if b {
-								starlog.Infof("%#v", buf[0:n])
+								fmt.Println(buf[0:n])
 							}
 						}
 
@@ -73,62 +71,56 @@ var tcpcmd = &cobra.Command{
 				}
 			}()
 		}
-		if !r {
+		mytcp, err := net.DialTimeout("tcp", args[0], time.Second*15)
-			mytcp, err := net.DialTimeout("tcp", args[0], time.Second*15)
+		if err != nil {
-			if err != nil {
+			fmt.Println(err)
-				fmt.Println(err)
+			if s {
-				if s {
-					for {
-						time.Sleep(time.Second * 10)
-					}
-				}
-				return
-			}
-			defer mytcp.Close()
-			fmt.Println("TCP连接已建立")
-			go func() {
-				var err error
 				for {
-					txt := starainrt.MessageBox("", "")
+					time.Sleep(time.Second * 10)
-					if txt == "" {
-						continue
-					}
-					if !b {
-						_, err = mytcp.Write([]byte(txt))
-					} else {
-						var sendbyte []byte
-						bytes := strings.Split(txt, ",")
-						for _, v := range bytes {
-							ints, _ := strconv.Atoi(v)
-							if ints < 0 || ints > 255 {
-								continue
-							}
-							sendbyte = append(sendbyte, byte(ints))
-						}
-						_, err = mytcp.Write(sendbyte)
-					}
-					if err != nil {
-						starlog.Errorf("Error from %s Where Message=%s\n", mytcp.RemoteAddr().String(), err.Error())
-						return
-					}
 				}
-			}()
+			}
+			return
+		}
+		defer mytcp.Close()
+		fmt.Println("TCP连接已建立")
+		go func() {
+			var err error
 			for {
-				buf := make([]byte, 204800)
+				txt := starainrt.MessageBox("", "")
-				n, err := mytcp.Read(buf)
+				if txt == "" {
+					continue
+				}
+				if !b {
+					_, err = mytcp.Write([]byte(txt))
+				} else {
+					var sendbyte []byte
+					bytes := strings.Split(txt, ",")
+					for _, v := range bytes {
+						ints, _ := strconv.Atoi(v)
+						if ints < 0 || ints > 255 {
+							continue
+						}
+						sendbyte = append(sendbyte, byte(ints))
+					}
+					_, err = mytcp.Write(sendbyte)
+				}
 				if err != nil {
-					starlog.Errorf("Error from %s Where Message=%s\n", mytcp.RemoteAddr().String(), err.Error())
+					fmt.Printf("Error from %s Where Message=%s\n", mytcp.RemoteAddr().String(), err.Error())
 					return
 				}
-
-				starlog.Infof("Receive Msg From %s : %s\n", mytcp.RemoteAddr().String(), string(buf[0:n]))
-				if b {
-					starlog.Infof("%#v", buf[0:n])
-				}
 			}
-		} else {
+		}()
-			for {
+		for {
-				time.Sleep(time.Second)
+			buf := make([]byte, 204800)
+			n, err := mytcp.Read(buf)
+			if err != nil {
+				fmt.Printf("Error from %s Where Message=%s\n", mytcp.RemoteAddr().String(), err.Error())
+				return
+			}
+
+			fmt.Printf("Receive Msg From %s : %s\n", mytcp.RemoteAddr().String(), string(buf[0:n]))
+			if b {
+				fmt.Println(buf[0:n])
 			}
 		}
 	},
@@ -149,7 +141,6 @@ func init() {
 	tcpsendcmd.Flags().StringP("regexp", "r", "", "正则匹配字符串")
 	tcprecvcmd.Flags().StringP("port", "p", "1127", "本地监听端口")
 	tcprecvcmd.Flags().StringP("addr", "a", "0.0.0.0", "本地监听ip")
-	tcpcmd.Flags().BoolP("recvonly", "r", false, "仅接收udp包")
 	tcpcmd.AddCommand(tcpsendcmd, tcprecvcmd)
 }
 

vtqe/tools/udp.go

@@ -5,10 +5,8 @@ import (
 	"net"
 	"strconv"
 	"strings"
-	"time"
 
 	"b612.me/starainrt"
-	"b612.me/starlog"
 
 	"github.com/spf13/cobra"
 )
@@ -18,9 +16,7 @@ var udpcmd = &cobra.Command{
 	Short: "发送并监听udp数据包",
 	Long:  "发送并监听udp数据包",
 	Run: func(this *cobra.Command, args []string) {
-		var raddr *net.UDPAddr
+		if len(args) != 1 {
-		r, _ := this.Flags().GetBool("recvonly")
-		if len(args) != 1 && !r {
 			fmt.Println("请指定远程udp地址")
 			return
 		}
@@ -29,9 +25,7 @@ var udpcmd = &cobra.Command{
 		s, _ := this.Flags().GetBool("local")
 		b, _ := this.Flags().GetBool("byte")
 		laddr, err := net.ResolveUDPAddr("udp", a+":"+l)
-		if !r {
+		raddr, err := net.ResolveUDPAddr("udp", args[0])
-			raddr, err = net.ResolveUDPAddr("udp", args[0])
-		}
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -48,66 +42,60 @@ var udpcmd = &cobra.Command{
 					buf := make([]byte, 204800)
 					n, addr, err := udplisten.ReadFromUDP(buf)
 					if err != nil {
-						starlog.Errorln("Error from %s Where Message=%s\n", addr.String(), err.Error())
+						fmt.Printf("Error from %s Where Message=%s\n", addr.String(), err.Error())
 						continue
 					}
-					starlog.Infof("Receive Msg From %s : %s\n", addr.String(), string(buf[0:n]))
+					fmt.Printf("Receive Msg From %s : %s\n", addr.String(), string(buf[0:n]))
 					if b {
-						starlog.Infof("%#v\n", buf[0:n])
+						fmt.Println(buf[0:n])
 					}
 				}
 			}()
 		}
-		if !r {
+		myudp, err := net.DialUDP("udp", nil, raddr)
-			myudp, err := net.DialUDP("udp", nil, raddr)
+		if err != nil {
-			if err != nil {
+			fmt.Println(err)
-				fmt.Println(err)
+			return
-				return
+		}
-			}
+		fmt.Println("UDP虚拟连接已建立")
-			fmt.Println("UDP虚拟连接已建立")
+		go func() {
-			go func() {
+			var err error
-				var err error
-				for {
-					txt := starainrt.MessageBox("", "")
-					if txt == "" {
-						continue
-					}
-					if !b {
-						_, err = myudp.Write([]byte(txt))
-					} else {
-						var sendbyte []byte
-						bytes := strings.Split(txt, ",")
-						for _, v := range bytes {
-							ints, _ := strconv.Atoi(v)
-							if ints < 0 || ints > 255 {
-								continue
-							}
-							sendbyte = append(sendbyte, byte(ints))
-						}
-						_, err = myudp.Write(sendbyte)
-					}
-					if err != nil {
-						fmt.Printf("Error from %s Where Message=%s\n", myudp.RemoteAddr().String(), err.Error())
-						return
-					}
-				}
-			}()
 			for {
-				buf := make([]byte, 204800)
+				txt := starainrt.MessageBox("", "")
-				n, err := myudp.Read(buf)
+				if txt == "" {
+					continue
+				}
+				if !b {
+					_, err = myudp.Write([]byte(txt))
+				} else {
+					var sendbyte []byte
+					bytes := strings.Split(txt, ",")
+					for _, v := range bytes {
+						ints, _ := strconv.Atoi(v)
+						if ints < 0 || ints > 255 {
+							continue
+						}
+						sendbyte = append(sendbyte, byte(ints))
+					}
+					_, err = myudp.Write(sendbyte)
+				}
 				if err != nil {
-					starlog.Infof("Error from %s Where Message=%s\n", myudp.RemoteAddr().String(), err.Error())
+					fmt.Printf("Error from %s Where Message=%s\n", myudp.RemoteAddr().String(), err.Error())
 					return
 				}
-
-				starlog.Infof("Receive Msg From %s : %s\n", myudp.RemoteAddr().String(), string(buf[0:n]))
-				if b {
-					starlog.Infof("%#v", buf[0:n])
-				}
 			}
-		} else {
+		}()
-			for {
+		for {
-				time.Sleep(time.Second)
+			buf := make([]byte, 204800)
+			n, err := myudp.Read(buf)
+			if err != nil {
+				fmt.Printf("Error from %s Where Message=%s\n", myudp.RemoteAddr().String(), err.Error())
+				return
+			}
+
+			fmt.Printf("Receive Msg From %s : %s\n", myudp.RemoteAddr().String(), string(buf[0:n]))
+			if b {
+				fmt.Println(buf[0:n])
 			}
 		}
 	},
@@ -123,5 +111,4 @@ func init() {
 	udpcmd.Flags().StringP("port", "p", "1127", "本地监听端口")
 	udpcmd.Flags().StringP("addr", "a", "0.0.0.0", "本地监听ip")
 	udpcmd.Flags().BoolP("local", "s", false, "启动本地监听")
-	udpcmd.Flags().BoolP("recvonly", "r", false, "仅接收udp包")
 }

vtqe/tools/vic.go

@@ -22,7 +22,7 @@ var viccmd = &cobra.Command{
 		rep, _ := this.Flags().GetBool("replace")
 		ext, _ := this.Flags().GetBool("extension")
 		if len(args) != 2 || args[1] != "sakura" {
-			starlog.Errorln("ヴィクトリカだけが使えるよ")
+			starlog.Println("ヴィクトリカだけが使えるよ", "red", "b")
 			return
 		}
 		shell := func(pect float64) {
@@ -77,7 +77,7 @@ var viccmd = &cobra.Command{
 			}
 		}
 		if err != nil {
-			starlog.Errorln(err)
+			starlog.Println(err, "red", "b")
 			return
 		}
 	},