mirrors2/eiblog
1
0
Fork 0
mirror of https://github.com/eiblog/eiblog.git synced 2026-03-01 00:34:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

release v1.20

Browse Source
This commit is contained in:
deepzz0
2017-06-14 21:25:18 +08:00
parent 1634418a13
commit 54f5289d6b
134 changed files with 26141 additions and 18531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/qiniupkg.com/api.v7/kodo/bucket.go
Generated Vendored
+30
View File
@@ -2,6 +2,7 @@ package kodo
import (
"encoding/base64"
"fmt"
"io"
"net/url"
"strconv"
@@ -60,6 +61,7 @@ type Entry struct {
Fsize int64 `json:"fsize"`
PutTime int64 `json:"putTime"`
MimeType string `json:"mimeType"`
Type int `json:"type"`
EndUser string `json:"endUser"`
}
@@ -123,6 +125,16 @@ func (p Bucket) ChangeMime(ctx Context, key, mime string) (err error) {
return p.Conn.Call(ctx, nil, "POST", p.Conn.RSHost+URIChangeMime(p.Name, key, mime))
}
// 修改文件的存储类型。
//
// ctx 是请求的上下文。
// key 是要修改的文件的访问路径。
// fileType 是要设置的新存储类型。
//
func (p Bucket) ChangeType(ctx Context, key string, fileType int) (err error) {
return p.Conn.Call(ctx, nil, "POST", p.Conn.RSHost+URIChangeType(p.Name, key, fileType))
}
// 从网上抓取一个资源并存储到七牛空间（bucket）中。
//
// ctx 是请求的上下文。
@@ -133,6 +145,16 @@ func (p Bucket) Fetch(ctx Context, key string, url string) (err error) {
return p.Conn.Call(ctx, nil, "POST", p.IoHost+uriFetch(p.Name, key, url))
}
// 更新文件生命周期
//
// ctx 是请求的上下文。
// key 是要更新的文件的访问路径。
// deleteAfterDays 设置为0表示取消 lifecycle
//
func (p Bucket) DeleteAfterDays(ctx Context, key string, days int) (err error) {
return p.Conn.Call(ctx, nil, "POST", p.Conn.RSHost+URIDeleteAfterDays(p.Name, key, days))
}
// ----------------------------------------------------------
type ListItem struct {
@@ -275,4 +297,12 @@ func URIChangeMime(bucket, key, mime string) string {
return "/chgm/" + encodeURI(bucket+":"+key) + "/mime/" + encodeURI(mime)
}
func URIChangeType(bucket, key string, fileType int) string {
return "/chtype/" + encodeURI(bucket+":"+key) + "/type/" + strconv.Itoa(fileType)
}
func URIDeleteAfterDays(bucket, key string, days int) string {
return fmt.Sprintf("/deleteAfterDays/%s/%d", encodeURI(bucket+":"+key), days)
}
// ----------------------------------------------------------
vendor/qiniupkg.com/api.v7/kodo/bucket_test.go
Generated Vendored
+49 -29
View File
@@ -1,6 +1,7 @@
package kodo
import (
"context"
"math/rand"
"strconv"
"testing"
@@ -8,9 +9,9 @@ import (
)
var (
bkey = "abatch"
bnewkey1 = "abatch/newkey1"
bnewkey2 = "abatch/newkey2"
batchTestKey = "abatch"
batchTestNewKey1 = "abatch/newkey1"
batchTestNewKey2 = "abatch/newkey2"
)
func init() {
@@ -20,11 +21,11 @@ func init() {
}
rand.Seed(time.Now().UnixNano())
bkey += strconv.Itoa(rand.Int())
bnewkey1 += strconv.Itoa(rand.Int())
bnewkey2 += strconv.Itoa(rand.Int())
batchTestKey += strconv.Itoa(rand.Int())
batchTestNewKey1 += strconv.Itoa(rand.Int())
batchTestNewKey2 += strconv.Itoa(rand.Int())
// 删除 可能存在的 key
bucket.BatchDelete(nil, bkey, bnewkey1, bnewkey2)
bucket.BatchDelete(nil, batchTestKey, batchTestNewKey1, batchTestNewKey2)
}
func TestAll(t *testing.T) {
@@ -34,11 +35,11 @@ func TestAll(t *testing.T) {
}
//上传一个文件用用于测试
err := upFile("bucket_test.go", bkey)
err := upFile("bucket_test.go", batchTestKey)
if err != nil {
t.Fatal(err)
}
defer bucket.Delete(nil, bkey)
defer bucket.Delete(nil, batchTestKey)
testBatchStat(t)
testBatchCopy(t)
@@ -46,11 +47,12 @@ func TestAll(t *testing.T) {
testBatchDelete(t)
testBatch(t)
testClient_MakeUptokenBucket(t)
testDeleteAfterDays(t)
}
func testBatchStat(t *testing.T) {
rets, err := bucket.BatchStat(nil, bkey, bkey, bkey)
rets, err := bucket.BatchStat(nil, batchTestKey, batchTestKey, batchTestKey)
if err != nil {
t.Fatal("bucket.BatchStat failed:", err)
}
@@ -59,7 +61,7 @@ func testBatchStat(t *testing.T) {
t.Fatal("BatchStat failed: len(rets) = ", 3)
}
stat, err := bucket.Stat(nil, bkey)
stat, err := bucket.Stat(nil, batchTestKey)
if err != nil {
t.Fatal("bucket.Stat failed:", err)
}
@@ -71,18 +73,18 @@ func testBatchStat(t *testing.T) {
func testBatchMove(t *testing.T) {
stat0, err := bucket.Stat(nil, bkey)
stat0, err := bucket.Stat(nil, batchTestKey)
if err != nil {
t.Fatal("BathMove get stat failed:", err)
}
_, err = bucket.BatchMove(nil, KeyPair{bkey, bnewkey1}, KeyPair{bnewkey1, bnewkey2})
_, err = bucket.BatchMove(nil, KeyPair{batchTestKey, batchTestNewKey1}, KeyPair{batchTestNewKey1, batchTestNewKey2})
if err != nil {
t.Fatal("bucket.BatchMove failed:", err)
}
defer bucket.Move(nil, bnewkey2, bkey)
defer bucket.Move(nil, batchTestNewKey2, batchTestKey)
stat1, err := bucket.Stat(nil, bnewkey2)
stat1, err := bucket.Stat(nil, batchTestNewKey2)
if err != nil {
t.Fatal("BathMove get stat failed:", err)
}
@@ -94,16 +96,16 @@ func testBatchMove(t *testing.T) {
func testBatchCopy(t *testing.T) {
_, err := bucket.BatchCopy(nil, KeyPair{bkey, bnewkey1}, KeyPair{bkey, bnewkey2})
_, err := bucket.BatchCopy(nil, KeyPair{batchTestKey, batchTestNewKey1}, KeyPair{batchTestKey, batchTestNewKey2})
if err != nil {
t.Fatal(err)
}
defer bucket.Delete(nil, bnewkey1)
defer bucket.Delete(nil, bnewkey2)
defer bucket.Delete(nil, batchTestNewKey1)
defer bucket.Delete(nil, batchTestNewKey2)
stat0, _ := bucket.Stat(nil, bkey)
stat1, _ := bucket.Stat(nil, bnewkey1)
stat2, _ := bucket.Stat(nil, bnewkey2)
stat0, _ := bucket.Stat(nil, batchTestKey)
stat1, _ := bucket.Stat(nil, batchTestNewKey1)
stat2, _ := bucket.Stat(nil, batchTestNewKey2)
if stat0.Hash != stat1.Hash || stat0.Hash != stat2.Hash {
t.Fatal("BatchCopy failed : Copy err")
}
@@ -111,16 +113,16 @@ func testBatchCopy(t *testing.T) {
func testBatchDelete(t *testing.T) {
bucket.Copy(nil, bkey, bnewkey1)
bucket.Copy(nil, bkey, bnewkey2)
bucket.Copy(nil, batchTestKey, batchTestNewKey1)
bucket.Copy(nil, batchTestKey, batchTestNewKey2)
_, err := bucket.BatchDelete(nil, bnewkey1, bnewkey2)
_, err := bucket.BatchDelete(nil, batchTestNewKey1, batchTestNewKey2)
if err != nil {
t.Fatal(err)
}
_, err1 := bucket.Stat(nil, bnewkey1)
_, err2 := bucket.Stat(nil, bnewkey2)
_, err1 := bucket.Stat(nil, batchTestNewKey1)
_, err2 := bucket.Stat(nil, batchTestNewKey2)
//这里 err1 != nil，否则文件没被成功删除
if err1 == nil || err2 == nil {
@@ -131,9 +133,9 @@ func testBatchDelete(t *testing.T) {
func testBatch(t *testing.T) {
ops := []string{
URICopy(bucketName, bkey, bucketName, bnewkey1),
URIDelete(bucketName, bkey),
URIMove(bucketName, bnewkey1, bucketName, bkey),
URICopy(bucketName, batchTestKey, bucketName, batchTestNewKey1),
URIDelete(bucketName, batchTestKey),
URIMove(bucketName, batchTestNewKey1, bucketName, batchTestKey),
}
var rets []BatchItemRet
@@ -145,3 +147,21 @@ func testBatch(t *testing.T) {
t.Fatal("len(rets) != 3")
}
}
func testDeleteAfterDays(t *testing.T) {
ctx := context.Background()
err := bucket.DeleteAfterDays(ctx, batchTestNewKey1, 5)
if err == nil {
t.Fatal("Expect an error")
}
bucket.Copy(ctx, batchTestKey, batchTestNewKey1)
err = bucket.DeleteAfterDays(ctx, batchTestNewKey1, 5)
if err != nil {
t.Fatal(err)
}
}
vendor/qiniupkg.com/api.v7/kodo/token.go
Generated Vendored
+1
View File
@@ -75,6 +75,7 @@ type PutPolicy struct {
Checksum string `json:"checksum,omitempty"` // 格式：<HashName>:<HexHashValue>，目前支持 MD5/SHA1。
UpHosts []string `json:"uphosts,omitempty"`
DeleteAfterDays int `json:"deleteAfterDays,omitempty"`
FileType int `json:"fileType,omitempty"`
}
func (p *Client) MakeUptoken(policy *PutPolicy) string {