|
|
@@ -24,6 +24,7 @@
|
|
|
import UIKit
|
|
|
import CoreLocation
|
|
|
import NCCommunication
|
|
|
+import Photos
|
|
|
|
|
|
class NCAutoUpload: NSObject {
|
|
|
@objc static let shared: NCAutoUpload = {
|
|
|
@@ -37,38 +38,36 @@ class NCAutoUpload: NSObject {
|
|
|
// MARK: -
|
|
|
|
|
|
@objc func initAutoUpload(viewController: UIViewController?, completion: @escaping (_ items: Int) -> Void) {
|
|
|
- if let activeAccount = NCManageDatabase.shared.getActiveAccount() {
|
|
|
- if activeAccount.autoUpload {
|
|
|
- NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
|
|
|
- if hasPermission {
|
|
|
- self.uploadAssetsNewAndFull(viewController: viewController, selector: NCGlobal.shared.selectorUploadAutoUpload, log: "Init Auto Upload") { items in
|
|
|
- if items > 0 {
|
|
|
- self.appDelegate.networkingProcessUpload?.startProcess()
|
|
|
- }
|
|
|
- completion(items)
|
|
|
- }
|
|
|
+ guard let activeAccount = NCManageDatabase.shared.getActiveAccount(), activeAccount.autoUpload else {
|
|
|
+ completion(0)
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
- } else {
|
|
|
- NCManageDatabase.shared.setAccountAutoUploadProperty("autoUpload", state: false)
|
|
|
- completion(0)
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
+ NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
|
|
|
+ guard hasPermission else {
|
|
|
+ NCManageDatabase.shared.setAccountAutoUploadProperty("autoUpload", state: false)
|
|
|
completion(0)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ self.uploadAssetsNewAndFull(viewController: viewController, selector: NCGlobal.shared.selectorUploadAutoUpload, log: "Init Auto Upload") { items in
|
|
|
+ if items > 0 {
|
|
|
+ self.appDelegate.networkingProcessUpload?.startProcess()
|
|
|
+ }
|
|
|
+ completion(items)
|
|
|
}
|
|
|
- } else {
|
|
|
- completion(0)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@objc func autoUploadFullPhotos(viewController: UIViewController?, log: String) {
|
|
|
+
|
|
|
NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: appDelegate.window?.rootViewController) { hasPermission in
|
|
|
- if hasPermission {
|
|
|
- NCContentPresenter.shared.messageNotification("_attention_", description: "_create_full_upload_", delay: NCGlobal.shared.dismissAfterSecondLong, type: .info, errorCode: NCGlobal.shared.errorNoError, priority: .max)
|
|
|
- NCUtility.shared.startActivityIndicator(backgroundView: nil, blurEffect: true)
|
|
|
- self.uploadAssetsNewAndFull(viewController: viewController, selector: NCGlobal.shared.selectorUploadAutoUploadAll, log: log) { _ in
|
|
|
- NCUtility.shared.stopActivityIndicator()
|
|
|
- }
|
|
|
+ guard hasPermission else { return }
|
|
|
+
|
|
|
+ NCContentPresenter.shared.messageNotification("_attention_", description: "_create_full_upload_", delay: NCGlobal.shared.dismissAfterSecondLong, type: .info, errorCode: NCGlobal.shared.errorNoError, priority: .max)
|
|
|
+ NCUtility.shared.startActivityIndicator(backgroundView: nil, blurEffect: true)
|
|
|
+ self.uploadAssetsNewAndFull(viewController: viewController, selector: NCGlobal.shared.selectorUploadAutoUploadAll, log: log) { _ in
|
|
|
+ NCUtility.shared.stopActivityIndicator()
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -78,35 +77,27 @@ class NCAutoUpload: NSObject {
|
|
|
completion(0)
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
guard let account = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", appDelegate.account)) else { return }
|
|
|
- let autoUploadPath = NCManageDatabase.shared.getAccountAutoUploadPath(urlBase: account.urlBase, account: account.account)
|
|
|
- var counterLivePhoto: Int = 0
|
|
|
- var metadataFull: [tableMetadata] = []
|
|
|
- var counterItemsUpload: Int = 0
|
|
|
+
|
|
|
DispatchQueue.global(qos: .background).async {
|
|
|
|
|
|
- self.getCameraRollAssets(viewController: viewController, account: account, selector: selector, alignPhotoLibrary: false) { assets in
|
|
|
+ let autoUploadPath = NCManageDatabase.shared.getAccountAutoUploadPath(urlBase: account.urlBase, account: account.account)
|
|
|
+ var metadatas: [tableMetadata] = []
|
|
|
|
|
|
- if assets == nil || assets?.count == 0 {
|
|
|
+ self.getCameraRollAssets(viewController: viewController, account: account, selector: selector, alignPhotoLibrary: false) { assets in
|
|
|
+ guard let assets = assets, !assets.isEmpty else {
|
|
|
NCCommunicationCommon.shared.writeLog("Automatic upload, no new assets found [" + log + "]")
|
|
|
- DispatchQueue.main.async {
|
|
|
- completion(counterItemsUpload)
|
|
|
- }
|
|
|
+ completion(0)
|
|
|
return
|
|
|
- } else {
|
|
|
- NCCommunicationCommon.shared.writeLog("Automatic upload, new \(assets?.count ?? 0) assets found [" + log + "]")
|
|
|
}
|
|
|
- guard let assets = assets else { return }
|
|
|
+ NCCommunicationCommon.shared.writeLog("Automatic upload, new \(assets.count) assets found [" + log + "]")
|
|
|
|
|
|
// Create the folder for auto upload & if request the subfolders
|
|
|
if !NCNetworking.shared.createFolder(assets: assets, selector: selector, useSubFolder: account.autoUploadCreateSubfolder, account: account.account, urlBase: account.urlBase) {
|
|
|
- DispatchQueue.main.async {
|
|
|
- if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
- NCContentPresenter.shared.messageNotification("_error_", description: "_error_createsubfolders_upload_", delay: NCGlobal.shared.dismissAfterSecond, type: .error, errorCode: NCGlobal.shared.errorInternalError, priority: .max)
|
|
|
- }
|
|
|
- return completion(counterItemsUpload)
|
|
|
+ if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
+ NCContentPresenter.shared.messageNotification("_error_", description: "_error_createsubfolders_upload_", delay: NCGlobal.shared.dismissAfterSecond, type: .error, errorCode: NCGlobal.shared.errorInternalError, priority: .max)
|
|
|
}
|
|
|
+ return completion(0)
|
|
|
}
|
|
|
|
|
|
self.endForAssetToUpload = false
|
|
|
@@ -117,10 +108,13 @@ class NCAutoUpload: NSObject {
|
|
|
var session: String = ""
|
|
|
guard let assetDate = asset.creationDate else { continue }
|
|
|
let assetMediaType = asset.mediaType
|
|
|
- let formatter = DateFormatter()
|
|
|
var serverUrl: String = ""
|
|
|
-
|
|
|
let fileName = CCUtility.createFileName(asset.value(forKey: "filename") as? String, fileDate: assetDate, fileType: assetMediaType, keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)!
|
|
|
+ let formatter = DateFormatter()
|
|
|
+ formatter.dateFormat = "yyyy"
|
|
|
+ let yearString = formatter.string(from: assetDate)
|
|
|
+ formatter.dateFormat = "MM"
|
|
|
+ let monthString = formatter.string(from: assetDate)
|
|
|
|
|
|
if asset.mediaSubtypes.contains(.photoLive) && CCUtility.getLivePhoto() {
|
|
|
livePhoto = true
|
|
|
@@ -140,11 +134,6 @@ class NCAutoUpload: NSObject {
|
|
|
} else { session = NCNetworking.shared.sessionIdentifierBackground }
|
|
|
}
|
|
|
|
|
|
- formatter.dateFormat = "yyyy"
|
|
|
- let yearString = formatter.string(from: assetDate)
|
|
|
- formatter.dateFormat = "MM"
|
|
|
- let monthString = formatter.string(from: assetDate)
|
|
|
-
|
|
|
if account.autoUploadCreateSubfolder {
|
|
|
serverUrl = autoUploadPath + "/" + yearString + "/" + monthString
|
|
|
} else {
|
|
|
@@ -157,86 +146,39 @@ class NCAutoUpload: NSObject {
|
|
|
if ext == "HEIC" && CCUtility.getFormatCompatibility() {
|
|
|
fileNameSearchMetadata = (fileNameSearchMetadata as NSString).deletingPathExtension + ".jpg"
|
|
|
}
|
|
|
-
|
|
|
if NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView == %@", account.account, serverUrl, fileNameSearchMetadata)) != nil {
|
|
|
-
|
|
|
if selector == NCGlobal.shared.selectorUploadAutoUpload {
|
|
|
NCManageDatabase.shared.addPhotoLibrary([asset], account: account.account)
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
-
|
|
|
- /* INSERT METADATA FOR UPLOAD */
|
|
|
- let metadataForUpload = NCManageDatabase.shared.createMetadata(account: account.account, user: account.user, userId: account.userId, fileName: fileName, fileNameView: fileName, ocId: NSUUID().uuidString, serverUrl: serverUrl, urlBase: account.urlBase, url: "", contentType: "", isLivePhoto: livePhoto)
|
|
|
- metadataForUpload.assetLocalIdentifier = asset.localIdentifier
|
|
|
- metadataForUpload.session = session
|
|
|
- metadataForUpload.sessionSelector = selector
|
|
|
- metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
|
|
|
+ let metadata = NCManageDatabase.shared.createMetadata(account: account.account, user: account.user, userId: account.userId, fileName: fileName, fileNameView: fileName, ocId: NSUUID().uuidString, serverUrl: serverUrl, urlBase: account.urlBase, url: "", contentType: "", isLivePhoto: livePhoto)
|
|
|
+ metadata.assetLocalIdentifier = asset.localIdentifier
|
|
|
+ metadata.session = session
|
|
|
+ metadata.sessionSelector = selector
|
|
|
+ if selector == NCGlobal.shared.selectorUploadAutoUpload {
|
|
|
+ metadata.isAutoupload = true
|
|
|
+ }
|
|
|
+ metadata.status = NCGlobal.shared.metadataStatusWaitUpload
|
|
|
if assetMediaType == PHAssetMediaType.video {
|
|
|
- metadataForUpload.classFile = NCCommunicationCommon.typeClassFile.video.rawValue
|
|
|
+ metadata.classFile = NCCommunicationCommon.typeClassFile.video.rawValue
|
|
|
} else if assetMediaType == PHAssetMediaType.image {
|
|
|
- metadataForUpload.classFile = NCCommunicationCommon.typeClassFile.image.rawValue
|
|
|
+ metadata.classFile = NCCommunicationCommon.typeClassFile.image.rawValue
|
|
|
}
|
|
|
-
|
|
|
if selector == NCGlobal.shared.selectorUploadAutoUpload {
|
|
|
- NCCommunicationCommon.shared.writeLog("Automatic upload added \(metadataForUpload.fileNameView) with Identifier \(metadataForUpload.assetLocalIdentifier)")
|
|
|
- self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadataForUpload], verifyAlreadyExists: true)
|
|
|
+ NCCommunicationCommon.shared.writeLog("Automatic upload added \(metadata.fileNameView) with Identifier \(metadata.assetLocalIdentifier)")
|
|
|
NCManageDatabase.shared.addPhotoLibrary([asset], account: account.account)
|
|
|
- } else if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
- metadataFull.append(metadataForUpload)
|
|
|
- }
|
|
|
- counterItemsUpload += 1
|
|
|
-
|
|
|
- /* INSERT METADATA MOV LIVE PHOTO FOR UPLOAD */
|
|
|
- if livePhoto {
|
|
|
-
|
|
|
- counterLivePhoto += 1
|
|
|
- let fileName = (fileName as NSString).deletingPathExtension + ".mov"
|
|
|
- let ocId = NSUUID().uuidString
|
|
|
- let filePath = CCUtility.getDirectoryProviderStorageOcId(ocId, fileNameView: fileName)!
|
|
|
-
|
|
|
- CCUtility.extractLivePhotoAsset(asset, filePath: filePath) { url in
|
|
|
- if url != nil {
|
|
|
- let metadataForUpload = NCManageDatabase.shared.createMetadata(account: account.account, user: account.user, userId: account.userId, fileName: fileName, fileNameView: fileName, ocId: ocId, serverUrl: serverUrl, urlBase: account.urlBase, url: "", contentType: "", isLivePhoto: livePhoto)
|
|
|
- metadataForUpload.session = session
|
|
|
- metadataForUpload.sessionSelector = selector
|
|
|
- metadataForUpload.size = NCUtilityFileSystem.shared.getFileSize(filePath: filePath)
|
|
|
- metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
|
|
|
- metadataForUpload.classFile = NCCommunicationCommon.typeClassFile.video.rawValue
|
|
|
-
|
|
|
- if selector == NCGlobal.shared.selectorUploadAutoUpload {
|
|
|
- NCCommunicationCommon.shared.writeLog("Automatic upload added Live Photo \(metadataForUpload.fileNameView) with Identifier \(metadataForUpload.assetLocalIdentifier)")
|
|
|
- self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadataForUpload], verifyAlreadyExists: true)
|
|
|
-
|
|
|
- } else if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
- metadataFull.append(metadataForUpload)
|
|
|
- }
|
|
|
- counterItemsUpload += 1
|
|
|
- }
|
|
|
- counterLivePhoto -= 1
|
|
|
- if counterLivePhoto == 0 && self.endForAssetToUpload {
|
|
|
- DispatchQueue.main.async {
|
|
|
- if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
- self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadataFull)
|
|
|
- }
|
|
|
- completion(counterItemsUpload)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
+ metadatas.append(metadata)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
self.endForAssetToUpload = true
|
|
|
-
|
|
|
- if counterLivePhoto == 0 {
|
|
|
- DispatchQueue.main.async {
|
|
|
- if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
- self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadataFull)
|
|
|
- }
|
|
|
- completion(counterItemsUpload)
|
|
|
- }
|
|
|
+ if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
|
|
|
+ self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadatas)
|
|
|
+ } else {
|
|
|
+ self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadatas, verifyAlreadyExists: true)
|
|
|
}
|
|
|
+ completion(metadatas.count)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -244,66 +186,66 @@ class NCAutoUpload: NSObject {
|
|
|
// MARK: -
|
|
|
|
|
|
@objc func alignPhotoLibrary(viewController: UIViewController?) {
|
|
|
- if let activeAccount = NCManageDatabase.shared.getActiveAccount() {
|
|
|
- getCameraRollAssets(viewController: viewController, account: activeAccount, selector: NCGlobal.shared.selectorUploadAutoUploadAll, alignPhotoLibrary: true) { assets in
|
|
|
- NCManageDatabase.shared.clearTable(tablePhotoLibrary.self, account: activeAccount.account)
|
|
|
- if let assets = assets {
|
|
|
- NCManageDatabase.shared.addPhotoLibrary(assets, account: activeAccount.account)
|
|
|
- NCCommunicationCommon.shared.writeLog("Align Photo Library \(assets.count)")
|
|
|
- }
|
|
|
- }
|
|
|
+ guard let activeAccount = NCManageDatabase.shared.getActiveAccount() else { return }
|
|
|
+
|
|
|
+ getCameraRollAssets(viewController: viewController, account: activeAccount, selector: NCGlobal.shared.selectorUploadAutoUploadAll, alignPhotoLibrary: true) { assets in
|
|
|
+ NCManageDatabase.shared.clearTable(tablePhotoLibrary.self, account: activeAccount.account)
|
|
|
+ guard let assets = assets else { return }
|
|
|
+
|
|
|
+ NCManageDatabase.shared.addPhotoLibrary(assets, account: activeAccount.account)
|
|
|
+ NCCommunicationCommon.shared.writeLog("Align Photo Library \(assets.count)")
|
|
|
}
|
|
|
}
|
|
|
|
|
|
private func getCameraRollAssets(viewController: UIViewController?, account: tableAccount, selector: String, alignPhotoLibrary: Bool, completion: @escaping (_ assets: [PHAsset]?) -> Void) {
|
|
|
|
|
|
NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
|
|
|
- if hasPermission {
|
|
|
- let assetCollection = PHAssetCollection.fetchAssetCollections(with: PHAssetCollectionType.smartAlbum, subtype: PHAssetCollectionSubtype.smartAlbumUserLibrary, options: nil)
|
|
|
- if assetCollection.count > 0 {
|
|
|
-
|
|
|
- let predicateImage = NSPredicate(format: "mediaType == %i", PHAssetMediaType.image.rawValue)
|
|
|
- let predicateVideo = NSPredicate(format: "mediaType == %i", PHAssetMediaType.video.rawValue)
|
|
|
- var predicate: NSPredicate?
|
|
|
- let fetchOptions = PHFetchOptions()
|
|
|
- var newAssets: [PHAsset] = []
|
|
|
-
|
|
|
- if alignPhotoLibrary || (account.autoUploadImage && account.autoUploadVideo) {
|
|
|
- predicate = NSCompoundPredicate(orPredicateWithSubpredicates: [predicateImage, predicateVideo])
|
|
|
- } else if account.autoUploadImage {
|
|
|
- predicate = predicateImage
|
|
|
- } else if account.autoUploadVideo {
|
|
|
- predicate = predicateVideo
|
|
|
- } else {
|
|
|
- return completion(nil)
|
|
|
- }
|
|
|
+ guard hasPermission else {
|
|
|
+ completion(nil)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ let assetCollection = PHAssetCollection.fetchAssetCollections(with: PHAssetCollectionType.smartAlbum, subtype: PHAssetCollectionSubtype.smartAlbumUserLibrary, options: nil)
|
|
|
+ if assetCollection.count == 0 {
|
|
|
+ completion(nil)
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
- fetchOptions.predicate = predicate
|
|
|
- let assets: PHFetchResult<PHAsset> = PHAsset.fetchAssets(in: assetCollection.firstObject!, options: fetchOptions)
|
|
|
-
|
|
|
- if selector == NCGlobal.shared.selectorUploadAutoUpload {
|
|
|
- var creationDate = ""
|
|
|
- var idAsset = ""
|
|
|
- let idsAsset = NCManageDatabase.shared.getPhotoLibraryIdAsset(image: account.autoUploadImage, video: account.autoUploadVideo, account: account.account)
|
|
|
- assets.enumerateObjects { asset, _, _ in
|
|
|
- if asset.creationDate != nil { creationDate = String(describing: asset.creationDate!) }
|
|
|
- idAsset = account.account + asset.localIdentifier + creationDate
|
|
|
- if !(idsAsset?.contains(idAsset) ?? false) {
|
|
|
- newAssets.append(asset)
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- assets.enumerateObjects { asset, _, _ in
|
|
|
- newAssets.append(asset)
|
|
|
- }
|
|
|
+ let predicateImage = NSPredicate(format: "mediaType == %i", PHAssetMediaType.image.rawValue)
|
|
|
+ let predicateVideo = NSPredicate(format: "mediaType == %i", PHAssetMediaType.video.rawValue)
|
|
|
+ var predicate: NSPredicate?
|
|
|
+ let fetchOptions = PHFetchOptions()
|
|
|
+ var newAssets: [PHAsset] = []
|
|
|
+
|
|
|
+ if alignPhotoLibrary || (account.autoUploadImage && account.autoUploadVideo) {
|
|
|
+ predicate = NSCompoundPredicate(orPredicateWithSubpredicates: [predicateImage, predicateVideo])
|
|
|
+ } else if account.autoUploadImage {
|
|
|
+ predicate = predicateImage
|
|
|
+ } else if account.autoUploadVideo {
|
|
|
+ predicate = predicateVideo
|
|
|
+ } else {
|
|
|
+ return completion(nil)
|
|
|
+ }
|
|
|
+
|
|
|
+ fetchOptions.predicate = predicate
|
|
|
+ let assets: PHFetchResult<PHAsset> = PHAsset.fetchAssets(in: assetCollection.firstObject!, options: fetchOptions)
|
|
|
+
|
|
|
+ if selector == NCGlobal.shared.selectorUploadAutoUpload {
|
|
|
+ var creationDate = ""
|
|
|
+ var idAsset = ""
|
|
|
+ let idsAsset = NCManageDatabase.shared.getPhotoLibraryIdAsset(image: account.autoUploadImage, video: account.autoUploadVideo, account: account.account)
|
|
|
+ assets.enumerateObjects { asset, _, _ in
|
|
|
+ if asset.creationDate != nil { creationDate = String(describing: asset.creationDate!) }
|
|
|
+ idAsset = account.account + asset.localIdentifier + creationDate
|
|
|
+ if !(idsAsset?.contains(idAsset) ?? false) {
|
|
|
+ newAssets.append(asset)
|
|
|
}
|
|
|
- completion(newAssets)
|
|
|
- } else {
|
|
|
- completion(nil)
|
|
|
}
|
|
|
} else {
|
|
|
- completion(nil)
|
|
|
+ assets.enumerateObjects { asset, _, _ in
|
|
|
+ newAssets.append(asset)
|
|
|
+ }
|
|
|
}
|
|
|
+ completion(newAssets)
|
|
|
}
|
|
|
}
|
|
|
}
|
Marino Faggiana