Skip to content

Support mime type and get bucket fix #12

Merged
dkhachyan merged 1 commit into from
Jun 7, 2022
Merged

Support mime type and get bucket fix #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions cmd/gateway/weed/gateway-weed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,14 @@ func (w *weedObjects) GetObjectInfo(ctx context.Context, bucket, object string,
}

return minio.ObjectInfo{
Bucket: bucket,
Name: object,
ModTime: time.Unix(entry.Attributes.Mtime, 0),
Size: int64(entry.Attributes.FileSize),
IsDir: entry.IsDirectory,
AccTime: time.Time{},
ETag: filer.ETag(entry),
Bucket: bucket,
Name: object,
ModTime: time.Unix(entry.Attributes.Mtime, 0),
Size: int64(entry.Attributes.FileSize),
IsDir: entry.IsDirectory,
AccTime: time.Time{},
ETag: filer.ETag(entry),
ContentType: entry.Attributes.Mime,
}, nil
}

Expand Down Expand Up @@ -481,6 +482,13 @@ func (w *weedObjects) DeleteObjects(ctx context.Context, bucket string, objects

func (w *weedObjects) GetBucketInfo(ctx context.Context, bucket string) (bi minio.BucketInfo, err error) {
path := util.NewFullPath(BucketDir, bucket)
exists, err := filer_pb.Exists(w.Client, BucketDir, bucket, true)
if err != nil {
return bi, err
}
if !exists {
return bi, minio.BucketNotFound{}
}
entry, err := filer_pb.GetEntry(w.Client, path)
if err != nil {
return bi, err
Expand Down Expand Up @@ -525,6 +533,9 @@ func (w *weedObjects) PutObject(ctx context.Context, bucket string, object strin
if err != nil {
return minio.ObjectInfo{}, err
}
for k, v := range opts.UserDefined {
req.Header.Add(k, v)
}
resp, err := client.Do(req)
if err != nil {
return minio.ObjectInfo{}, err
Expand Down Expand Up @@ -659,6 +670,9 @@ func (w *weedObjects) PutObjectPart(ctx context.Context, bucket, object, uploadI
if err != nil {
return minio.PartInfo{}, err
}
for k, v := range opts.UserDefined {
req.Header.Add(k, v)
}
resp, err := client.Do(req)
if err != nil {
return minio.PartInfo{}, err
Expand Down
1 change: 0 additions & 1 deletion docker/seaweedfs-compose-weed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!connect jdbc:hive2://127.0.0.1:10000
version: '2'
services:
master-1:
Expand Down