@@ -488,7 +488,6 @@ extension NCManageDatabase {
488488
489489 @discardableResult
490490 func addMetadata( _ metadata: tableMetadata ) -> tableMetadata ? {
491-
492491 let result = tableMetadata. init ( value: metadata)
493492
494493 do {
@@ -522,7 +521,6 @@ extension NCManageDatabase {
522521 }
523522
524523 func addMetadatas( _ metadatas: [ tableMetadata ] ) {
525-
526524 do {
527525 let realm = try Realm ( )
528526 try . write {
@@ -534,7 +532,6 @@ extension NCManageDatabase {
534532 }
535533
536534 func deleteMetadata( predicate: NSPredicate ) {
537-
538535 do {
539536 let realm = try Realm ( )
540537 try . write {
@@ -547,7 +544,6 @@ extension NCManageDatabase {
547544 }
548545
549546 func deleteMetadata( results: Results < tableMetadata > ) {
550-
551547 do {
552548 let realm = try Realm ( )
553549 try . write {
@@ -559,7 +555,6 @@ extension NCManageDatabase {
559555 }
560556
561557 func moveMetadata( ocId: String , serverUrlTo: String ) {
562-
563558 do {
564559 let realm = try Realm ( )
565560 try . write {
@@ -573,7 +568,6 @@ extension NCManageDatabase {
573568 }
574569
575570 func renameMetadata( fileNameTo: String , ocId: String ) {
576-
577571 do {
578572 let realm = try Realm ( )
579573 try . write {
@@ -592,7 +586,6 @@ extension NCManageDatabase {
592586 }
593587
594588 func setMetadataEtagResource( ocId: String , etagResource: String ? ) {
595-
596589 guard let etagResource = etagResource else { return }
597590
598591 do {
@@ -607,7 +600,6 @@ extension NCManageDatabase {
607600 }
608601
609602 func setMetadataFavorite( ocId: String , favorite: Bool ) {
610-
611603 do {
612604 let realm = try Realm ( )
613605 try . write {
@@ -620,7 +612,6 @@ extension NCManageDatabase {
620612 }
621613
622614 func setMetadataLivePhotoByServer( account: String , ocId: String , livePhotoFile: String ) {
623-
624615 do {
625616 let realm = try Realm ( )
626617 try . write {
@@ -635,7 +626,6 @@ extension NCManageDatabase {
635626 }
636627
637628 func updateMetadatasFavorite( account: String , metadatas: [ tableMetadata ] ) {
638-
639629 do {
640630 let realm = try Realm ( )
641631 try . write {
@@ -653,7 +643,6 @@ extension NCManageDatabase {
653643 }
654644
655645 func setMetadataEncrypted( ocId: String , encrypted: Bool ) {
656-
657646 do {
658647 let realm = try Realm ( )
659648 try . write {
@@ -666,7 +655,6 @@ extension NCManageDatabase {
666655 }
667656
668657 func setMetadataFileNameView( serverUrl: String , fileName: String , newFileNameView: String , account: String ) {
669-
670658 do {
671659 let realm = try Realm ( )
672660 try . write {
@@ -679,7 +667,6 @@ extension NCManageDatabase {
679667 }
680668
681669 func getMetadata( predicate: NSPredicate ) -> tableMetadata ? {
682-
683670 do {
684671 let realm = try Realm ( )
685672 realm. refresh ( )
@@ -693,7 +680,6 @@ extension NCManageDatabase {
693680 }
694681
695682 func getMetadata( predicate: NSPredicate , sorted: String , ascending: Bool ) -> tableMetadata ? {
696-
697683 do {
698684 let realm = try Realm ( )
699685 realm. refresh ( )
@@ -925,7 +911,6 @@ extension NCManageDatabase {
925911 }
926912
927913 func getTableMetadatasDirectoryFavoriteIdentifierRank( account: String ) -> [ String : NSNumber ] {
928-
929914 var listIdentifierRank : [ String : NSNumber ] = [ : ]
930915 var counter = 10 as Int64
931916
@@ -945,7 +930,6 @@ extension NCManageDatabase {
945930 }
946931
947932 @objc func clearMetadatasUpload( account: String ) {
948-
949933 do {
950934 let realm = try Realm ( )
951935 try . write {
@@ -958,7 +942,6 @@ extension NCManageDatabase {
958942 }
959943
960944 func readMarkerMetadata( account: String , fileId: String ) {
961-
962945 do {
963946 let realm = try Realm ( )
964947 try . write {
@@ -972,8 +955,7 @@ extension NCManageDatabase {
972955 }
973956 }
974957
975- func getAssetLocalIdentifiersUploaded( account: String ) -> [ String ] {
976-
958+ func getAssetLocalIdentifiersUploaded( account: String ) -> [ String ] ? {
977959 var assetLocalIdentifiers : [ String ] = [ ]
978960
979961 do {
@@ -982,15 +964,15 @@ extension NCManageDatabase {
982964 for result in results {
983965 assetLocalIdentifiers. append ( result. assetLocalIdentifier)
984966 }
967+ return assetLocalIdentifiers
985968 } catch let errorNSError {
986969 NextcloudKit . shared. nkCommonInstance. writeLog ( " [ERROR] Could not access database: \( error) " )
987970 }
988971
989- return assetLocalIdentifiers
972+ return nil
990973 }
991974
992975 func clearAssetLocalIdentifiers( _ assetLocalIdentifiers: [ String ] , account: String ) {
993-
994976 do {
995977 let realm = try Realm ( )
996978 try . write {
@@ -1005,7 +987,6 @@ extension NCManageDatabase {
1005987 }
1006988
1007989 func getMetadataLivePhoto( metadata: tableMetadata ) -> tableMetadata ? {
1008-
1009990 guard metadata. isLivePhoto else { return nil }
1010991
1011992 do {
@@ -1020,7 +1001,6 @@ extension NCManageDatabase {
10201001 }
10211002
10221003 func isMetadataShareOrMounted( metadata: tableMetadata , metadataFolder: tableMetadata ? ) -> Bool {
1023-
10241004 var isShare = false
10251005 var isMounted = false
10261006
@@ -1043,7 +1023,6 @@ extension NCManageDatabase {
10431023 }
10441024
10451025 func getMetadataConflict( account: String , serverUrl: String , fileNameView: String ) -> tableMetadata ? {
1046-
10471026 // verify exists conflict
10481027 let fileNameExtension = ( fileNameView as NSString ) . pathExtension. lowercased ( )
10491028 let fileNameNoExtension = ( fileNameView as NSString ) . deletingPathExtension
@@ -1069,7 +1048,6 @@ extension NCManageDatabase {
10691048 }
10701049
10711050 func getMetadataFromDirectory( account: String , serverUrl: String ) -> tableMetadata ? {
1072-
10731051 do {
10741052 let realm = try Realm ( )
10751053 realm. refresh ( )
@@ -1084,7 +1062,6 @@ extension NCManageDatabase {
10841062 }
10851063
10861064 func getMetadatasFromGroupfolders( account: String , urlBase: String , userId: String ) -> [ tableMetadata ] {
1087-
10881065 var metadatas : [ tableMetadata ] = [ ]
10891066 let homeServerUrl = utilityFileSystem. getHomeServer ( urlBase: urlBase, userId: userId)
10901067
@@ -1108,7 +1085,6 @@ extension NCManageDatabase {
11081085 }
11091086
11101087 func getMetadatasInError( account: String ) -> Results < tableMetadata > ? {
1111-
11121088 do {
11131089 let realm = try Realm ( )
11141090 let results = realm. objects ( tableMetadata. self) . filter ( " account == %@ AND errorCodeCounter > 1 " , account)
@@ -1122,7 +1098,6 @@ extension NCManageDatabase {
11221098
11231099 @discardableResult
11241100 func updateMetadatas( _ metadatas: [ tableMetadata ] , predicate: NSPredicate ) -> ( metadatasDifferentCount: Int , metadatasModified: Int ) {
1125-
11261101 var metadatasDifferentCount : Int = 0
11271102 var metadatasModified : Int = 0
11281103
@@ -1153,7 +1128,6 @@ extension NCManageDatabase {
11531128 }
11541129
11551130 func replaceMetadata( _ metadatas: [ tableMetadata ] , predicate: NSPredicate ) {
1156-
11571131 do {
11581132 let realm = try Realm ( )
11591133 try . write {
@@ -1173,7 +1147,6 @@ extension NCManageDatabase {
11731147 }
11741148
11751149 func getMediaMetadatas( predicate: NSPredicate ) -> ThreadSafeArray < tableMetadata > ? {
1176-
11771150 do {
11781151 let realm = try Realm ( )
11791152 let results = realm. objects ( tableMetadata. self) . filter ( predicate) . sorted ( byKeyPath: " date " , ascending: false )
0 commit comments