瀏覽代碼

improve detect LivePhoto

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 年之前
父節點
當前提交
b45779613b
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 2 2
      Nextcloud.xcodeproj/project.pbxproj
  2. 2 1
      iOSClient/Data/NCManageDatabase+Metadata.swift

+ 2 - 2
Nextcloud.xcodeproj/project.pbxproj

@@ -3701,7 +3701,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3764,7 +3764,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

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

@@ -253,7 +253,7 @@ extension NCManageDatabase {
             counter += 1
         }
 
-        completion(metadataFolder, metadataFolders, setLivePhoto(metadatas: metadatas.sorted(by: {$0.fileNameView > $1.fileNameView})))
+        completion(metadataFolder, metadataFolders, setLivePhoto(metadatas: 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 = NCGlobal.shared.appName, subline: String? = nil, iconName: String? = nil, iconUrl: String? = nil) -> tableMetadata {
@@ -564,6 +564,7 @@ extension NCManageDatabase {
 
         let numMetadatas: Int = metadatas.count - 1
         var metadataOutput: [tableMetadata] = []
+        let metadatas = metadatas.sorted(by: {$0.fileNameView < $1.fileNameView})
 
         for index in metadatas.indices {
             let metadata = metadatas[index]