Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Exclude placeholder #8836

Merged
merged 3 commits into from
Jul 23, 2021
Merged

Exclude placeholder #8836

merged 3 commits into from
Jul 23, 2021

Conversation

TheOneRing
Copy link
Contributor

@TheOneRing TheOneRing commented Jul 21, 2021 •
edited
Loading

No description provided.

@TheOneRing TheOneRing requested a review from dragotin July 21, 2021 12:12
@TheOneRing TheOneRing force-pushed the work/exclude_placeholder branch 2 times, most recently from 6036cb8 to 8a23229 Compare July 21, 2021 14:06
@TheOneRing TheOneRing requested a review from ogoffart July 22, 2021 08:22
@TheOneRing TheOneRing force-pushed the work/exclude_placeholder branch 3 times, most recently from 4b5c249 to f00c68b Compare July 23, 2021 09:38
@TheOneRing TheOneRing requested a review from fmoc July 23, 2021 09:41
@TheOneRing TheOneRing force-pushed the work/exclude_placeholder branch 2 times, most recently from d3434e9 to f4014f3 Compare July 23, 2021 10:25
fmoc
fmoc reviewed Jul 23, 2021
View reviewed changes
changelog/unreleased/8836 Outdated Show resolved Hide resolved
src/gui/issueswidget.cpp
if (item.folder() != f) {
return false;
}
if (item.direction() == SyncFileItem::None) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier to

return item.folder() == f && item.direction() != SyncFileItem::None;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we still have a TODO here I'd like to keep it.
(Currently we get one warning per sync run..., without skipping them the issues will get removed after the discovery which doesn't make much sense)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what it is worth, I love the verbose version without the && because I think it is easier to read and understand.

@TheOneRing TheOneRing force-pushed the work/exclude_placeholder branch from f4014f3 to 95000a0 Compare July 23, 2021 11:17
@TheOneRing TheOneRing force-pushed the work/exclude_placeholder branch from 95000a0 to e3f2c81 Compare July 23, 2021 11:19
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

dragotin
dragotin approved these changes Jul 23, 2021
View reviewed changes
Copy link
Contributor

@dragotin dragotin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

src/gui/issueswidget.cpp
if (item.folder() != f) {
return false;
}
if (item.direction() == SyncFileItem::None) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what it is worth, I love the verbose version without the && because I think it is easier to read and understand.

@TheOneRing TheOneRing merged commit 4cc4e63 into master Jul 23, 2021
@delete-merged-branch delete-merged-branch bot deleted the work/exclude_placeholder branch July 23, 2021 12:56
@jnweiger jnweiger mentioned this pull request Aug 23, 2021
Closed
20 tasks
@jnweiger
Copy link
Contributor

Confirmed fixed in 2.9.0-beta3

The client logs:
The file Documents/Example.odt.testpilotcloud_virtual was ignored as its name is reserved by ownCloud Testpilot Edition,Documents/Example.odt.testpilotcloud_virtual ,testpilotcloud3 , ,[email protected],2021-08-25T23:23:08.470,

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmoc fmoc fmoc left review comments

@dragotin dragotin dragotin approved these changes

@ogoffart ogoffart Awaiting requested review from ogoffart

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TheOneRing @jnweiger @dragotin @fmoc