feat: support RESTful api (#33)

internal/protocol/http/fetcher.go

@@ -8,7 +8,6 @@ import (
 	"github.com/monkeyWie/gopeed-core/pkg/base"
 	"golang.org/x/sync/errgroup"
 	"io"
-	"io/ioutil"
 	"mime"
 	"net/http"
 	"net/http/cookiejar"
@@ -75,7 +74,7 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 			if err != nil {
 				return nil, err
 			}
-			res.Length = parse
+			res.Size = parse
 		}
 	} else if base.HttpCodeOK == httpResp.StatusCode {
 		// 返回200响应码，不支持断点下载，通过Content-Length头获取文件大小，获取不到的话可能是chunked编码
@@ -85,13 +84,13 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 			if err != nil {
 				return nil, err
 			}
-			res.Length = parse
+			res.Size = parse
 		}
 	} else {
 		return nil, NewRequestError(httpResp.StatusCode, httpResp.Status)
 	}
 	file := &base.FileInfo{
-		Size: res.Length,
+		Size: res.Size,
 	}
 	contentDisposition := httpResp.Header.Get(base.HttpHeaderContentDisposition)
 	if contentDisposition != "" {
@@ -123,14 +122,14 @@ func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
 func (f *Fetcher) Start() (err error) {
 	// 创建文件
 	name := f.filename()
-	_, err = f.Ctl.Touch(name, f.res.Length)
+	_, err = f.Ctl.Touch(name, f.res.Size)
 	if err != nil {
 		return err
 	}
-	f.status = base.DownloadStatusStart
+	f.status = base.DownloadStatusRunning
 	if f.res.Range {
 		// 每个连接平均需要下载的分块大小
-		chunkSize := f.res.Length / int64(f.opts.Connections)
+		chunkSize := f.res.Size / int64(f.opts.Connections)
 		f.chunks = make([]*Chunk, f.opts.Connections)
 		for i := 0; i < f.opts.Connections; i++ {
 			var (
@@ -139,7 +138,7 @@ func (f *Fetcher) Start() (err error) {
 			)
 			if i == f.opts.Connections-1 {
 				// 最后一个分块需要保证把文件下载完
-				end = f.res.Length - 1
+				end = f.res.Size - 1
 			} else {
 				end = begin + chunkSize - 1
 			}
@@ -156,7 +155,7 @@ func (f *Fetcher) Start() (err error) {
 }
 
 func (f *Fetcher) Pause() (err error) {
-	if base.DownloadStatusStart != f.status {
+	if base.DownloadStatusRunning != f.status {
 		return
 	}
 	f.status = base.DownloadStatusPause
@@ -166,10 +165,10 @@ func (f *Fetcher) Pause() (err error) {
 }
 
 func (f *Fetcher) Continue() (err error) {
-	if base.DownloadStatusStart == f.status || base.DownloadStatusDone == f.status {
+	if base.DownloadStatusRunning == f.status || base.DownloadStatusDone == f.status {
 		return
 	}
-	f.status = base.DownloadStatusStart
+	f.status = base.DownloadStatusRunning
 	var name = f.filename()
 	_, err = f.Ctl.Open(name)
 	if err != nil {
@@ -352,7 +351,7 @@ func buildRequest(ctx context.Context, req *base.Request) (httpReq *http.Request
 			}
 		}
 		if extra.Body != "" {
-			body = ioutil.NopCloser(bytes.NewBufferString(extra.Body))
+			body = bytes.NewBufferString(extra.Body)
 		}
 	}
 

internal/protocol/http/fetcher_test.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"fmt"
 	"github.com/monkeyWie/gopeed-core/internal/controller"
 	"github.com/monkeyWie/gopeed-core/internal/fetcher"
 	"github.com/monkeyWie/gopeed-core/pkg/base"
@@ -13,8 +14,8 @@ import (
 
 func TestFetcher_Resolve(t *testing.T) {
 	testResolve(test.StartTestFileServer, &base.Resource{
-		Length: test.BuildSize,
-		Range:  true,
+		Size:  test.BuildSize,
+		Range: true,
 		Files: []*base.FileInfo{
 			{
 				Name: test.BuildName,
@@ -23,8 +24,8 @@ func TestFetcher_Resolve(t *testing.T) {
 		},
 	}, t)
 	testResolve(test.StartTestChunkedServer, &base.Resource{
-		Length: 0,
-		Range:  false,
+		Size:  0,
+		Range: false,
 		Files: []*base.FileInfo{
 			{
 				Name: test.BuildName,
@@ -46,7 +47,7 @@ func testResolve(startTestServer func() net.Listener, want *base.Resource, t *te
 	}
 	res.Req = nil
 	if !reflect.DeepEqual(want, res) {
-		t.Errorf("Resolve error = %v, want %v", res, want)
+		t.Errorf("Resolve() got = %v, want %v", res, want)
 	}
 }
 
@@ -75,7 +76,13 @@ func TestFetcher_DownloadChunked(t *testing.T) {
 	defer listener.Close()
 	// chunked编码下载
 	downloadNormal(listener, 1, t)
-	//downloadContinue(listener, 1, t)
+}
+
+func TestFetcher_DownloadPost(t *testing.T) {
+	listener := test.StartTestPostServer()
+	defer listener.Close()
+	// post下载
+	downloadPost(listener, 1, t)
 }
 
 func TestFetcher_DownloadRetry(t *testing.T) {
@@ -135,7 +142,31 @@ func downloadNormal(listener net.Listener, connections int, t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Download error = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
+	}
+}
+
+func downloadPost(listener net.Listener, connections int, t *testing.T) {
+	fetcher, _, _ := downloadReady(listener, connections, t)
+	fetcher.(*Fetcher).res.Req.Extra = Extra{
+		Method: "POST",
+		Header: map[string]string{
+			"Authorization": "Bearer 123456",
+		},
+		Body: fmt.Sprintf(`{"name":"%s"}`, test.BuildName),
+	}
+	err := fetcher.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = fetcher.Wait()
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := test.FileMd5(test.BuildFile)
+	got := test.FileMd5(test.DownloadFile)
+	if want != got {
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }
 
@@ -160,7 +191,7 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Download error = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }
 
@@ -172,7 +203,7 @@ func downloadError(listener net.Listener, connections int, t *testing.T) {
 	}
 	err = fetcher.Wait()
 	if err == nil {
-		t.Errorf("Download error = %v, want %v", err, nil)
+		t.Errorf("Download() got = %v, want %v", err, nil)
 	}
 }
 
@@ -200,7 +231,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 	want := test.FileMd5(test.BuildFile)
 	got := test.FileMd5(test.DownloadFile)
 	if want != got {
-		t.Errorf("Download error = %v, want %v", got, want)
+		t.Errorf("Download() got = %v, want %v", got, want)
 	}
 }