Эх сурвалжийг харах

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 жил өмнө
parent
commit
497c9ea998

+ 6 - 2
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -164,12 +164,16 @@ extension NCManageDatabase {
         completion(metadataFolder, metadataFolders, metadatas)
     }
 
-    @objc func createMetadata(account: String, user: String, userId: String, fileName: String, fileNameView: String, ocId: String, serverUrl: String, urlBase: String, url: String, contentType: String, isLivePhoto: Bool = false, isUrl: Bool = false, name: String = "Files", subline: String? = nil) -> tableMetadata {
+    @objc func createMetadata(account: String, user: String, userId: String, fileName: String, fileNameView: String, ocId: String, serverUrl: String, urlBase: String, url: String, contentType: String, isLivePhoto: Bool = false, isUrl: Bool = false, name: String = "Files", subline: String? = nil, iconName: String? = nil) -> tableMetadata {
 
         let metadata = tableMetadata()
         if isUrl {
             metadata.contentType = "text/uri-list"
-            metadata.iconName = NCCommunicationCommon.typeIconFile.url.rawValue
+            if let iconName = iconName {
+                metadata.iconName = iconName
+            } else {
+                metadata.iconName = NCCommunicationCommon.typeIconFile.url.rawValue
+            }
             metadata.classFile = NCCommunicationCommon.typeClassFile.url.rawValue
         } else {
             let (mimeType, classFile, iconName, _, _, _) = NCCommunicationCommon.shared.getInternalType(fileName: fileName, mimeType: contentType, directory: false)

+ 6 - 2
iOSClient/Networking/NCNetworking.swift

@@ -943,8 +943,12 @@ import Queuer
             switch provider.id {
             case "contacts", "talk-conversations":
                 partialResult.entries.forEach({ entry in
-                    let metadata = NCManageDatabase.shared.createMetadata(account: urlBase.account, user: urlBase.user, userId: urlBase.userId, fileName: entry.title, fileNameView: entry.title, ocId: NSUUID().uuidString, serverUrl: "", urlBase: urlBase.urlBase, url: entry.resourceURL, contentType: "", isUrl: true, name: partialResult.name, subline: entry.subline)
-                    print("")
+                    var iconName = entry.thumbnailURL
+                    if iconName.isEmpty {
+                        iconName = entry.icon
+                    }
+                    let metadata = NCManageDatabase.shared.createMetadata(account: urlBase.account, user: urlBase.user, userId: urlBase.userId, fileName: entry.title, fileNameView: entry.title, ocId: NSUUID().uuidString, serverUrl: urlBase.urlBase, urlBase: urlBase.urlBase, url: entry.resourceURL, contentType: "", isUrl: true, name: partialResult.name, subline: entry.subline, iconName: iconName)
+                    searchFiles.insert(metadata)
                 })
             case "files":
                 partialResult.entries.forEach({ entry in