feat: map blobstore implements filesystemer #14
Merged
Conversation
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
hannahhoward
approved these changes
Oct 28, 2024
| @@ -36,19 +36,7 @@ func NewBlobGetHandler(blobs blobstore.Blobstore) func(http.ResponseWriter, *htt | |||
| if fsblobs, ok := blobs.(blobstore.FileSystemer); ok { | |||
| serveHTTP := http.FileServer(fsblobs.FileSystem()).ServeHTTP | |||
| return func(w http.ResponseWriter, r *http.Request) { | |||
| _, bytes, err := multibase.Decode(r.PathValue("blob")) | |||
There was a problem hiding this comment.
this might be simpler with ServeFile instead of FileServer.
also go errata: if you just want to use system utils, you may find ServeFileFS and FileServerFS easer cause you can just use some system utils (if this is actually helpful)
There was a problem hiding this comment.
Ah yes - looks more appropriate. I didn't realize it existed! If I have a moment I'll look into replacing it.
| @@ -28,7 +28,12 @@ func (srv *Server) Serve(mux *http.ServeMux) { | |||
|
|
|||
| func NewHandler(server server.ServerView) func(http.ResponseWriter, *http.Request) { | |||
| return func(w http.ResponseWriter, r *http.Request) { | |||
| res, _ := server.Request(ucanhttp.NewHTTPRequest(r.Body, r.Header)) | |||
| res, err := server.Request(ucanhttp.NewHTTPRequest(r.Body, r.Header)) | |||
| if err != nil { | |||
| @@ -194,3 +191,21 @@ func NewFsBlobstore(rootdir string, tmpdir string) (*FsBlobstore, error) { | |||
| } | |||
| return &FsBlobstore{rootdir, tmpdir}, nil | |||
| } | |||
|
|
|||
| type fsDir struct { | |||
There was a problem hiding this comment.
again you may want to look at fs.FS
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR enables the map blobstore to present itself as a
http.FileSystem. This is useful for testing with an ephemeral storage node.