-
Notifications
You must be signed in to change notification settings - Fork 28
Introduce Path object to siplify use of std::filesystem::path with QS… #817
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
TheOneRing
wants to merge
1
commit into
main
Choose a base branch
from
work/path2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,6 +64,8 @@ add_library(libsync SHARED | |
| abstractcorejob.cpp | ||
|
|
||
| appprovider.cpp | ||
|
|
||
| path.cpp | ||
| ) | ||
|
|
||
| if(WIN32) | ||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| // SPDX-FileCopyrightText: 2025 Hannah von Reth <h.vonreth@opencloud.eu> | ||
|
|
||
| #include "path.h" | ||
|
|
||
| #include "libsync/common/filesystembase.h" | ||
|
|
||
| OCC::FileSystem::Path::Path(QAnyStringView path) | ||
| : _path(toFilesystemPath(path.toString())) | ||
| { | ||
| } | ||
|
|
||
| OCC::FileSystem::Path::Path(const std::filesystem::path &path) | ||
| : _path(path) | ||
| { | ||
| } | ||
|
|
||
| OCC::FileSystem::Path::Path(std::filesystem::path &&path) | ||
| : _path(std::move(path)) | ||
| { | ||
| } | ||
|
|
||
| OCC::FileSystem::Path OCC::FileSystem::Path::relative(QAnyStringView path) | ||
| { | ||
| return QtPrivate::toFilesystemPath(path.toString()); | ||
| } | ||
|
|
||
| QString OCC::FileSystem::Path::toString() const | ||
| { | ||
| return fromFilesystemPath(_path); | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| // SPDX-FileCopyrightText: 2025 Hannah von Reth <h.vonreth@opencloud.eu> | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "libsync/opencloudsynclib.h" | ||
|
|
||
| #include <QString> | ||
|
|
||
| #include <filesystem> | ||
|
|
||
| namespace OCC { | ||
| namespace FileSystem { | ||
| class OPENCLOUD_SYNC_EXPORT Path | ||
| { | ||
| public: | ||
| /** | ||
| * Will create an absolute path from the given QString. | ||
| * On Windows it will create a UNC path starting with "\\?\". | ||
| * For path segments use Path::relative. | ||
| * @param path | ||
| */ | ||
| explicit Path(QAnyStringView path); | ||
|
|
||
| Path(const std::filesystem::path &path); | ||
|
|
||
| Path(std::filesystem::path &&path); | ||
|
|
||
| /** | ||
| * Creates a relative path segment | ||
| * @param path | ||
| * @return A relative path | ||
| */ | ||
| static Path relative(QAnyStringView path); | ||
|
|
||
| const std::filesystem::path &get() const { return _path; } | ||
|
|
||
| [[nodiscard]] operator std::filesystem::path() const { return _path; } | ||
|
|
||
| explicit operator QString() const { return toString(); } | ||
|
|
||
| Path operator/(const Path &other) const { return _path / other._path; } | ||
| Path operator/(const std::filesystem::path &other) const { return _path / other; } | ||
| Path operator/(QAnyStringView other) const { return _path / relative(other); } | ||
|
|
||
| Path &operator/=(const Path &other) | ||
| { | ||
| _path /= other._path; | ||
| return *this; | ||
| } | ||
| Path &operator/=(const std::filesystem::path &other) | ||
| { | ||
| _path /= other; | ||
| return *this; | ||
| } | ||
| Path &operator/=(QAnyStringView other) | ||
| { | ||
| _path /= relative(other); | ||
| return *this; | ||
| } | ||
|
|
||
| QString toString() const; | ||
|
|
||
| private: | ||
| std::filesystem::path _path; | ||
| }; | ||
| } | ||
| } |
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FileSystem::Pathis a new cross-platform path abstraction with Windows-specific behavior (long-path/\\?\handling) and several operator overloads (relative,/,toString). There don’t appear to be tests covering its conversion/join behavior yet; adding a small unit test (including a Windows-only section) would help prevent regressions in path normalization and string round-tripping.