add additional ReplaceAll in pathsep to cater for different pathsep #34061
Conversation
This file contains hidden or 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
GiteaBot
added
the
lgtm/need 2
wxiaoguang
approved these changes
Mar 29, 2025
GiteaBot
added
lgtm/need 1
wxiaoguang
added
type/bug
backport/v1.23
eeyrjmr
force-pushed
the
doctorWinPathsep
branch
from
3e9afcd to
c28a152
Compare
lunny
reviewed
Mar 29, 2025
services/doctor/storage.go
Outdated
| @@ -121,7 +121,8 @@ func checkStorage(opts *checkStorageOptions) func(ctx context.Context, logger lo | |||
| storer: storage.LFS, | |||
| isOrphaned: func(path string, obj storage.Object, stat fs.FileInfo) (bool, error) { | |||
| // The oid of an LFS stored object is the name but with all the path.Separators removed | |||
| oid := strings.ReplaceAll(path, "/", "") | |||
| oidUnix := strings.ReplaceAll(path, "/", "") | |||
| oid := strings.ReplaceAll(oidUnix, "\\", "") // strip windows separator | |||
There was a problem hiding this comment.
How about strings.Join(filepath.SplitList(path), "")
There was a problem hiding this comment.
if I understand that function correctly, its splits on the OS $PATH seperator (ie : for unix) not of the path delimiter (ie /)
There was a problem hiding this comment.
an alternative is to use os.PathSeparator constant as this is OS specific and thus this will be a built-time constant . casting as string works
eeyrjmr
force-pushed
the
doctorWinPathsep
branch
from
c28a152 to
b8a6f75
Compare
eeyrjmr
force-pushed
the
doctorWinPathsep
branch
from
b8a6f75 to
a02b7ce
Compare
|
This is more complicated. If lfs object stored in disk, the splitter is different from different OS. If it's stored in S3 compatiable service, it should be always splitted with |
eeyrjmr
force-pushed
the
doctorWinPathsep
branch
from
cccdee1 to
bb7014a
Compare
lunny
approved these changes
Mar 29, 2025
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
GiteaBot
added a commit
to GiteaBot/gitea
that referenced
this pull request
Mar 30, 2025
…o-gitea#34061) The doctor storage check reconstructs the lfs oid by producing a string where the path separator is stripped ab/dc/efg -> abdcefg. Windows however uses a backslash and thus the ReplaceAll call doesn't produce the correct oid resulting in all lfs objects being classed as orphaned. This PR allows this to be more OS agnostic. Closes go-gitea#34039 --------- Co-authored-by: Giteabot <[email protected]>
wxiaoguang
pushed a commit
that referenced
this pull request
Mar 30, 2025
…34061) (#34070) Backport #34061 by eeyrjmr The doctor storage check reconstructs the lfs oid by producing a string where the path separator is stripped ab/dc/efg -> abdcefg. Windows however uses a backslash and thus the ReplaceAll call doesn't produce the correct oid resulting in all lfs objects being classed as orphaned. This PR allows this to be more OS agnostic. Closes #34039 Co-authored-by: JonRB <[email protected]>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 31, 2025
* giteaofficial/main: [skip ci] Updated translations via Crowdin Add toggleClass function in dom.ts (go-gitea#34063) Add a config option to block "expensive" pages for anonymous users (go-gitea#34024) add additional ReplaceAll in pathsep to cater for different pathsep (go-gitea#34061) [skip ci] Updated translations via Crowdin enable staticcheck QFxxxx rules (go-gitea#34064) update to golangci-lint v2 (go-gitea#34054) Add descriptions for private repo public access settings and improve the UI (go-gitea#34057) Add anonymous access support for private/unlisted repositories (go-gitea#34051) Hide activity contributors, recent commits and code frequrency left tabs if there is no code permission (go-gitea#34053) Update action status badge layout (go-gitea#34018) Add anonymous access support for private repositories (backend) (go-gitea#33257) Simplify emoji rendering (go-gitea#34048) Adjust the layout of the toolbar on the Issues/Projects page (go-gitea#33667) Fix bug on downloading job logs (go-gitea#34041) Fix git client accessing renamed repo (go-gitea#34034) Decouple Batch from git.Repository to simplify usage without requiring the creation of a Repository struct. (go-gitea#34001) fix org repo creation being limited by user limits (go-gitea#34030) Fix the issue with error message logging for the `check-attr` command on Windows OS. (go-gitea#34035) Try to fix check-attr bug (go-gitea#34029)
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.
The doctor storage check reconstructs the lfs oid by producing a string where the path separator is stripped
ab/dc/efg -> abdcefg. Windows however uses a backslash and thus the ReplaceAll call doesn't produce the correct oid resulting in all lfs objects being classed as orphaned.
This PR allows this to be more OS agnostic.
Closes #34039