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

FolderWatcher: fixes and improvements #2660

Merged
merged 7 commits into from
Nov 24, 2020
Merged

FolderWatcher: fixes and improvements #2660

merged 7 commits into from
Nov 24, 2020

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Nov 23, 2020 •
edited
Loading

@camilasan camilasan changed the title FolderWatcher:fixes and improvements FolderWatcher: fixes and improvements Nov 23, 2020
@camilasan camilasan requested a review from er-vin November 23, 2020 20:03
@camilasan camilasan mentioned this pull request Nov 23, 2020
Closed
@camilasan camilasan force-pushed the folder-watcher branch 3 times, most recently from 66d7aff to 712bd92 Compare November 23, 2020 20:56
er-vin
er-vin reviewed Nov 24, 2020
View reviewed changes
Copy link
Member

@er-vin er-vin left a comment

Choose a reason for hiding this comment

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

Just a tiny nitpick, otherwise looks good to me.

src/gui/folderwatcher_mac.h Outdated Show resolved Hide resolved
@camilasan
Copy link
Member Author

So far so good running this PR on Mac OS, Windows and Linux.

er-vin
er-vin approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@er-vin er-vin left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Once you're happy with the testing feel free to merge

@camilasan
Copy link
Member Author

/rebase

@er-vin
Copy link
Member

er-vin commented Nov 24, 2020

/rebase

@camilasan
Copy link
Member Author

/rebase

ckamm and others added 7 commits November 24, 2020 16:56
@ckamm
Folderwatcher: On linux, fix paths after dir renames #6808
351bada 
If a folder was renamed A -> B, the folder watcher for the inode
would be unaware and still report changes for A/foo. Now directory
renames in the watched folders are tracked and paths are updated
accordingly.
@ckamm
FolderWatcher: Always notify about conflict files #7073
21b931d 
This makes sure that the conflict list can be updated if a user resolves
a conflict by deleting the local conflict file. Previously one had to
wait for the next sync run.
@ckamm
FolderWatcher linux: Make automatically recursive #7068
74382dd 
Previously it depended on addFolder() / removeFolder() calls to adjust
watchers when new folders were added or removed. There also needed to be
complex move handling.

Now, any folder creation/move-in notifications automatically trigger
watcher additions and folder deletion/move-out triggers removal.
@ckamm
FolderWatcher: Become unreliable if test notification fails #7241
e97fc43 
Necessary for some filesystems on windows that don't have full file
watching capabilities.
@ckamm
FolderWatcher: Wait for ready before testing #7305
28e4fc5
@ogoffart
FolderWatcher: Usage of QTime for elapsed time is deprecated
5a432a1
@ckamm
FolderWatcher: Disable test on OSX #7305
08014b6
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2660-08014b6dc3d150d017d61c83c5ebeca1656d946b-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@camilasan camilasan merged commit c24b81c into master Nov 24, 2020
@camilasan camilasan deleted the folder-watcher branch November 24, 2020 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@er-vin er-vin er-vin approved these changes

@allexzander allexzander Awaiting requested review from allexzander

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

Successfully merging this pull request may close these issues.
5 participants
@camilasan @er-vin @nextcloud-desktop-bot @ckamm @ogoffart