diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-03-22 04:02:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-21 16:02:49 -0400 |
| commit | ce9dee5a1e8ae670c97621bca409d8cf43a90102 (patch) | |
| tree | 6c9d8922dfae4bdcc1785340f2a866f805259988 /modules/storage/local_test.go | |
| parent | 253a00aaac6b17346927e42c709f3f96672caaf3 (diff) | |
| download | gitea-ce9dee5a1e8ae670c97621bca409d8cf43a90102.tar.gz gitea-ce9dee5a1e8ae670c97621bca409d8cf43a90102.zip | |
Introduce path Clean/Join helper functions (#23495)
Since #23493 has conflicts with latest commits, this PR is my proposal
for fixing #23371
Details are in the comments
And refactor the `modules/options` module, to make it always use
"filepath" to access local files.
Benefits:
* No need to do `util.CleanPath(strings.ReplaceAll(p, "\\", "/"))),
"/")` any more (not only one before)
* The function behaviors are clearly defined
Diffstat (limited to 'modules/storage/local_test.go')
| -rw-r--r-- | modules/storage/local_test.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/storage/local_test.go b/modules/storage/local_test.go index 2b112df8f1..9649761a0f 100644 --- a/modules/storage/local_test.go +++ b/modules/storage/local_test.go @@ -20,29 +20,29 @@ func TestBuildLocalPath(t *testing.T) { expected string }{ { - "a", + "/a", "0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", - "a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", + "/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", }, { - "a", + "/a", "../0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", - "a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", + "/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", }, { - "a", + "/a", "0\\a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", - "a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", + "/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", }, { - "b", + "/b", "a/../0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", - "b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", + "/b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", }, { - "b", + "/b", "a\\..\\0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", - "b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", + "/b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14", }, } |