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

Reflect File Provider domain sync status in tray icon (macOS VFS) #6930

Merged
merged 34 commits into from
Jul 23, 2024
Merged

Reflect File Provider domain sync status in tray icon (macOS VFS) #6930

merged 34 commits into from
Jul 23, 2024

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Jul 19, 2024 •
edited
Loading

DEPENDS ON #6929

Closes #6899

@claucambra claucambra self-assigned this Jul 19, 2024
@claucambra claucambra force-pushed the bugfix/file-provider-sync-status branch from ff6e359 to bb58d38 Compare July 19, 2024 10:28
camilasan
camilasan requested changes Jul 21, 2024
View reviewed changes
Copy link
Member

@camilasan camilasan left a comment

Choose a reason for hiding this comment

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

what is NCFPK? :)

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift Show resolved Hide resolved
@claucambra
Copy link
Collaborator Author

what is NCFPK? :)

NextcloudFileProviderKit: https://github.com/claucambra/NextcloudFileProviderKit

@claucambra claucambra force-pushed the bugfix/file-provider-sync-status branch 2 times, most recently from 8fc5849 to 14a753a Compare July 22, 2024 12:59
@claucambra
Modernise slotComputeOverallSyncStatus
d70a388 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add support for FILE_PROVIDER_DOMAIN_SYNC_STATE_CHANGE socket message…
744ac54 
…s in client file provider socket controller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Bounce sync state change signals from socket controller in socket server
87066c8 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add sets for actions, to be able to track multiple actions
5237822 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add method to report a change in sync state if applicable in FileProv…
885d9f3 
…iderExt

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add method to insert new sync action in FileProviderExt
3e6b207 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add method to mark action as error sync action in FileProviderExt
c189f29 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add method to remove finished sync action in FileProviderExt
3f3f478 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Track sync actions in main FileProviderExt procedures
0c78594 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add conformance to NextcloudFileProviderKit's EnumerationListener pro…
617ca1a 
…tocol in FileProviderExt

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Set self as listener for Enumerator in FileProviderExt
939d67b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Lock and unlock when accessing sync actions in FileProviderExt to pro…
92f42bc 
…tect against possible races

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove pointless setStatusText in slotComputeOverallStatus
4490927 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Expose socket server in FileProvider class
8bc1fce 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Expose account state in file provider socket controller
3415f39 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Store latest sync state in file provider socket controller
3877efb 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Expose latest sync state in file provider socket controller
b290611 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add support for SYNC_PREPARING arg in socket controller reportsyncstate
a434e65 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Report sync state after initial connection of socket in socket contro…
da7c511 
…ller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add file provider socket state struct
fd7f1ce 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add file provider socket state provider method in socket server
034fbb8 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Connect sync state changed signal in file provider socket server to c…
98dba86 
…ompute overall sync status slot in owncloudgui

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Process state of file provider account domains in slotComputeOverallS…
84d74bc 
…yncStatus

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Append macOS vfs environment state strings to tray message when compu…
d2b5691 
…ting sync status

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Account for file provider states when setting tray icon
6e03e6a 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Do not report account sync state on socket controller if we haven't r…
ee59bea 
…eceived account info yet

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Store and provide latest account's file provider sync state as there …
6b14eed 
…is no guarantee (nor should we ensure) the socket with the extension stays alive

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Modernise problem account handling in slot compute overall sync state
d3d19fd 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add method to fileproviderxpc to check if the file provider extension…
ea0ae33 
… is reachable

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Check if the extension is reachable in owncloudgui compute sync status
3194edb 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure all sync result status types are handled for file provider in …
1128d9d 
…owncloudgui

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Provide state message in popup for vfs accounts that synced successfu…
58e6cdd 
…lly or had an issue

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clean up unused components in file provider socket controller
87b2a84 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure file provider instance gets initialised at app launch WITHOUT …
23a8f08 
…creating a separate instance from expected singleton

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the bugfix/file-provider-sync-status branch from 14a753a to 23a8f08 Compare July 23, 2024 06:11
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6930-23a8f0878b7ba2e8e459cf803818eb54c36e4c97-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.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jul 23, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
D Security Rating on New Code (required ≥ A)
16 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@claucambra claucambra merged commit 1a79d63 into master Jul 23, 2024
13 of 16 checks passed
@claucambra claucambra deleted the bugfix/file-provider-sync-status branch July 23, 2024 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camilasan camilasan camilasan approved these changes

@mgallien mgallien Awaiting requested review from mgallien

Assignees

@claucambra claucambra

Labels
feature: ☁️ system tray System tray icon and menu. feature: 💽 virtual filesystem os: 🍎 macOS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Connect macOS VFS domains to tray icon
3 participants
@claucambra @nextcloud-desktop-bot @camilasan