分离API请求版本

Author: athurg

api_ping.go

@@ -0,0 +1,47 @@
+package seafile
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+)
+
+//测试Seafile服务连通性
+func (cli *Client) Ping() error {
+	resp, err := http.Get(cli.Addr + "/api2/ping")
+	if err != nil {
+		return fmt.Errorf("请求错误:%s", err)
+	}
+	defer resp.Body.Close()
+
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("读取错误:%s", err)
+	}
+
+	if string(b) == `"pong"` {
+		return nil
+	}
+
+	return fmt.Errorf("未知返回:%s", err)
+}
+
+//自动添加Token后执行请求
+func (cli *Client) AuthPing() error {
+	resp, err := cli.doRequest("GET", "/auth/ping/", nil, nil)
+	if err != nil {
+		return fmt.Errorf("请求错误:%s", err)
+	}
+	defer resp.Body.Close()
+
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("读取错误:%s %s", resp.Status, err)
+	}
+
+	if string(b) == `"pong"` {
+		return nil
+	}
+
+	return fmt.Errorf("未知返回:%s", err)
+}

api_token.go

@@ -0,0 +1,47 @@
+package seafile
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+)
+
+//获取AuthToken
+func (cli *Client) Auth(username, password string) error {
+	formData := url.Values{
+		"username": {username},
+		"password": {password},
+	}
+
+	resp, err := http.PostForm(cli.Addr+"/api2/auth-token/", formData)
+	if err != nil {
+		return fmt.Errorf("请求错误:%s", err)
+	}
+	defer resp.Body.Close()
+
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("读取错误:%s %s", resp.Status, err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("%s %s", resp.Status, string(b))
+	}
+
+	//TODO: 找到真正的返回结构
+	respInfo := map[string]string{}
+	err = json.Unmarshal(b, &respInfo)
+	if err != nil {
+		return fmt.Errorf("读取错误:%s", err)
+	}
+
+	cli.authToken = respInfo["token"]
+
+	if respInfo["token"] == "" {
+		return fmt.Errorf("%s", string(b))
+	}
+
+	return nil
+}

api_v2.go

@@ -0,0 +1,10 @@
+package seafile
+
+import (
+	"io"
+	"net/http"
+)
+
+func (cli *Client) doRequest(method, uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	return cli.requestApi("/api2", method, uri, header, body)
+}

api_v2p1.go

@@ -0,0 +1,26 @@
+package seafile
+
+import (
+	"io"
+	"net/http"
+)
+
+func (cli *Client) apiRequestV2p1(method, uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	return cli.requestApi("/api/v2.1", method, uri, header, body)
+}
+
+func (cli *Client) apiGET(uri string) (*http.Response, error) {
+	return cli.apiRequestV2p1("GET", uri, nil, nil)
+}
+
+func (cli *Client) apiPOST(uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	return cli.apiRequestV2p1("POST", uri, header, body)
+}
+
+func (cli *Client) apiPUT(uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	return cli.apiRequestV2p1("PUT", uri, header, body)
+}
+
+func (cli *Client) apiDELETE(uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	return cli.apiRequestV2p1("DELETE", uri, header, body)
+}

client.go

@@ -1,115 +1,58 @@
 package seafile
 
 import (
-	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
-	"net/url"
 	"strings"
 )
 
 //Seafile客户端
 type Client struct {
-	Hostname  string
+	Addr      string
 	authToken string
 }
 
-const apiPrefix = "/api2"
-
 //新建一个Seafile客户端
 //三种用法:
-//  cli := New(hostname)             //未认证的客户端，需要手动调用cli.Auth(user,pass)认证
-//  cli := New(hostname, token)      //预设置Token的客户端
-//  cli := New(hostname, user, pass) //带用户信息的客户端，会自动调用Auth以获取Token（忽略错误）
-func New(hostname string, authParams ...string) *Client {
-	hostname = strings.TrimSuffix(hostname, "/")
-	client := &Client{Hostname: hostname + apiPrefix}
+//  cli := New(addr)             //未认证的客户端，需要手动调用cli.Auth(user,pass)认证
+//  cli := New(addr, token)      //预设置Token的客户端
+//  cli := New(addr, user, pass) //带用户信息的客户端，会自动调用Auth以获取Token（忽略错误）
+func New(addr string, authParams ...string) *Client {
+	client := &Client{
+		Addr: strings.TrimSuffix(addr, "/"),
+	}
 
 	if len(authParams) == 1 {
 		client.authToken = authParams[0]
 	} else if len(authParams) == 2 {
 		err := client.Auth(authParams[0], authParams[1])
-		if err !=nil {
-			fmt.Printf("用户认证失败: %s",err)
+		if err != nil {
+			fmt.Printf("用户认证失败: %s", err)
 		}
 	}
 
 	return client
 }
 
-//测试Seafile服务连通性
-func (cli *Client) Ping() (string, error) {
-	resp, err := http.Get(cli.Hostname + "/ping")
-	if err != nil {
-		return "", fmt.Errorf("请求错误:%s", err)
-	}
-	defer resp.Body.Close()
-
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("读取错误:%s", err)
-	}
-
-	return string(b), nil
+//发起携带Token的Seafile WEB API请求
+func (cli *Client) requestApi(apiPrefix, method, uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	return cli.request(method, cli.Addr+apiPrefix+uri, header, body)
 }
 
-//获取AuthToken
-func (cli *Client) Auth(username, password string) error {
-	formData := url.Values{
-		"username": {username},
-		"password": {password},
-	}
-
-	resp, err := http.PostForm(cli.Hostname+"/auth-token/", formData)
-	if err != nil {
-		return fmt.Errorf("请求错误:%s", err)
-	}
-	defer resp.Body.Close()
-
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Errorf("读取错误:%s %s", resp.Status, err)
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%s %s", resp.Status, string(b))
-	}
-
-	//TODO: 找到真正的返回结构
-	respInfo := map[string]string{}
-	err = json.Unmarshal(b, &respInfo)
-	if err != nil {
-		return fmt.Errorf("读取错误:%s", err)
-	}
-
-	cli.authToken = respInfo["token"]
-
-	if respInfo["token"] == "" {
-		return fmt.Errorf("%s", string(b))
-	}
-
-	return nil
-}
-
-//自动添加Token后执行请求
-func (cli *Client) doRequest(method, uri string, header http.Header, body io.Reader) (*http.Response, error) {
+func (cli *Client) request(method, uri string, header http.Header, body io.Reader) (*http.Response, error) {
+	//检查Token是否为空
 	if cli.authToken == "" {
 		return nil, fmt.Errorf("没有合法的Token")
 	}
 
-	//如果外部传进来的不是完整的链接（只是路径），则添上默认的Hostname
-	if !strings.HasPrefix(uri, "http://") && !strings.HasPrefix(uri, "https://") {
-		uri = cli.Hostname + uri
-	}
-
 	req, err := http.NewRequest(method, uri, body)
 	if err != nil {
 		return nil, fmt.Errorf("创建请求错误:%s", err)
 	}
 
 	req.Header.Set("Authorization", "Token "+cli.authToken)
+
 	//如果外部传入Header则设置之
 	for k, v := range header {
 		for _, vv := range v {
@@ -119,19 +62,3 @@ func (cli *Client) doRequest(method, uri string, header http.Header, body io.Rea
 
 	return http.DefaultClient.Do(req)
 }
-
-//自动添加Token后执行请求
-func (cli *Client) AuthPing() (string, error) {
-	resp, err := cli.doRequest("GET", "/auth/ping", nil, nil)
-	if err != nil {
-		return "", fmt.Errorf("请求错误:%s", err)
-	}
-	defer resp.Body.Close()
-
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("读取错误:%s %s", resp.Status, err)
-	}
-
-	return string(b), nil
-}

client_test.go

@@ -7,15 +7,13 @@ import (
 
 func TestPing(t *testing.T) {
 	hostname := os.Getenv("SEAFILE_HOST")
-	result, err := New(hostname).Ping()
+	err := New(hostname).Ping()
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	t.Log("Ping返回", result)
 }
 
-func TestAuthPing(t *testing.T) {
+func TestAuth(t *testing.T) {
 	hostname := os.Getenv("SEAFILE_HOST")
 	username := os.Getenv("SEAFILE_USER")
 	password := os.Getenv("SEAFILE_PASS")
@@ -26,12 +24,10 @@ func TestAuthPing(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	result, err := client.AuthPing()
+	err = client.AuthPing()
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	t.Log("Auth ping返回", result)
 }
 
 func TestServerInfo(t *testing.T) {

library.go

@@ -99,7 +99,7 @@ func (cli *Client) GetLibrary(name string) (*Library, error) {
 	var err error
 	//如果name为空字符串，则获取默认资料库
 	if name == "" {
-		id,err = cli.GetDefaultLibraryId()
+		id, err = cli.GetDefaultLibraryId()
 		if err != nil {
 			return nil, err
 		}
@@ -129,19 +129,19 @@ func (cli *Client) GetLibrary(name string) (*Library, error) {
 
 //获取默认资料库ID
 func (cli *Client) GetDefaultLibraryId() (string, error) {
-	resp,err := cli.doRequest("GET", "/default-repo/", nil, nil)
-	if err!=nil {
+	resp, err := cli.doRequest("GET", "/default-repo/", nil, nil)
+	if err != nil {
 		return "", fmt.Errorf("获取默认资料库失败: %s", err)
 	}
 	defer resp.Body.Close()
 
-	var respInfo struct{
+	var respInfo struct {
 		Exists bool
 		RepoId string `json:"repo_id"`
 	}
 
 	err = json.NewDecoder(resp.Body).Decode(&respInfo)
-	if err!=nil {
+	if err != nil {
 		return "", fmt.Errorf("获取默认资料库失败: %s", err)
 	}