Merge remote-tracking branch 'origin/master' into nmc/master/custom_main_window

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>

Author: nilsding

.github/workflows/clang-format.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    - uses: cpp-linter/cpp-linter-action@b6edc0625e3941baa1797f4b4326adeab6890c97 # v2.16.7
+    - uses: cpp-linter/cpp-linter-action@24467985494bed9bfc398489b6ec12469beaf4da # v2.17.0
       id: linter
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux-appimage.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Upload AppImage artifact
         id: upload-appimage
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: nextcloud-appimage-pr-${{ github.event.number }}
           path: ${{ steps.build-appimage.outputs.APPIMAGE_NAME }}

.github/workflows/stale.yml

@@ -17,7 +17,7 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           operations-per-run: 1500
           days-before-stale: 28

NEXTCLOUD.cmake

@@ -31,7 +31,7 @@ set( APPLICATION_ICON_SET   "SVG" )
 set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" )
 set( APPLICATION_SERVER_URL_ENFORCE ON ) # If set and APPLICATION_SERVER_URL is defined, the server can only connect to the pre-defined URL
 set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
-set( DEVELOPMENT_TEAM "NKUJUXUJ3B" CACHE STRING "Apple Development Team ID for code signing" )
+set( DEVELOPMENT_TEAM "NKUJUXUJ3B" CACHE STRING "Apple Development Team ID" )
 set( APPLICATION_VIRTUALFILE_SUFFIX "nextcloud" CACHE STRING "Virtual file suffix (not including the .)")
 set( APPLICATION_OCSP_STAPLING_ENABLED OFF )
 set( APPLICATION_FORBID_BAD_SSL OFF )

Nextcloud Desktop Client.xcworkspace/contents.xcworkspacedata

@@ -7,25 +7,26 @@
 
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/desktop)](https://api.reuse.software/info/github.com/nextcloud/desktop)
 
-The Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server with your computer.
+The Nextcloud Desktop Client is an app to synchronize files from Nextcloud Server with your computer.
 
 <p align="center">
     <img src="doc/images/main_dialog_christine.png" alt="Desktop Client on Windows" width="450">
 </p>
 
-## Releases 🚀
-For the latest stable recommended version, please refer to the [download page https://nextcloud.com/install/#install-clients](https://nextcloud.com/install/#install-clients)
+## Downloads 🚀
+For the latest stable and recommended version, please refer to [the official download page](https://nextcloud.com/install/#install-clients).
 
-## Contributing to the desktop client 🫴
+## Contributing 🫴
 :v: Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere and to explain how together we can strengthen and support each other.
 
 ## Join the team 👪
 There are many ways to contribute, of which development is only one! Find out [how to get involved](https://nextcloud.com/contribute/), including as a translator, designer, tester, helping others, and much more! 😍
 
 ## Help testing 🔬
-Download and install the client:<br>
-[🔽 All releases](https://github.com/nextcloud-releases/desktop/releases)<br>
-[🔽 Daily master builds](https://download.nextcloud.com/desktop/daily)
+Download and install the client:
+
+- [All releases](https://github.com/nextcloud-releases/desktop/releases)<br>
+- [Daily builds](https://download.nextcloud.com/desktop/daily)
 
 ## Reporting issues 🐛
 If you find any bugs or have any suggestion for improvement, please
@@ -100,11 +101,12 @@ This simple test server already suffices in the most cases. For more advanced se
 
 ## Get in touch 💬
 * [📋 Forum](https://help.nextcloud.com)
-* [👥 Facebook](https://www.facebook.com/nextclouders)
-* [🐣 Twitter](https://twitter.com/Nextclouders)
 * [🐘 Mastodon](https://mastodon.xyz/@nextcloud)
+* [🔗 LinkedIn](https://www.linkedin.com/company/nextcloud-gmbh/)
+* [🦋 Bluesky](https://bsky.app/profile/nextcloud.bsky.social)
+* [👥 Facebook](https://www.facebook.com/nextclouders)
 
-You can also [get support for Nextcloud](https://nextcloud.com/support)!
+You can also [get professional support for Nextcloud and the desktop client](https://nextcloud.com/support)!
 
 ## License 📜
 

README.md

@@ -91,6 +91,9 @@ struct Build: AsyncParsableCommand {
     @Flag(help: "Build File Provider Module.")
     var buildFileProviderModule = false
 
+    @Flag(help: "Build without QtWebEngine.")
+    var withoutWebEngine = false
+
     @Flag(help: "Build without Sparkle auto-updater.")
     var disableAutoUpdater = false
 
@@ -202,7 +205,8 @@ struct Build: AsyncParsableCommand {
             "\(craftBlueprintName).osxArchs=\(arch)",
             "\(craftBlueprintName).buildTests=\(buildTests ? "True" : "False")",
             "\(craftBlueprintName).buildMacOSBundle=\(disableAppBundle ? "False" : "True")",
-            "\(craftBlueprintName).buildFileProviderModule=\(buildFileProviderModule ? "True" : "False")"
+            "\(craftBlueprintName).buildFileProviderModule=\(buildFileProviderModule ? "True" : "False")",
+            "\(craftBlueprintName).buildWithWebEngine=\(withoutWebEngine ? "False" : "True")"
         ]
 
         if let overrideServerUrl {
@@ -303,18 +307,32 @@ struct Build: AsyncParsableCommand {
         // which allows breakpoints in extension source files to be resolved correctly.
 
         if dev {
-            Log.info("Copying extension dSYM bundles into product app bundle for debugging...")
+            let dSYM = clientBuildURL
+                .appendingPathComponent("image-\(buildType)-master-dbg")
+                .appendingPathComponent("\(appName).app.dSYM")
+
+            let binaryLocation = clientAppURL
+                .appendingPathComponent("Contents")
+                .appendingPathComponent("MacOS")
+                .appendingPathComponent("\(appName).app.dSYM")
+
+            Log.info("Copying main dSYM bundle at \"\(dSYM.path)\" into product app bundle \"\(binaryLocation.path)\" for debugging...")
 
-            // XCODE_TARGET_CONFIGURATION in CMakeLists.txt is always "Debug" when NEXTCLOUD_DEV=ON,
-            // regardless of the CMake build type passed to Craft.
-            let xcodeTargetConfiguration = "Debug"
+            if fm.fileExists(atPath: binaryLocation.path) {
+                Log.info("Removing already existing main dSYM bundle at \"\(binaryLocation.path)\"...")
+                try fm.removeItem(at: binaryLocation)
+            }
+
+            try fm.copyItem(at: dSYM, to: binaryLocation)
+
+            Log.info("Copying extension dSYM bundles into product app bundle for debugging...")
 
             let shellIntegrationBuildDir = clientBuildURL
                 .appendingPathComponent("work")
                 .appendingPathComponent("build")
                 .appendingPathComponent("shell_integration")
                 .appendingPathComponent("MacOSX")
-                .appendingPathComponent(xcodeTargetConfiguration)
+                .appendingPathComponent(buildType)
 
             let plugInsDir = clientAppURL
                 .appendingPathComponent("Contents")
@@ -332,6 +350,7 @@ struct Build: AsyncParsableCommand {
                 let destination = plugInsDir.appendingPathComponent(dSYM.lastPathComponent)
 
                 if fm.fileExists(atPath: destination.path) {
+                    Log.info("Removing already existing extension dSYM bundle at \"\(destination.path)\"...")
                     try fm.removeItem(at: destination)
                 }
 

admin/osx/mac-crafter/Sources/Commands/Build.swift

@@ -447,21 +447,53 @@ public final class FilesDatabaseManager: Sendable {
         }
     }
 
+    ///
+    /// Mark an item as deleted.
+    ///
+    /// This is a soft delete and does not actually delete data for which there is ``removeItemMetadata(ocId:)``.
+    ///
+    /// - Parameters:
+    ///     - ocId: The unique identifier of the item.
+    ///
     @discardableResult public func deleteItemMetadata(ocId: String) -> Bool {
         do {
             let results = itemMetadatas.where { $0.ocId == ocId }
             let database = ncDatabase()
+
             try database.write {
-                logger.debug("Deleting item metadata. \(ocId)")
                 results.forEach { $0.deleted = true }
+                logger.debug("Marked item as deleted.", [.item: ocId])
             }
+
             return true
         } catch {
-            logger.error("Could not delete item metadata with ocId \(ocId).", [.error: error])
+            logger.error("Could not mark item as deleted.", [.item: ocId, .error: error])
             return false
         }
     }
 
+    ///
+    /// Hard delete an item.
+    ///
+    /// Unlike ``deleteItemMetadata(ocId:)``, this actually deletes a data record.
+    ///
+    /// - Parameters:
+    ///     - ocId: The unique identifier of the item.
+    ///
+    public func removeItemMetadata(ocId: String) {
+        do {
+            let database = ncDatabase()
+            let results = itemMetadatas.where { $0.ocId == ocId }
+
+            try database.write {
+                database.delete(results)
+                logger.debug("Removed item metadata from database.", [.item: ocId])
+            }
+        } catch {
+            logger.error("Could not remove item metadata.", [.item: ocId, .error: error])
+        }
+    }
+
     public func renameItemMetadata(ocId: String, newServerUrl: String, newFileName: String) {
         guard let itemMetadata = itemMetadatas.where({ $0.ocId == ocId }).first else {
             logger.error("Could not find an item with ocID \(ocId) to rename to \(newFileName)")
@@ -538,13 +570,12 @@ public final class FilesDatabaseManager: Sendable {
         return NSFileProviderItemIdentifier(parentMetadata.ocId)
     }
 
-    private func managedMaterialisedItemMetadatas(account: String) -> Results<RealmItemMetadata> {
+    private func managedMaterialisedItemMetadatas() -> Results<RealmItemMetadata> {
         itemMetadatas.where { candidate in
-            let belongsToAccount = candidate.account == account
             let isVisitedDirectory = candidate.directory && candidate.visitedDirectory
             let isDownloadedFile = candidate.directory == false && candidate.downloaded
 
-            return belongsToAccount && (isVisitedDirectory || isDownloadedFile)
+            return isVisitedDirectory || isDownloadedFile
         }
     }
 
@@ -556,67 +587,97 @@ public final class FilesDatabaseManager: Sendable {
     ///
     /// - Returns: An array of sendable metadata objects.
     ///
-    public func materialisedItemMetadatas(account: String) -> [SendableItemMetadata] {
-        managedMaterialisedItemMetadatas(account: account).toUnmanagedResults()
+    public func materialisedItemMetadatas(account _: String) -> [SendableItemMetadata] {
+        managedMaterialisedItemMetadatas().toUnmanagedResults()
     }
 
-    public func pendingWorkingSetChanges(account: Account, since date: Date) -> (updated: [SendableItemMetadata], deleted: [SendableItemMetadata]) {
-        let accId = account.ncKitAccount
-        let pending = managedMaterialisedItemMetadatas(account: accId).where { $0.syncTime > date }
-        var updated = pending.where { !$0.deleted }.toUnmanagedResults()
-        var deleted = pending.where { $0.deleted }.toUnmanagedResults()
-        var handledUpdateOcIds = Set(updated.map(\.ocId))
+    ///
+    /// Look up the not yet synchronized changes and deletions in the materialized items since the last given synchronization time.
+    ///
+    /// - Parameters:
+    ///     - date: All items with a synchronization time later than this are considered.
+    ///
+    /// - Returns: Locally changed items in the working set grouped by "updated" and "deleted".
+    ///
+    public func pendingWorkingSetChanges(since date: Date) -> (updated: [SendableItemMetadata], deleted: [SendableItemMetadata]) {
+        logger.debug("Gathering pending working set changes...")
+        let pendingChanges = managedMaterialisedItemMetadatas().where { $0.syncTime > date }
+        var updatedItems = pendingChanges.where { !$0.deleted }.toUnmanagedResults()
+        var deletedItems = pendingChanges.where { $0.deleted }.toUnmanagedResults()
+
+        for item in updatedItems {
+            logger.debug("Found updated item.", [.item: item.ocId, .name: item.fileName])
+        }
 
-        updated
-            .map { $0.remotePath() }
-            .forEach { serverUrl in
-                logger.debug("Checking updated item...", [.url: serverUrl])
+        for item in deletedItems {
+            logger.debug("Found deleted item.", [.item: item.ocId, .name: item.fileName])
+        }
 
+        var updatedItemIdentifiers = Set(updatedItems.map(\.ocId))
+        var deletedItemIdentifiers = Set(deletedItems.map(\.ocId))
+
+        updatedItems // Look for changed children
+            .filter {
+                $0.directory // files do not have any children to look for
+            }
+            .map {
+                $0.remotePath()
+            }
+            .forEach { serverUrl in
                 itemMetadatas
-                    .where { $0.serverUrl == serverUrl && $0.syncTime > date }
-                    .forEach { metadata in
-                        guard !handledUpdateOcIds.contains(metadata.ocId) else {
-                            return
-                        }
+                    .where {
+                        $0.serverUrl == serverUrl && $0.syncTime > date
+                    }
+                    .forEach { child in
+                        let sendableMetadata = SendableItemMetadata(value: child)
 
-                        handledUpdateOcIds.insert(metadata.ocId)
-                        let sendableMetadata = SendableItemMetadata(value: metadata)
+                        if child.deleted {
+                            guard deletedItemIdentifiers.contains(child.ocId) == false else {
+                                return
+                            }
 
-                        if metadata.deleted {
-                            deleted.append(sendableMetadata)
-                            logger.debug("Appended deleted item to working set changes.", [.item: metadata.ocId, .url: serverUrl])
+                            deletedItemIdentifiers.insert(child.ocId)
+                            deletedItems.append(sendableMetadata)
+                            logger.debug("Appended deleted item to working set changes.", [.item: child.ocId, .url: serverUrl])
                         } else {
-                            updated.append(sendableMetadata)
-                            logger.debug("Appended updated item to working set changes.", [.item: metadata.ocId, .url: serverUrl])
+                            guard updatedItemIdentifiers.contains(child.ocId) == false else {
+                                return
+                            }
+
+                            updatedItemIdentifiers.insert(child.ocId)
+                            updatedItems.append(sendableMetadata)
+                            logger.debug("Appended updated item to working set changes.", [.item: child.ocId, .url: serverUrl])
                         }
                     }
             }
 
-        let handledDeleteOcIds = Set(deleted.map(\.ocId))
-
-        deleted
-            .map { $0.remotePath() }
+        deletedItems // Look for deleted children recursively
+            .filter {
+                $0.directory // files do not have any children to look for
+            }
+            .map {
+                $0.remotePath()
+            }
             .forEach { serverUrl in
-                logger.debug("Verifying deleted item...", [.url: serverUrl])
-
                 itemMetadatas.where {
                     $0.serverUrl.starts(with: serverUrl) && $0.syncTime > date
-                }.forEach { metadata in
-                    guard metadata.isLockFileOfLocalOrigin == false else {
-                        logger.info("Excluding item from deletion because it is a lock file from local origin.", [.item: metadata.ocId])
+                }.forEach { child in
+                    guard child.isLockFileOfLocalOrigin == false else {
+                        logger.info("Excluding item from deletion because it is a lock file from local origin.", [.item: child.ocId, .name: child.fileName])
                         return
                     }
 
-                    guard !handledDeleteOcIds.contains(metadata.ocId) else {
+                    guard !deletedItemIdentifiers.contains(child.ocId) else {
                         return
                     }
 
-                    deleted.append(SendableItemMetadata(value: metadata))
-                    logger.debug("Appended deleted item to working set changes.", [.item: metadata.ocId, .url: serverUrl])
+                    deletedItemIdentifiers.insert(child.ocId)
+                    deletedItems.append(SendableItemMetadata(value: child))
+                    logger.debug("Appended deleted item to working set changes.", [.item: child.ocId, .url: serverUrl])
                 }
             }
 
-        return (updated, deleted)
+        return (updatedItems, deletedItems)
     }
 
     public func itemsMetadataByFileNameSuffix(suffix: String) -> [SendableItemMetadata] {

shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager.swift

@@ -196,7 +196,7 @@ extension Enumerator {
                 metadata.downloaded = existing?.downloaded == true
                 metadata.keepDownloaded = existing?.keepDownloaded == true
                 dbManager.addItemMetadata(metadata)
-                return ([metadata], newItems, updatedItems, nil, nextPage, nil)
+                return ([metadata], newItems, updatedItems, [], nextPage, nil)
             }
         }
 
@@ -211,7 +211,7 @@ extension Enumerator {
             metadata.keepDownloaded = existing?.keepDownloaded == true
             dbManager.addItemMetadata(metadata)
 
-            return ([metadata], newMetadatas, updatedMetadatas, nil, nextPage, nil)
+            return ([metadata], newMetadatas, updatedMetadatas, [], nextPage, nil)
         } else if depth == .targetAndDirectChildren {
             let (allMetadatas, newMetadatas, updatedMetadatas, deletedMetadatas, readError) = await handleDepth1ReadFileOrFolder(
                 serverUrl: serverUrl,