|
|
@@ -26,6 +26,7 @@ import Realm
|
|
|
import NextcloudKit
|
|
|
import EasyTipView
|
|
|
import JGProgressHUD
|
|
|
+import Queuer
|
|
|
|
|
|
class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate, NCListCellDelegate, NCGridCellDelegate, NCSectionHeaderMenuDelegate, NCSectionFooterDelegate, UIAdaptivePresentationControllerDelegate, NCEmptyDataSetDelegate, UIContextMenuInteractionDelegate, NCAccountRequestDelegate, NCSelectableNavigationView {
|
|
|
|
|
|
@@ -1207,8 +1208,8 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
|
|
|
(cell as? NCCellProtocol)?.filePreviewImageView?.image = UIImage(named: metadata.iconName)
|
|
|
}
|
|
|
if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && (!CCUtility.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)) {
|
|
|
- for case let operation as NCOperationDownloadThumbnail in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
|
|
|
- appDelegate.downloadThumbnailQueue.addOperation(NCOperationDownloadThumbnail(metadata: metadata, cell: (cell as? NCCellProtocol), view: view))
|
|
|
+ for case let operation as NCCollecionViewCommonDownloadThumbnail in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
|
|
|
+ appDelegate.downloadThumbnailQueue.addOperation(NCCollecionViewCommonDownloadThumbnail(metadata: metadata, cell: (cell as? NCCellProtocol), view: view, forItemAt: indexPath))
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -1256,7 +1257,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
|
|
|
func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
|
|
|
if !collectionView.indexPathsForVisibleItems.contains(indexPath) {
|
|
|
guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return }
|
|
|
- for case let operation as NCOperationDownloadThumbnail in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
|
|
|
+ for case let operation as NCCollecionViewCommonDownloadThumbnail in appDelegate.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
|
|
|
operation.cancel()
|
|
|
}
|
|
|
}
|
|
|
@@ -1704,3 +1705,57 @@ extension NCCollectionViewCommon: EasyTipViewDelegate {
|
|
|
self.tipView?.dismiss()
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+class NCCollecionViewCommonDownloadThumbnail: ConcurrentOperation {
|
|
|
+
|
|
|
+ var metadata: tableMetadata
|
|
|
+ var cell: NCCellProtocol?
|
|
|
+ var view: UIView?
|
|
|
+ var fileNamePath: String
|
|
|
+ var fileNamePreviewLocalPath: String
|
|
|
+ var fileNameIconLocalPath: String
|
|
|
+
|
|
|
+ init(metadata: tableMetadata, cell: NCCellProtocol?, view: UIView?, forItemAt indexPath: IndexPath) {
|
|
|
+ self.metadata = tableMetadata.init(value: metadata)
|
|
|
+ self.cell = cell
|
|
|
+ self.view = view
|
|
|
+ self.fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId, account: metadata.account)!
|
|
|
+ self.fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
|
|
|
+ self.fileNameIconLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
|
|
|
+ }
|
|
|
+
|
|
|
+ override func start() {
|
|
|
+
|
|
|
+ guard !isCancelled else { return self.finish() }
|
|
|
+
|
|
|
+ var etagResource: String?
|
|
|
+ if FileManager.default.fileExists(atPath: fileNameIconLocalPath) && FileManager.default.fileExists(atPath: fileNamePreviewLocalPath) {
|
|
|
+ etagResource = metadata.etagResource
|
|
|
+ }
|
|
|
+
|
|
|
+ NextcloudKit.shared.downloadPreview(
|
|
|
+ fileNamePathOrFileId: fileNamePath,
|
|
|
+ fileNamePreviewLocalPath: fileNamePreviewLocalPath,
|
|
|
+ widthPreview: NCGlobal.shared.sizePreview,
|
|
|
+ heightPreview: NCGlobal.shared.sizePreview,
|
|
|
+ fileNameIconLocalPath: fileNameIconLocalPath,
|
|
|
+ sizeIcon: NCGlobal.shared.sizeIcon,
|
|
|
+ etag: etagResource,
|
|
|
+ options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, _, imageIcon, _, etag, error in
|
|
|
+
|
|
|
+ if error == .success, let image = imageIcon {
|
|
|
+ NCManageDatabase.shared.setMetadataEtagResource(ocId: self.metadata.ocId, etagResource: etag)
|
|
|
+ DispatchQueue.main.async {
|
|
|
+ if self.metadata.ocId == self.cell?.fileObjectId, let filePreviewImageView = self.cell?.filePreviewImageView {
|
|
|
+ UIView.transition(with: filePreviewImageView,
|
|
|
+ duration: 0.75,
|
|
|
+ options: .transitionCrossDissolve,
|
|
|
+ animations: { filePreviewImageView.image = image },
|
|
|
+ completion: nil)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ self.finish()
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
Marino Faggiana