-
Notifications
You must be signed in to change notification settings - Fork 426
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Guess GCS object content types based on file extension.
Fixes #155.
- Loading branch information
Showing
12 changed files
with
556 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Copyright 2016 Google Inc. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package gcsx | ||
|
|
||
| import ( | ||
| "mime" | ||
| "path" | ||
|
|
||
| "github.com/jacobsa/gcloud/gcs" | ||
| "golang.org/x/net/context" | ||
| ) | ||
|
|
||
| // NewContentTypeBucket creates a wrapper bucket that guesses MIME types for | ||
| // newly created or composed objects when an explicit type is not already set. | ||
| func NewContentTypeBucket(b gcs.Bucket) gcs.Bucket { | ||
| return contentTypeBucket{b} | ||
| } | ||
|
|
||
| type contentTypeBucket struct { | ||
| gcs.Bucket | ||
| } | ||
|
|
||
| func (b contentTypeBucket) CreateObject( | ||
| ctx context.Context, | ||
| req *gcs.CreateObjectRequest) (o *gcs.Object, err error) { | ||
| // Guess a content type if necessary. | ||
| if req.ContentType == "" { | ||
| req.ContentType = mime.TypeByExtension(path.Ext(req.Name)) | ||
| } | ||
|
|
||
| // Pass on the request. | ||
| o, err = b.Bucket.CreateObject(ctx, req) | ||
| return | ||
| } | ||
|
|
||
| func (b contentTypeBucket) ComposeObjects( | ||
| ctx context.Context, | ||
| req *gcs.ComposeObjectsRequest) (o *gcs.Object, err error) { | ||
| // Guess a content type if necessary. | ||
| if req.ContentType == "" { | ||
| req.ContentType = mime.TypeByExtension(path.Ext(req.DstName)) | ||
| } | ||
|
|
||
| // Pass on the request. | ||
| o, err = b.Bucket.ComposeObjects(ctx, req) | ||
| return | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| // Copyright 2016 Google Inc. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package gcsx_test | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/googlecloudplatform/gcsfuse/internal/gcsx" | ||
| "github.com/jacobsa/gcloud/gcs" | ||
| "github.com/jacobsa/gcloud/gcs/gcsfake" | ||
| "github.com/jacobsa/timeutil" | ||
| "golang.org/x/net/context" | ||
| ) | ||
|
|
||
| var contentTypeBucketTestCases = []struct { | ||
| name string | ||
| request string // ContentType in request | ||
| expected string // Expected final type | ||
| }{ | ||
| ///////////////// | ||
| // No extension | ||
| ///////////////// | ||
|
|
||
| 0: { | ||
| name: "foo/bar", | ||
| request: "", | ||
| expected: "", | ||
| }, | ||
|
|
||
| 1: { | ||
| name: "foo/bar", | ||
| request: "image/jpeg", | ||
| expected: "image/jpeg", | ||
| }, | ||
|
|
||
| ////////////////////// | ||
| // Unknown extension | ||
| ////////////////////// | ||
|
|
||
| 2: { | ||
| name: "foo/bar.asdf", | ||
| request: "", | ||
| expected: "", | ||
| }, | ||
|
|
||
| 3: { | ||
| name: "foo/bar.asdf", | ||
| request: "image/jpeg", | ||
| expected: "image/jpeg", | ||
| }, | ||
|
|
||
| ////////////////////// | ||
| // Known extension | ||
| ////////////////////// | ||
|
|
||
| 4: { | ||
| name: "foo/bar.jpg", | ||
| request: "", | ||
| expected: "image/jpeg", | ||
| }, | ||
|
|
||
| 5: { | ||
| name: "foo/bar.jpg", | ||
| request: "text/plain", | ||
| expected: "text/plain", | ||
| }, | ||
| } | ||
|
|
||
| func TestContentTypeBucket_CreateObject(t *testing.T) { | ||
| for i, tc := range contentTypeBucketTestCases { | ||
| // Set up a bucket. | ||
| bucket := gcsx.NewContentTypeBucket( | ||
| gcsfake.NewFakeBucket(timeutil.RealClock(), "")) | ||
|
|
||
| // Create the object. | ||
| req := &gcs.CreateObjectRequest{ | ||
| Name: tc.name, | ||
| ContentType: tc.request, | ||
| Contents: strings.NewReader(""), | ||
| } | ||
|
|
||
| o, err := bucket.CreateObject(context.Background(), req) | ||
| if err != nil { | ||
| t.Fatalf("Test case %d: CreateObject: %v", i, err) | ||
| } | ||
|
|
||
| // Check the content type. | ||
| if got, want := o.ContentType, tc.expected; got != want { | ||
| t.Errorf("Test case %d: o.ContentType is %q, want %q", i, got, want) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestContentTypeBucket_ComposeObjects(t *testing.T) { | ||
| var err error | ||
| ctx := context.Background() | ||
|
|
||
| for i, tc := range contentTypeBucketTestCases { | ||
| // Set up a bucket. | ||
| bucket := gcsx.NewContentTypeBucket( | ||
| gcsfake.NewFakeBucket(timeutil.RealClock(), "")) | ||
|
|
||
| // Create a source object. | ||
| const srcName = "some_src" | ||
| _, err = bucket.CreateObject(ctx, &gcs.CreateObjectRequest{ | ||
| Name: srcName, | ||
| Contents: strings.NewReader(""), | ||
| }) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("Test case %d: CreateObject: %v", err) | ||
| } | ||
|
|
||
| // Compose. | ||
| req := &gcs.ComposeObjectsRequest{ | ||
| DstName: tc.name, | ||
| ContentType: tc.request, | ||
| Sources: []gcs.ComposeSource{{Name: srcName}}, | ||
| } | ||
|
|
||
| o, err := bucket.ComposeObjects(ctx, req) | ||
| if err != nil { | ||
| t.Fatalf("Test case %d: ComposeObject: %v", i, err) | ||
| } | ||
|
|
||
| // Check the content type. | ||
| if got, want := o.ContentType, tc.expected; got != want { | ||
| t.Errorf("Test case %d: o.ContentType is %q, want %q", i, got, want) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.