docs: ✏️ add goreportcard badge

Author: YYCoder

README.md

@@ -3,6 +3,7 @@ Little cli utility for lazy guy😉 ~ Transforming protobuf idl to thrift, and v
 
 [![YYCoder](https://circleci.com/gh/YYCoder/protobuf-thrift.svg?style=svg)](https://app.circleci.com/pipelines/github/YYCoder/protobuf-thrift)
 [![GoDoc](https://pkg.go.dev/badge/github.com/YYCoder/protobuf-thrift)](https://pkg.go.dev/github.com/YYCoder/protobuf-thrift)
+[![goreportcard](https://goreportcard.com/badge/github.com/yycoder/protobuf-thrift)](https://goreportcard.com/report/github.com/yycoder/protobuf-thrift)
 
 > [IDL](https://en.wikipedia.org/wiki/IDL)(Interface description language), which is a descriptive language used to define data types and interfaces in a way that is independent of the programming language or operating system/processor platform.
 
@@ -21,13 +22,13 @@ For Gophers, you can just `go install github.com/YYCoder/protobuf-thrift` it you
 Basic thrift file to protobuf file transform:
 
 ```
-protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto`
+protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto
 ```
 
 Basic protobuf file to thrift file transform:
 
 ```
-protobuf-thrift -t proto2thrift -i ./path/to/idl.thrift -o ./test.proto`
+protobuf-thrift -t proto2thrift -i ./path/to/idl.thrift -o ./test.proto
 ```
 
 ### Interactive Usage
@@ -46,7 +47,7 @@ Under some circumstances, you may want to transform a whole idl repo to another
 This option is off by default, so you have to specify it explicitly.
 
 ```
-protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto -r 1`
+protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto -r 1
 ```
 
 

docs/cn.md

@@ -1,6 +1,10 @@
 # protobuf-thrift
 为懒人准备的 protobuf 与 thrift 互转的小工具😉。
 
+[![YYCoder](https://circleci.com/gh/YYCoder/protobuf-thrift.svg?style=svg)](https://app.circleci.com/pipelines/github/YYCoder/protobuf-thrift)
+[![GoDoc](https://pkg.go.dev/badge/github.com/YYCoder/protobuf-thrift)](https://pkg.go.dev/github.com/YYCoder/protobuf-thrift)
+[![goreportcard](https://goreportcard.com/badge/github.com/yycoder/protobuf-thrift)](https://goreportcard.com/report/github.com/yycoder/protobuf-thrift)
+
 > [IDL](https://en.wikipedia.org/wiki/IDL)(Interface description language)。是指一种用于定义数据类型以及接口的描述性语言，与编程语言以及平台无关，常用在微服务架构中。
 
 ## 安装
@@ -14,13 +18,13 @@
 将 thrift 文件转成 protobuf 文件：
 
 ```
-protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto`
+protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto
 ```
 
 将 protobuf 文件转成 thrift 文件：
 
 ```
-protobuf-thrift -t proto2thrift -i ./path/to/idl.thrift -o ./test.proto`
+protobuf-thrift -t proto2thrift -i ./path/to/idl.thrift -o ./test.proto
 ```
 
 ### 交互式用法
@@ -38,7 +42,7 @@ protobuf-thrift -t proto2thrift -i ./path/to/idl.thrift -o ./test.proto`
 
 
 ```
-protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto -r 1`
+protobuf-thrift -t thrift2proto -i ./path/to/idl.thrift -o ./idl.proto -r 1
 ```
 
 

proto-2-thrift-gen.go

@@ -132,10 +132,9 @@ func (g *thriftGenerator) Parse() (newFiles []FileInfo, err error) {
 		case *proto.Option:
 		case *proto.Comment:
 			ele := e.(*proto.Comment)
-			logger.Infof("proto.Comment comment %+v", ele)
 			g.handleComment(ele, false, 0)
 		default:
-			logger.Infof("other: %+v\n", e)
+			// logger.Infof("other: %+v\n", e)
 		}
 	}
 

thrift-2-proto-gen.go

@@ -10,19 +10,18 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/emicklei/proto"
-	goThrift "github.com/samuel/go-thrift/parser"
-
 	"github.com/YYCoder/protobuf-thrift/utils"
 	"github.com/YYCoder/protobuf-thrift/utils/logger"
+	"github.com/YYCoder/thrifter"
+	"github.com/emicklei/proto"
 )
 
 type protoGenerator struct {
 	conf         *protoGeneratorConfig
-	def          *goThrift.Thrift
+	def          *thrifter.Thrift
 	file         *os.File
 	protoContent bytes.Buffer
-	protoAST     *proto.Proto
+	// protoAST     *proto.Proto
 }
 
 type protoGeneratorConfig struct {
@@ -42,22 +41,22 @@ type protoGeneratorConfig struct {
 }
 
 func NewProtoGenerator(conf *protoGeneratorConfig) (res SubGenerator, err error) {
-	var parser *goThrift.Parser
+	var parser *thrifter.Parser
 	var file *os.File
-	var definition *goThrift.Thrift
+	var definition *thrifter.Thrift
 	if conf.taskType == TASK_FILE_THRIFT2PROTO {
 		file, err = os.Open(conf.filePath)
 		if err != nil {
 			return nil, err
 		}
 		defer file.Close()
-		parser = &goThrift.Parser{Filesystem: nil}
-		definition, err = parser.Parse(file)
+		parser = thrifter.NewParser(file, false)
+		definition, err = parser.Parse(file.Name())
 
 	} else if conf.taskType == TASK_CONTENT_THRIFT2PROTO {
 		rd := strings.NewReader(conf.rawContent)
-		parser = &goThrift.Parser{Filesystem: nil}
-		definition, err = parser.Parse(rd)
+		parser = thrifter.NewParser(rd, false)
+		definition, err = parser.Parse("INPUT")
 	}
 
 	if err != nil {
@@ -81,7 +80,7 @@ func (g *protoGenerator) FilePath() (res string) {
 	return
 }
 
-// generate protoAST from thrift ast, return absolute file paths included by current file
+// parse thrift ast, return absolute file paths included by current file
 func (g *protoGenerator) Parse() (newFiles []FileInfo, err error) {
 	g.protoAST = &proto.Proto{}