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

Add option to perform fast synchronisation runs in File Provider sync engine #6461

Merged

claucambra merged 22 commits into master from feature/file-provider-fast-init-sync

Mar 6, 2024

Collaborator

claucambra commented Feb 19, 2024 •

edited

Loading

Closes #5692

Screenshot 2024-02-19 at 19 45 49

claucambra added os: 🍎 macOS feature: 💽 virtual filesystem labels

claucambra requested review from mgallien, camilasan and allexzander

February 19, 2024 11:46

claucambra self-assigned this

github-actions bot requested changes

View reviewed changes

github-actions bot left a comment

⚠️ Clang-Tidy found issue(s) with the introduced code (1/3)

src/gui/macOS/fileproviderstorageuseenumerationobserver.h Outdated Show resolved Hide resolved

src/gui/macOS/fileprovider_mac.mm Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderxpc.h Show resolved Hide resolved

src/gui/macOS/fileproviderstorageuseenumerationobserver.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderstorageuseenumerationobserver.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderutils.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderutils.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderutils.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderutils.h Outdated Show resolved Hide resolved

src/gui/macOS/fileprovideritemmetadata_mac.mm Outdated Show resolved Hide resolved

github-actions bot requested changes

View reviewed changes

github-actions bot left a comment

⚠️ Clang-Tidy found issue(s) with the introduced code (2/3)

src/gui/macOS/fileproviderdomainsyncstatus_mac.mm Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderxpc.h

+                  explicit FileProviderXPC(QObject *parent = nullptr);
+                  // Returns enabled and set state of fast enumeration for the given extension
+                  [[nodiscard]] std::optional<std::pair<bool, bool>> fastEnumerationStateForExtension(const QString &extensionAccountId) const;

github-actions bot Feb 19, 2024

⚠️ clang-diagnostic-error ⚠️
no template named optional in namespace std; did you mean Optional?

Suggested change

      
                [[nodiscard]] std::optional<std::pair<bool, bool>> fastEnumerationStateForExtension(const QString &extensionAccountId) const;
          
                [[nodiscard]] Optional<std::pair<bool, bool>> fastEnumerationStateForExtension(const QString &extensionAccountId) const;

src/gui/macOS/progressobserver.h Outdated Show resolved Hide resolved

...tegration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h Outdated Show resolved Hide resolved

src/gui/macOS/fileprovidersettingscontroller_mac.mm Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderxpc.h Show resolved Hide resolved

src/gui/macOS/fileproviderxpc.h Show resolved Hide resolved

src/gui/macOS/fileproviderxpc_mac_utils.h Outdated Show resolved Hide resolved

src/gui/macOS/progressobserver.h Outdated Show resolved Hide resolved

src/gui/macOS/progressobserver.h Outdated Show resolved Hide resolved

github-actions bot requested changes

View reviewed changes

github-actions bot left a comment

⚠️ Clang-Tidy found issue(s) with the introduced code (3/3)

src/gui/macOS/fileproviderxpc_mac_utils.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderxpc.h Show resolved Hide resolved

src/gui/macOS/fileproviderutils_mac.mm Outdated Show resolved Hide resolved

src/gui/macOS/fileprovidermaterialiseditemsmodel_mac.mm Outdated Show resolved Hide resolved

...tegration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h Outdated Show resolved Hide resolved

src/gui/macOS/fileproviderxpc_mac_utils.h Outdated Show resolved Hide resolved

claucambra force-pushed the feature/file-provider-fast-init-sync branch from e886efd to 9b0cf5e Compare

February 19, 2024 14:54

roberix commented Feb 19, 2024

Hi.

Is this going to be a mac only feature or will this be also available on the Windows client?

Regards

rob

Collaborator Author

claucambra commented Feb 20, 2024

Hi.

Is this going to be a mac only feature or will this be also available on the Windows client?

Regards

rob

Hi, this is a macOS-only feature

camilasan reviewed

View reviewed changes

src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml Show resolved Hide resolved

src/gui/macOS/fileproviderxpc_mac.mm Show resolved Hide resolved

camilasan approved these changes

View reviewed changes

Member

camilasan left a comment

lgtm :)

claucambra added 16 commits

March 6, 2024 18:46


          Add option to do a fast enumeration of changes which ignores new, une…

179a368

…xplored folders

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Clean up properties and init/invalidate in FileProviderExtension

cac263f

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add a starter FileProviderConfig

1fc6014

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add computed property to FileProviderConfig to get and set internal c…

f987bcd

…onfig

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add fastEnumerationEnabled property to config

534b3a6

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Use value from config for fastEnumeration when creating enumerator

a3e1d66

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add lazy var for whether the fastEnumeration value has actually been …

9a8af68

…set in settings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add method to get state of fast enumeration setting

8d3b676

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add method to set fast enumeration in client communication service

bbe4895

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Mark fileProviderAvailable as nodiscard

ae524c0

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Make XPC pointer publicly available

90c26c3

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Remove wrapper method for creating debug archive, directly use FilePr…

913dcd7

…oviderXPC

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add method to get fast enumeration state (if possible) in FileProvide…

db9b9a6

…rXPC

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add method in file provider xpc to set fast enumeration enabled state

a02efd6

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add method to acquire fast enumeration enabled status in file provide…

6db9901

…r settings controller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add method to set fast enumeration enabled in file provider settings …

5eb333c

…controller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

claucambra added 6 commits

March 6, 2024 18:46


          Add method to check if fast enumeration setting has been set in setti…

23c1e55

…ngs controller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Make default of fast enumeration enabled method in file provider sett…

1441a5e

…ings controller to be true

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add starter FileProviderFastEnumerationSettings QML component

23ef72c

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Instantiate and hook up FileProviderFastEnumerationSettings within Fi…

6e55c84

…leProviderSettings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Log setting change for fast enumeration in ClientCommunicationService

1a576a1

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>


          Add explainer about fast sync to file provider settings

d64d959

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

claucambra force-pushed the feature/file-provider-fast-init-sync branch from 9b0cf5e to d64d959 Compare

March 6, 2024 10:46

claucambra merged commit 6845e24 into master

9 of 12 checks passed

claucambra deleted the feature/file-provider-fast-init-sync branch

March 6, 2024 10:47

nextcloud-desktop-bot commented Mar 6, 2024

AppImage file: nextcloud-PR-6461-d64d959b515677c05bdd9d7df69cb67814dc104c-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 bot commented Mar 6, 2024

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

tomdereub mentioned this pull request

Improve speed for initial sync with virtual files #4424

Open

mgallien added this to the 3.13.0 milestone

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

Labels

feature: 💽 virtual filesystem os: 🍎 macOS