Fix uploadfile only works for root of the fs #4490
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
ncw
reviewed
Aug 7, 2020
fs/operations/rc.go
Outdated
| @@ -253,7 +254,7 @@ func rcSingleCommand(ctx context.Context, in rc.Params, name string, noRemote bo | |||
| return nil, err | |||
| } | |||
| if p.FileName() != "" { | |||
| obj, err := Rcat(ctx, f, p.FileName(), p, time.Now()) | |||
| obj, err := Rcat(ctx, f, filepath.Join(remote, p.FileName()), p, time.Now()) | |||
There was a problem hiding this comment.
That should be path.Join not filepath.Join. filepath is for OS native strings so will have \ instead of / on Windows.
There was a problem hiding this comment.
Ahh I see. Will update that
fs/operations/rc_test.go
Outdated
| @@ -450,11 +451,13 @@ func TestUploadFile(t *testing.T) { | |||
| testFileName := "test.txt" | |||
| testFileContent := "Hello World" | |||
| r.WriteFile(testFileName, testFileContent, t1) | |||
| testItem1 := fstest.NewItem(testFileName, testFileContent, t1) | |||
| testItem2 := fstest.NewItem(filepath.Join("subdir", testFileName), testFileContent, t1) | |||
negative0
force-pushed
the
rc/uploadfilefix
branch
from
418606b
to
69d9ee6
Compare
negative0
force-pushed
the
rc/uploadfilefix
branch
from
6b11439
to
7a764c2
Compare
|
Should this be failing? |
ncw
reviewed
Aug 10, 2020
|
Thanks! |
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.
What is the purpose of this change?
This bug ignored the remote parameter while uploading a file, thus the file will appear only in the root of the fs. This PR fixes that and adds test for it
Was the change discussed in an issue or in the forum before?
No
Checklist