Merge branch 'dev_doc' into 'master' (merge request !82)

dev_doc

Author: tencentyuncos

ci_doc.go

@@ -1,9 +1,11 @@
 package cos
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"encoding/xml"
+	"io"
 	"net/http"
 	"net/url"
 )
@@ -293,6 +295,53 @@ func (s *CIService) DocPreview(ctx context.Context, name string, opt *DocPreview
 	return resp, err
 }
 
+type CIDocCompareOptions struct {
+	Object      string `url:"object,omitempty"`
+	ComparePath string `url:"comparePath,omitempty"`
+	CompareUrl  string `url:"compareUrl,omitempty"`
+	SrcType     string `url:"srcType,omitempty"`
+	TgtUri      string `url:"tgtUri,omitempty"`
+}
+
+type CIDocCompareResult struct {
+	XMLName    xml.Name `xml:"Response"`
+	Code       string   `xml:"Code,omitempty" json:"code,omitempty"`
+	ETag       string   `xml:"ETag,omitempty" json:"eTag,omitempty"`
+	Msg        string   `xml:"Msg,omitempty" json:"msg,omitempty"`
+	ResultPath string   `xml:"ResultPath,omitempty" json:"resultPath,omitempty"`
+}
+
+// 优先 json
+func (w *CIDocCompareResult) Write(p []byte) (n int, err error) {
+	err = json.Unmarshal(p, w)
+	if err != nil {
+		err = xml.NewDecoder(bytes.NewReader(p)).Decode(w)
+		if err == nil {
+			return len(p), nil
+		}
+		if err == io.EOF {
+			err = nil // ignore EOF errors caused by empty response body
+		}
+		return 0, err
+	}
+	return len(p), nil
+}
+
+// DocCompare TODO
+func (s *CIService) CIDocCompare(ctx context.Context, opt *CIDocCompareOptions) (*Response, *CIDocCompareResult, error) {
+	var res CIDocCompareResult
+	sendOpt := sendOptions{
+		baseURL:          s.client.BaseURL.BucketURL,
+		uri:              "/doccompare",
+		optQuery:         opt,
+		method:           http.MethodGet,
+		disableCloseBody: true,
+		result:           &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return resp, &res, err
+}
+
 type DocPreviewHTMLOptions struct {
 	DstType        string      `url:"dstType,omitempty"`
 	SrcType        string      `url:"srcType,omitempty"`

ci_doc_test.go

@@ -202,6 +202,30 @@ func TestCIService_DocPreview(t *testing.T) {
 	}
 }
 
+func TestCIService_CIDocCompare(t *testing.T) {
+	setup()
+	defer teardown()
+
+	mux.HandleFunc("/doccompare", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, http.MethodGet)
+		v := values{
+			"object":      "doc/1.docx",
+			"comparePath": "doc/2.docx",
+		}
+		testFormValues(t, r, v)
+	})
+
+	opt := &CIDocCompareOptions{
+		Object:      "doc/1.docx",
+		ComparePath: "doc/2.docx",
+	}
+
+	_, _, err := client.CI.CIDocCompare(context.Background(), opt)
+	if err != nil {
+		t.Fatalf("CI.DocPreview returned error: %v", err)
+	}
+}
+
 func TestCIService_DocPreviewHTML(t *testing.T) {
 	setup()
 	defer teardown()

example/CI/doc_preview/doc_compare.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"github.com/tencentyun/cos-go-sdk-v5"
+	"github.com/tencentyun/cos-go-sdk-v5/debug"
+)
+
+func log_status(err error) {
+	if err == nil {
+		return
+	}
+	if cos.IsNotFoundError(err) {
+		// WARN
+		fmt.Println("WARN: Resource is not existed")
+	} else if e, ok := cos.IsCOSError(err); ok {
+		fmt.Printf("ERROR: Code: %v\n", e.Code)
+		fmt.Printf("ERROR: Message: %v\n", e.Message)
+		fmt.Printf("ERROR: Resource: %v\n", e.Resource)
+		fmt.Printf("ERROR: RequestId: %v\n", e.RequestID)
+		// ERROR
+	} else {
+		fmt.Printf("ERROR: %v\n", err)
+		// ERROR
+	}
+}
+
+func main() {
+	u, _ := url.Parse("https://test-1234567890.cos.ap-chongqing.myqcloud.com")
+	cu, _ := url.Parse("https://test-1234567890.ci.ap-chongqing.myqcloud.com")
+	b := &cos.BaseURL{BucketURL: u, CIURL: cu}
+	c := cos.NewClient(b, &http.Client{
+		Transport: &cos.AuthorizationTransport{
+			SecretID:  os.Getenv("COS_SECRETID"),
+			SecretKey: os.Getenv("COS_SECRETKEY"),
+			Transport: &debug.DebugRequestTransport{
+				RequestHeader: true,
+				// Notice when put a large file and set need the request body, might happend out of memory error.
+				RequestBody:    true,
+				ResponseHeader: true,
+				ResponseBody:   false,
+			},
+		},
+	})
+
+	opt := &cos.CIDocCompareOptions{
+		Object:      "doc/1.docx",
+		ComparePath: "doc/2.docx",
+	}
+	_, res, err := c.CI.CIDocCompare(context.Background(), opt)
+	fmt.Printf("%+v\n", res)
+	log_status(err)
+}