internal coding

File Provider Extension/FileProviderExtension.swift

@@ -119,7 +119,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate {
             metadata.fileName = "root"
             metadata.fileNameView = "root"
             metadata.serverUrl = fileProviderData.shared.homeServerUrl
-            metadata.classFile = NCGlobal.shared.metadataTypeFileDirectory
+            metadata.classFile = NCGlobal.shared.metadataClassDirectory
             
             return FileProviderItem(metadata: metadata, parentItemIdentifier: NSFileProviderItemIdentifier(NSFileProviderItemIdentifier.rootContainer.rawValue))
             

iOSClient/Data/NCManageDatabase.swift

@@ -1878,12 +1878,12 @@ class NCManageDatabase: NSObject {
         }
         
         // Live Photo "DETECT"
-        if !metadata.directory && !metadata.livePhoto && (metadata.classFile == NCGlobal.shared.metadataTypeFileVideo || metadata.classFile == NCGlobal.shared.metadataTypeFileImage) {
+        if !metadata.directory && !metadata.livePhoto && (metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassImage) {
             var classFile = metadata.classFile
-            if classFile == NCGlobal.shared.metadataTypeFileImage {
-                classFile = NCGlobal.shared.metadataTypeFileVideo
+            if classFile == NCGlobal.shared.metadataClassImage {
+                classFile = NCGlobal.shared.metadataClassVideo
             } else {
-                classFile = NCGlobal.shared.metadataTypeFileImage
+                classFile = NCGlobal.shared.metadataClassImage
             }
             if getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameWithoutExt == %@ AND ocId != %@ AND classFile == %@", metadata.account, metadata.serverUrl, metadata.fileNameWithoutExt, metadata.ocId, classFile)) != nil {
                 metadata.livePhoto = true
@@ -2295,7 +2295,7 @@ class NCManageDatabase: NSObject {
         
         // For Live Photo
         var fileNameImages: [String] = []
-        let filtered = results.filter{ $0.classFile.contains(NCGlobal.shared.metadataTypeFileImage) }
+        let filtered = results.filter{ $0.classFile.contains(NCGlobal.shared.metadataClassImage) }
         filtered.forEach { print($0)
             let fileName = ($0.fileNameView as NSString).deletingPathExtension
             fileNameImages.append(fileName)
@@ -2492,10 +2492,10 @@ class NCManageDatabase: NSObject {
             return nil
         }
         
-        if classFile == NCGlobal.shared.metadataTypeFileImage {
-            classFile = NCGlobal.shared.metadataTypeFileVideo
+        if classFile == NCGlobal.shared.metadataClassImage {
+            classFile = NCGlobal.shared.metadataClassVideo
         } else {
-            classFile = NCGlobal.shared.metadataTypeFileImage
+            classFile = NCGlobal.shared.metadataClassImage
         }
         
         guard let result = realm.objects(tableMetadata.self).filter(NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameWithoutExt == %@ AND ocId != %@ AND classFile == %@", metadata.account, metadata.serverUrl, metadata.fileNameWithoutExt, metadata.ocId, classFile)).first else {

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1255,10 +1255,10 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             guard let metadataTouch = metadataTouch else { return }
             let imageIcon = UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
             
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo || metadata.classFile == NCGlobal.shared.metadataTypeFileAudio {
+            if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassFileAudio {
                 var metadatas: [tableMetadata] = []
                 for metadata in dataSource.metadatas {
-                    if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo || metadata.classFile == NCGlobal.shared.metadataTypeFileAudio {
+                    if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassFileAudio {
                         metadatas.append(metadata)
                     }
                 }

iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -440,7 +440,7 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
                             metadataMOVForUpload.sessionSelector = NCGlobal.shared.selectorUploadFile
                             metadataMOVForUpload.size = fileSize
                             metadataMOVForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
-                            metadataMOVForUpload.classFile = NCGlobal.shared.metadataTypeFileVideo
+                            metadataMOVForUpload.classFile = NCGlobal.shared.metadataClassVideo
 
                             metadatasMOV.append(metadataMOVForUpload)
                         }

iOSClient/Main/NCFunctionCenter.swift

@@ -75,14 +75,10 @@ import Queuer
                                 
                                 self.openDocumentController(metadata: metadata)
                                 
-                            } else if metadata.classFile == NCGlobal.shared.metadataTypeFileCompress || metadata.classFile == NCGlobal.shared.metadataTypeFileUnknown {
+                            } else if metadata.classFile == NCGlobal.shared.metadataClassFileCompress || metadata.classFile == NCGlobal.shared.metadataClassUnknown {
 
                                 self.openDocumentController(metadata: metadata)
                                 
-                            } else if metadata.classFile == NCGlobal.shared.metadataTypeFileImagemeter {
-                                
-                                self.openDocumentController(metadata: metadata)
-                                
                             } else {
                                 
                                 if let viewController = self.appDelegate.activeViewController {
@@ -316,7 +312,7 @@ import Queuer
         let fileNamePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
         let status = PHPhotoLibrary.authorizationStatus()
 
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileImage && status == PHAuthorizationStatus.authorized {
+        if metadata.classFile == NCGlobal.shared.metadataClassImage && status == PHAuthorizationStatus.authorized {
             
             if let image = UIImage.init(contentsOfFile: fileNamePath) {
                 UIImageWriteToSavedPhotosAlbum(image, self, #selector(SaveAlbum(_:didFinishSavingWithError:contextInfo:)), nil)
@@ -324,7 +320,7 @@ import Queuer
                 NCContentPresenter.shared.messageNotification("_save_selected_files_", description: "_file_not_saved_cameraroll_", delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, errorCode: NCGlobal.shared.errorFileNotSaved)
             }
             
-        } else if metadata.classFile == NCGlobal.shared.metadataTypeFileVideo && status == PHAuthorizationStatus.authorized {
+        } else if metadata.classFile == NCGlobal.shared.metadataClassVideo && status == PHAuthorizationStatus.authorized {
             
             if UIVideoAtPathIsCompatibleWithSavedPhotosAlbum(fileNamePath) {
                 UISaveVideoAtPathToSavedPhotosAlbum(fileNamePath, self, #selector(SaveAlbum(_:didFinishSavingWithError:contextInfo:)), nil)
@@ -876,15 +872,15 @@ import Queuer
         
         var children: [UIMenuElement] = [favorite, offline, openIn, rename, moveCopy, copy, delete]
 
-        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo) {
+        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassVideo) {
             children.insert(save, at: 2)
         }
         
-        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NCGlobal.shared.metadataTypeFileImage) {
+        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NCGlobal.shared.metadataClassImage) {
             children.insert(saveAsScan, at: 2)
         }
         
-        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf") {
+        if (metadata.contentType != "image/svg+xml") && (metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf") {
             children.insert(print, at: 2)
         }
         
@@ -892,11 +888,11 @@ import Queuer
             children.insert(viewInFolder, at: children.count-1)
         }
         
-        if (!isFolderEncrypted && metadata.contentType != "image/gif" && metadata.contentType != "image/svg+xml") && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NCGlobal.shared.metadataTypeFileImage) {
+        if (!isFolderEncrypted && metadata.contentType != "image/gif" && metadata.contentType != "image/svg+xml") && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NCGlobal.shared.metadataClassImage) {
             children.insert(modify, at: children.count-1)
         }
         
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileImage && viewController is NCCollectionViewCommon && !NCBrandOptions.shared.disable_background_image {
+        if metadata.classFile == NCGlobal.shared.metadataClassImage && viewController is NCCollectionViewCommon && !NCBrandOptions.shared.disable_background_image {
             let viewController: NCCollectionViewCommon = viewController as! NCCollectionViewCommon
             let layoutKey = viewController.layoutKey
             if layoutKey == NCGlobal.shared.layoutViewFiles {

iOSClient/Media/NCMedia.swift

@@ -44,8 +44,8 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
     internal var isEditMode = false
     internal var selectOcId: [String] = []
     
-    internal var filterTypeFileImage = false
-    internal var filterTypeFileVideo = false
+    internal var filterClassTypeImage = false
+    internal var filterClassTypeVideo = false
             
     private let maxImageGrid: CGFloat = 7
     private var cellHeigth: CGFloat = 0
@@ -425,7 +425,7 @@ extension NCMedia: UICollectionViewDataSource {
             }
             cell.date = metadata.date as Date
 
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileVideo || metadata.classFile == NCGlobal.shared.metadataTypeFileAudio {
+            if metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassFileAudio {
                 cell.imageStatus.image = cacheImages.cellPlayImage
             } else if metadata.livePhoto && livePhoto {
                 cell.imageStatus.image = cacheImages.cellLivePhotoImage
@@ -487,12 +487,12 @@ extension NCMedia {
         }
         let startServerUrl = NCUtilityFileSystem.shared.getHomeServer(account: appDelegate.account) + mediaPath
         
-        predicateDefault = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND (classFile == %@ OR classFile == %@) AND NOT (session CONTAINS[c] 'upload')", appDelegate.account, startServerUrl, NCGlobal.shared.metadataTypeFileImage, NCGlobal.shared.metadataTypeFileVideo)
+        predicateDefault = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND (classFile == %@ OR classFile == %@) AND NOT (session CONTAINS[c] 'upload')", appDelegate.account, startServerUrl, NCGlobal.shared.metadataClassImage, NCGlobal.shared.metadataClassVideo)
         
-        if filterTypeFileImage {
-            predicate = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND classFile == %@ AND NOT (session CONTAINS[c] 'upload')", appDelegate.account, startServerUrl, NCGlobal.shared.metadataTypeFileVideo)
-        } else if filterTypeFileVideo {
-            predicate = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND classFile == %@ AND NOT (session CONTAINS[c] 'upload')", appDelegate.account, startServerUrl, NCGlobal.shared.metadataTypeFileImage)
+        if filterClassTypeImage {
+            predicate = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND classFile == %@ AND NOT (session CONTAINS[c] 'upload')", appDelegate.account, startServerUrl, NCGlobal.shared.metadataClassVideo)
+        } else if filterClassTypeVideo {
+            predicate = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND classFile == %@ AND NOT (session CONTAINS[c] 'upload')", appDelegate.account, startServerUrl, NCGlobal.shared.metadataClassImage)
         } else {
             predicate = predicateDefault
         }
@@ -518,7 +518,7 @@ extension NCMedia {
     
     func updateMediaControlVisibility() {
         if self.metadatas.count == 0 {
-            if !self.filterTypeFileImage && !self.filterTypeFileVideo {
+            if !self.filterClassTypeImage && !self.filterClassTypeVideo {
                 self.mediaCommandView?.toggleEmptyView(isEmpty: true)
                 self.mediaCommandView?.isHidden = false
             } else {

iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -158,7 +158,7 @@ extension NCCollectionViewCommon {
         //
         // OPEN with external editor
         //
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileDocument && editors.contains(NCGlobal.shared.editorText) && ((editors.contains(NCGlobal.shared.editorOnlyoffice) || isRichDocument))  {
+        if metadata.classFile == NCGlobal.shared.metadataClassDocument && editors.contains(NCGlobal.shared.editorText) && ((editors.contains(NCGlobal.shared.editorOnlyoffice) || isRichDocument))  {
             
             var editor = ""
             var title = ""
@@ -205,7 +205,7 @@ extension NCCollectionViewCommon {
         //
         // PRINT
         //
-        if (metadata.classFile == NCGlobal.shared.metadataTypeFileImage && metadata.contentType != "image/svg+xml") || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
+        if (metadata.classFile == NCGlobal.shared.metadataClassImage && metadata.contentType != "image/svg+xml") || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_print_", comment: ""),
@@ -220,7 +220,7 @@ extension NCCollectionViewCommon {
         //
         // SAVE
         //
-        if (metadata.classFile == NCGlobal.shared.metadataTypeFileImage && metadata.contentType != "image/svg+xml") || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo {
+        if (metadata.classFile == NCGlobal.shared.metadataClassImage && metadata.contentType != "image/svg+xml") || metadata.classFile == NCGlobal.shared.metadataClassVideo {
             var title: String = NSLocalizedString("_save_selected_files_", comment: "")
             var icon = NCUtility.shared.loadImage(named: "square.and.arrow.down")
             let metadataMOV = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata)
@@ -252,7 +252,7 @@ extension NCCollectionViewCommon {
         // SAVE AS SCAN
         //
         if #available(iOS 13.0, *) {
-            if (metadata.classFile == NCGlobal.shared.metadataTypeFileImage && metadata.contentType != "image/svg+xml") {
+            if (metadata.classFile == NCGlobal.shared.metadataClassImage && metadata.contentType != "image/svg+xml") {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_save_as_scan_", comment: ""),
@@ -340,7 +340,7 @@ extension NCCollectionViewCommon {
         // USE AS BACKGROUND
         //
         if #available(iOS 13.0, *) {
-            if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage && self.layoutKey == NCGlobal.shared.layoutViewFiles && !NCBrandOptions.shared.disable_background_image {
+            if metadata.typeFile == NCGlobal.shared.metadataClassImage && self.layoutKey == NCGlobal.shared.layoutViewFiles && !NCBrandOptions.shared.disable_background_image {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_use_as_background_", comment: ""),
@@ -362,7 +362,7 @@ extension NCCollectionViewCommon {
         // MODIFY
         //
         if #available(iOS 13.0, *) {
-            if !isFolderEncrypted && metadata.contentType != "image/gif" && metadata.contentType != "image/svg+xml" && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NCGlobal.shared.metadataTypeFileImage) {
+            if !isFolderEncrypted && metadata.contentType != "image/gif" && metadata.contentType != "image/svg+xml" && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NCGlobal.shared.metadataClassImage) {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_modify_", comment: ""),
@@ -501,7 +501,7 @@ extension NCCollectionViewCommon {
                 action: { menuAction in
                     for ocId in self.selectOcId {
                         if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-                            if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo {
+                            if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassVideo {
                                 if let metadataMOV = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) {
                                     NCFunctionCenter.shared.saveLivePhoto(metadata: metadata, metadataMOV: metadataMOV)
                                 } else {

iOSClient/Menu/NCMedia+Menu.swift

@@ -46,13 +46,13 @@ extension NCMedia {
 
             actions.append(
                 NCMenuAction(
-                    title: NSLocalizedString(filterTypeFileImage ? "_media_viewimage_show_" : "_media_viewimage_hide_", comment: ""),
+                    title: NSLocalizedString(filterClassTypeImage ? "_media_viewimage_show_" : "_media_viewimage_hide_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "photo"),
-                    selected: filterTypeFileImage,
+                    selected: filterClassTypeImage,
                     on: true,
                     action: { menuAction in
-                        self.filterTypeFileImage = !self.filterTypeFileImage
-                        self.filterTypeFileVideo = false
+                        self.filterClassTypeImage = !self.filterClassTypeImage
+                        self.filterClassTypeVideo = false
                         self.reloadDataSource()
                     }
                 )
@@ -60,13 +60,13 @@ extension NCMedia {
 
             actions.append(
                 NCMenuAction(
-                    title: NSLocalizedString(filterTypeFileVideo ? "_media_viewvideo_show_" : "_media_viewvideo_hide_", comment: ""),
+                    title: NSLocalizedString(filterClassTypeVideo ? "_media_viewvideo_show_" : "_media_viewvideo_hide_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "video"),
-                    selected: filterTypeFileVideo,
+                    selected: filterClassTypeVideo,
                     on: true,
                     action: { menuAction in
-                        self.filterTypeFileVideo = !self.filterTypeFileVideo
-                        self.filterTypeFileImage = false
+                        self.filterClassTypeVideo = !self.filterClassTypeVideo
+                        self.filterClassTypeImage = false
                         self.reloadDataSource()
                     }
                 )
@@ -172,7 +172,7 @@ extension NCMedia {
                         self.isEditMode = false
                         for ocId in self.selectOcId {
                             if let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-                                if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo {
+                                if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassVideo {
                                     if let metadataMOV = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) {
                                         NCFunctionCenter.shared.saveLivePhoto(metadata: metadata, metadataMOV: metadataMOV)
                                     } else {

iOSClient/Menu/NCViewer+Menu.swift

@@ -124,7 +124,7 @@ extension NCViewer {
         //
         // PRINT
         //
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
+        if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_print_", comment: ""),
@@ -139,7 +139,7 @@ extension NCViewer {
         //
         // SAVE IMAGE / VIDEO
         //
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo {
+        if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassVideo {
             
             var title: String = NSLocalizedString("_save_selected_files_", comment: "")
             var icon = NCUtility.shared.loadImage(named: "square.and.arrow.down")
@@ -248,7 +248,7 @@ extension NCViewer {
         // DOWNLOAD IMAGE MAX RESOLUTION
         //
         if metadata.session == "" {
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileImage && !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && metadata.session == "" {
+            if metadata.classFile == NCGlobal.shared.metadataClassImage && !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && metadata.session == "" {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_download_image_max_", comment: ""),
@@ -280,7 +280,7 @@ extension NCViewer {
         // MODIFY
         //
         if #available(iOS 13.0, *) {
-            if !isFolderEncrypted && metadata.contentType != "image/gif" && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NCGlobal.shared.metadataTypeFileImage) {
+            if !isFolderEncrypted && metadata.contentType != "image/gif" && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.classFile == NCGlobal.shared.metadataClassImage) {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_modify_", comment: ""),

iOSClient/NCGlobal.swift

@@ -222,16 +222,15 @@ class NCGlobal: NSObject {
     @objc let permissionDefaultFileRemoteShareNoSupportShareOption: Int     = 3
     @objc let permissionDefaultFolderRemoteShareNoSupportShareOption: Int   = 15
     
-    // Metadata : FileType
+    // classType (metadata)
     //
-    @objc let metadataTypeFileAudio                 = "audio"
-    @objc let metadataTypeFileCompress              = "compress"
-    @objc let metadataTypeFileDirectory             = "directory"
-    @objc let metadataTypeFileDocument              = "document"
-    @objc let metadataTypeFileImage                 = "image"
-    @objc let metadataTypeFileUnknown               = "unknow"
-    @objc let metadataTypeFileVideo                 = "video"
-    @objc let metadataTypeFileImagemeter            = "imagemeter"
+    @objc let metadataClassFileAudio                = "audio"
+    @objc let metadataClassFileCompress             = "compress"
+    @objc let metadataClassDirectory                = "directory"
+    @objc let metadataClassDocument                 = "document"
+    @objc let metadataClassImage                    = "image"
+    @objc let metadataClassUnknown                  = "unknow"
+    @objc let metadataClassVideo                    = "video"
     
     // Filename Mask and Type
     //

iOSClient/Networking/NCAutoUpload.swift

@@ -240,9 +240,9 @@ class NCAutoUpload: NSObject, CLLocationManagerDelegate {
                         metadataForUpload.size = NCUtilityFileSystem.shared.getFileSize(asset: asset)
                         metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
                         if assetMediaType == PHAssetMediaType.video {
-                            metadataForUpload.classFile = NCGlobal.shared.metadataTypeFileVideo
+                            metadataForUpload.classFile = NCGlobal.shared.metadataClassVideo
                         } else if (assetMediaType == PHAssetMediaType.image) {
-                            metadataForUpload.classFile = NCGlobal.shared.metadataTypeFileImage
+                            metadataForUpload.classFile = NCGlobal.shared.metadataClassImage
                         }
                         
                         if selector == NCGlobal.shared.selectorUploadAutoUpload {
@@ -269,7 +269,7 @@ class NCAutoUpload: NSObject, CLLocationManagerDelegate {
                                     metadataForUpload.sessionSelector = selector
                                     metadataForUpload.size = NCUtilityFileSystem.shared.getFileSize(filePath: filePath)
                                     metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
-                                    metadataForUpload.classFile = NCGlobal.shared.metadataTypeFileVideo
+                                    metadataForUpload.classFile = NCGlobal.shared.metadataClassVideo
                                     
                                     if selector == NCGlobal.shared.selectorUploadAutoUpload {
                                         NCCommunicationCommon.shared.writeLog("Automatic upload added Live Photo \(metadataForUpload.fileNameView) (\(metadataForUpload.size) bytes) with Identifier \(metadataForUpload.assetLocalIdentifier)")

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -73,7 +73,7 @@ class NCNetworkingProcessUpload: NSObject {
                     let limit = self.maxConcurrentOperationUpload - counterUpload
                     var predicate = NSPredicate()
                     if UIApplication.shared.applicationState == .background {
-                        predicate = NSPredicate(format: "sessionSelector == %@ AND status == %d AND (classFile != %@ || livePhoto == true)", sessionSelector, NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataTypeFileVideo)
+                        predicate = NSPredicate(format: "sessionSelector == %@ AND status == %d AND (classFile != %@ || livePhoto == true)", sessionSelector, NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataClassVideo)
                     } else {
                         predicate = NSPredicate(format: "sessionSelector == %@ AND status == %d", sessionSelector, NCGlobal.shared.metadataStatusWaitUpload)
                     }

iOSClient/Transfers/NCTransfers.swift

@@ -194,7 +194,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate  {
                 
         if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
             cell.imageItem.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
-        } else if metadata.classFile == NCGlobal.shared.metadataTypeFileImage && FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)) {
+        } else if metadata.classFile == NCGlobal.shared.metadataClassImage && FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)) {
             cell.imageItem.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView))
         }
         

iOSClient/Utility/CCUtility.m

@@ -1657,7 +1657,7 @@
     int pixelX = 0;
     NSString *lensModel;
 
-    if (![metadata.classFile isEqualToString:NCGlobal.shared.metadataTypeFileImage] || ![CCUtility fileProviderStorageExists:metadata.ocId fileNameView:metadata.fileNameView]) {
+    if (![metadata.classFile isEqualToString:NCGlobal.shared.metadataClassImage] || ![CCUtility fileProviderStorageExists:metadata.ocId fileNameView:metadata.fileNameView]) {
         completition(latitude, longitude, location, date, lensModel);
         return;
     }

iOSClient/Utility/NCUtility.swift

@@ -438,9 +438,9 @@ class NCUtility: NSObject {
         
         if FileManager().fileExists(atPath: fileNamePathPreview) && FileManager().fileExists(atPath: fileNamePathIcon) { return }
         if !CCUtility.fileProviderStorageExists(ocId, fileNameView: fileName) { return }
-        if classFile != NCGlobal.shared.metadataTypeFileImage && classFile != NCGlobal.shared.metadataTypeFileVideo { return }
+        if classFile != NCGlobal.shared.metadataClassImage && classFile != NCGlobal.shared.metadataClassVideo { return }
         
-        if classFile == NCGlobal.shared.metadataTypeFileImage {
+        if classFile == NCGlobal.shared.metadataClassImage {
             
             originalImage = UIImage.init(contentsOfFile: fileNamePath)
             
@@ -450,7 +450,7 @@ class NCUtility: NSObject {
             try? scaleImagePreview?.jpegData(compressionQuality: 0.7)?.write(to: URL(fileURLWithPath: fileNamePathPreview))
             try? scaleImageIcon?.jpegData(compressionQuality: 0.7)?.write(to: URL(fileURLWithPath: fileNamePathIcon))
             
-        } else if classFile == NCGlobal.shared.metadataTypeFileVideo {
+        } else if classFile == NCGlobal.shared.metadataClassVideo {
             
             let videoPath = NSTemporaryDirectory()+"tempvideo.mp4"
             NCUtilityFileSystem.shared.linkItem(atPath: fileNamePath, toPath: videoPath)

iOSClient/Viewer/NCViewer.swift

@@ -43,7 +43,7 @@ class NCViewer: NSObject {
         var editor = editor
         
         // IMAGE AUDIO VIDEO
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileImage || metadata.classFile == NCGlobal.shared.metadataTypeFileAudio || metadata.classFile == NCGlobal.shared.metadataTypeFileVideo {
+        if metadata.classFile == NCGlobal.shared.metadataClassImage || metadata.classFile == NCGlobal.shared.metadataClassFileAudio || metadata.classFile == NCGlobal.shared.metadataClassVideo {
             
             if let navigationController = viewController.navigationController {
                             
@@ -64,7 +64,7 @@ class NCViewer: NSObject {
         }
         
         // DOCUMENTS
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileDocument {
+        if metadata.classFile == NCGlobal.shared.metadataClassDocument {
                 
             // PDF
             if metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {

iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -325,7 +325,7 @@ class NCViewerImage: UIViewController {
             return image
         }
         
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileVideo && !metadata.hasPreview {
+        if metadata.classFile == NCGlobal.shared.metadataClassVideo && !metadata.hasPreview {
             NCUtility.shared.createImageFrom(fileName: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, classFile: metadata.classFile)
         }
         
@@ -343,7 +343,7 @@ class NCViewerImage: UIViewController {
         let ext = CCUtility.getExtension(metadata.fileNameView)
         var image: UIImage?
         
-        if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && metadata.classFile == NCGlobal.shared.metadataTypeFileImage {
+        if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && metadata.classFile == NCGlobal.shared.metadataClassImage {
            
             let previewPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
             let imagePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
@@ -531,7 +531,7 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
             return
         }
         
-        if currentMetadata.classFile == NCGlobal.shared.metadataTypeFileVideo || currentMetadata.classFile == NCGlobal.shared.metadataTypeFileAudio {
+        if currentMetadata.classFile == NCGlobal.shared.metadataClassVideo || currentMetadata.classFile == NCGlobal.shared.metadataClassFileAudio {
             
             if self.viewerVideo?.pictureInPictureOcId != currentMetadata.ocId {
                                 
@@ -593,7 +593,7 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
         toolBar.isHidden = true
         viewerVideo = NCViewerVideo.init(view: viewerImageZoom.imageView, progressView: progressView, viewerVideoToolBar: toolBar)
         
-        if (currentMetadata.classFile == NCGlobal.shared.metadataTypeFileVideo || currentMetadata.classFile == NCGlobal.shared.metadataTypeFileAudio) {
+        if (currentMetadata.classFile == NCGlobal.shared.metadataClassVideo || currentMetadata.classFile == NCGlobal.shared.metadataClassFileAudio) {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
                 self.viewerVideo?.videoPlay(metadata: metadata)
             }
@@ -615,7 +615,7 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
         }
         
         // DOWNLOAD FILE
-        if ((metadata.classFile == NCGlobal.shared.metadataTypeFileImage && CCUtility.getAutomaticDownloadImage()) || (metadata.contentType == "image/heic" &&  metadata.hasPreview == false) || ext == "GIF" || ext == "SVG" || isFolderEncrypted) && metadata.session == "" && !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
+        if ((metadata.classFile == NCGlobal.shared.metadataClassImage && CCUtility.getAutomaticDownloadImage()) || (metadata.contentType == "image/heic" &&  metadata.hasPreview == false) || ext == "GIF" || ext == "SVG" || isFolderEncrypted) && metadata.session == "" && !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
             NCOperationQueue.shared.download(metadata: metadata, selector: "")
         }
         

iOSClient/Viewer/NCViewerImage/NCViewerImageDetailView.swift

@@ -109,7 +109,7 @@ class NCViewerImageDetailView: UIView {
         self.size = metadata.size
         self.date = metadata.date
         
-        if metadata.classFile == NCGlobal.shared.metadataTypeFileImage {
+        if metadata.classFile == NCGlobal.shared.metadataClassImage {
             CCUtility.setExif(metadata) { (latitude, longitude, location, date, lensMode) in
                 self.latitude = latitude
                 self.longitude = longitude
@@ -156,12 +156,12 @@ class NCViewerImageDetailView: UIView {
         }
         
         // Dimensions / Durations
-        if metadata?.classFile == NCGlobal.shared.metadataTypeFileImage {
+        if metadata?.classFile == NCGlobal.shared.metadataClassImage {
             if let image = self.image {
                 dimLabel.text = NSLocalizedString("_dimension_", comment: "")
                 dimValue.text = "\(Int(image.size.width)) x \(Int(image.size.height))"
             }
-        } else if metadata?.classFile == NCGlobal.shared.metadataTypeFileVideo || metadata?.classFile == NCGlobal.shared.metadataTypeFileAudio  {
+        } else if metadata?.classFile == NCGlobal.shared.metadataClassVideo || metadata?.classFile == NCGlobal.shared.metadataClassFileAudio  {
             NCNetworking.shared.getVideoUrl(metadata: metadata!) { url in
                 if let url = url {
                     let playerVideo = AVPlayer(url: url)

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -78,8 +78,8 @@ class NCViewerImageZoom: UIViewController {
         
         if image == nil {
             var named = "noPreview"
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileAudio { named = "noPreviewAudio" }
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileVideo { named = "noPreviewVideo" }
+            if metadata.classFile == NCGlobal.shared.metadataClassFileAudio { named = "noPreviewAudio" }
+            if metadata.classFile == NCGlobal.shared.metadataClassVideo { named = "noPreviewVideo" }
             image = UIImage.init(named: named)!.image(color: .gray, size: view.frame.width)
             self.noPreview = true
         }

iOSClient/Viewer/NCViewerProviderContextMenu.swift

@@ -80,7 +80,7 @@ class NCViewerProviderContextMenu: UIViewController  {
             }
              
             // VIEW IMAGE
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileImage && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
+            if metadata.classFile == NCGlobal.shared.metadataClassImage && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                 
                 viewImage(metadata: metadata)
             }
@@ -92,18 +92,18 @@ class NCViewerProviderContextMenu: UIViewController  {
             }
             
             // VIEW VIDEO
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileVideo && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
+            if metadata.classFile == NCGlobal.shared.metadataClassVideo && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                 viewVideo(metadata: metadata)
             }
             
             // PLAY SOUND
-            if metadata.classFile == NCGlobal.shared.metadataTypeFileAudio && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
+            if metadata.classFile == NCGlobal.shared.metadataClassFileAudio && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                 playSound(metadata: metadata)
             }
             
             // AUTO DOWNLOAD VIDEO / AUDIO
-            // if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.typeFile == NCGlobal.shared.metadataTypeFileVideo || metadata.typeFile == NCGlobal.shared.metadataTypeFileAudio || metadata.contentType == "application/pdf") {
-            if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.classFile == NCGlobal.shared.metadataTypeFileVideo || metadata.classFile == NCGlobal.shared.metadataTypeFileAudio) {
+            // if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.typeFile == NCGlobal.shared.metadataClassVideo || metadata.typeFile == NCGlobal.shared.metadataClassFileAudio || metadata.contentType == "application/pdf") {
+            if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassFileAudio) {
                 
                 var maxDownload: UInt64 = 0
                 
@@ -189,11 +189,11 @@ class NCViewerProviderContextMenu: UIViewController  {
         if let userInfo = notification.userInfo as NSDictionary? {
             if let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId), let errorCode = userInfo["errorCode"] as? Int {
                 if errorCode == 0 && metadata.ocId == self.metadata?.ocId {
-                    if metadata.classFile == NCGlobal.shared.metadataTypeFileImage {
+                    if metadata.classFile == NCGlobal.shared.metadataClassImage {
                         viewImage(metadata: metadata)
-                    } else if metadata.classFile == NCGlobal.shared.metadataTypeFileVideo {
+                    } else if metadata.classFile == NCGlobal.shared.metadataClassVideo {
                         viewVideo(metadata: metadata)
-                    } else if metadata.classFile == NCGlobal.shared.metadataTypeFileAudio {
+                    } else if metadata.classFile == NCGlobal.shared.metadataClassFileAudio {
                         playSound(metadata: metadata)
                     }
                 }

iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift

@@ -66,7 +66,7 @@ import QuickLook
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        if editingMode && metadata?.classFile == NCGlobal.shared.metadataTypeFileImage {
+        if editingMode && metadata?.classFile == NCGlobal.shared.metadataClassImage {
             Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true, block: { (t) in
                 if self.navigationItem.rightBarButtonItems?.count ?? 0 > 1 || !(self.navigationController?.isToolbarHidden ?? false) {
                     if #available(iOS 14.0, *) {

iOSClient/Viewer/NCViewerVideo/NCViewerAVPlayerViewController.swift

@@ -56,7 +56,7 @@ class NCViewerAVPlayerViewController: AVPlayerViewController {
             
             player = AVPlayer(url: url)
             
-            if  metadata.classFile == NCGlobal.shared.metadataTypeFileAudio {
+            if  metadata.classFile == NCGlobal.shared.metadataClassFileAudio {
                                 
                 let imageView = UIImageView.init(image: imageBackground)
                 imageView.translatesAutoresizingMaskIntoConstraints = false

iOSClient/Viewer/NCViewerVideo/NCViewerVideo.swift

@@ -57,7 +57,7 @@ class NCViewerVideo: NSObject {
 
     @objc func applicationDidEnterBackground(_ notification: NSNotification) {
         
-        if metadata?.classFile == NCGlobal.shared.metadataTypeFileVideo {
+        if metadata?.classFile == NCGlobal.shared.metadataClassVideo {
             player?.pause()
         }
     }