support smb mount path with /run prefix #2484
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
deepin pr auto review-- |
|
Warning
|
|
Note
详情{
"debian/control": [
{
"line": "Homepage: http://www.deepin.org",
"line_number": 68,
"rule": "S35",
"reason": "Url link | 6fe814dfb7"
}
]
} |
|
Warning
|
|
Note
详情{
"debian/control": [
{
"line": "Homepage: http://www.deepin.org",
"line_number": 68,
"rule": "S35",
"reason": "Url link | 6fe814dfb7"
}
]
} |
BREAKING CHANGE: Move all URL protocol related functions from FileUtils and DeviceUtils into a new ProtocolUtils namespace to avoid code duplication and improve maintainability. - Add new ProtocolUtils namespace with unified protocol checking functions - Rename isGvfsFile to isRemoteFile for better clarity - Rename isLocalDevice to isLocalFile for consistency - Remove duplicate implementations from FileUtils and DeviceUtils - Update all callers to use new ProtocolUtils functions - Update dependencies and includes across affected files Log: This change consolidates URL protocol checking logic into a single location, making the code more maintainable and reducing the risk of inconsistent implementations.
The smbmounts path can now be either "/media/*/smbmounts/" or "/run/media/*/smbmounts/". This fixes path matching issues in several components: - Update regex in DeviceUtils for SMB file URI parsing - Update regex in NetworkUtils for CIFS mount point detection - Update regex in ProtocolUtils for remote file detection - Update regex in ComputerEventReceiver for CIFS mount crumb parsing - Update regex in SmbBrowserEventReceiver for CIFS prefix detection Log: Also unified regex string format using R"()" raw string literals for better readability and maintainability. Bug: https://pms.uniontech.com/bug-view-292393.html
This reverts commit 9f6602e.
Update the regular expression pattern in protocoldisplayutilities.cpp to support both path formats: - /media/*/smbmounts/ - /run/media/*/smbmounts/ This change ensures correct handling of SMB paths in both formats when converting to standard SMB paths. The regex pattern is updated from: ^file:///media/.*/smbmounts/ to: ^file:///(?:run/)?media/.*/smbmounts/ Log:
Replace deprecated QRegExp with QRegularExpression for better performance and maintainability. Changes include: - Update pattern matching in FullTextSearcher for Chinese/English/Number detection - Update file name filter matching in FileSortWorker - Update directory filter matching in IteratorSearcher - Remove unused QRegExpValidator header inclusion - Convert wildcard patterns to regular expressions using QRegularExpression::wildcardToRegularExpression This change improves performance as QRegularExpression provides a more efficient implementation based on PCRE2, and removes usage of deprecated Qt APIs. Log:
|
Warning
|
|
Note
详情{
"debian/control": [
{
"line": "Homepage: http://www.deepin.org",
"line_number": 68,
"rule": "S35",
"reason": "Url link | 6fe814dfb7"
}
]
} |
Clauszy
approved these changes
Dec 12, 2024
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Clauszy, Johnson-zs The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/forcemerge |
|
This pr force merged! (status: blocked) |
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.
No description provided.