[trello.com/c/mCIOWeDH] Fixed file presenting

Adamant/Modules/Chat/View/ChatViewController.swift

@@ -570,7 +570,7 @@ private extension ChatViewController {
         }
 
         filesToolbarView.openFileAction = { [weak self] data in
-            self?.presentDocumentViewer(url: data.url)
+            self?.presentDocumentViewer(file: data)
         }
     }
 
@@ -641,8 +641,8 @@ private extension ChatViewController {
         }
     }
 
-    func presentDocumentViewer(url: URL) {
-        viewModel.documentViewerService.openFile(url: url)
+    func presentDocumentViewer(file: FileResult) {
+        viewModel.documentViewerService.openFile(files: [file])
 
         let quickVC = QLPreviewController()
         quickVC.delegate = viewModel.documentViewerService

FilesPickerKit/Sources/FilesPickerKit/Pickers/DocumentInteractionService.swift

@@ -12,18 +12,17 @@ import WebKit
 import QuickLook
 
 public final class DocumentInteractionService: NSObject {
-    private var urls: [URL] = []
-    private var needToDelete = false
+    private var items: ItemsList = .default
+    private var itemsToBeRemoved: ItemsList = .default
 
     public func openFile(files: [FileResult]) {
-        self.urls = []
-        files.forEach { file in
-            let name = file.name ?? "UNKWNOW"
-            let ext = file.extenstion ?? ""
+        let urls = files.map { file in
+            let name = file.name ?? "Unknown"
+            let ext = file.extenstion
 
-            let fullName = name.contains(ext)
-            ? name
-            : "\(name).\(ext)"
+            let fullName = [name, ext]
+                .compactMap { $0 }
+                .joined(separator: ".")
 
             var copyURL = URL(fileURLWithPath: file.url.deletingLastPathComponent().path)
             copyURL.appendPathComponent(fullName)
@@ -38,41 +37,58 @@ public final class DocumentInteractionService: NSObject {
                 try? FileManager.default.copyItem(at: file.url, to: copyURL)
             }
 
-            self.urls.append(copyURL)
+            return copyURL
         }
 
-        needToDelete = true
-    }
-
-    public func openFile(url: URL) {
-        self.urls = [url]
-        needToDelete = false
+        items = .init(urls: urls)
     }
 }
 
 extension DocumentInteractionService: QLPreviewControllerDelegate, QLPreviewControllerDataSource {
     public func numberOfPreviewItems(in controller: QLPreviewController) -> Int {
-        urls.count
+        items.urls.count
     }
 
-    public func previewController(_ controller: QLPreviewController, previewItemAt index: Int) -> QLPreviewItem {
-        QLPreviewItemEq(url: urls[index])
+    public func previewController(
+        _ controller: QLPreviewController,
+        previewItemAt index: Int
+    ) -> QLPreviewItem {
+        QLPreviewItemEq(url: items.urls[safe: index])
     }
 
-    public func previewController(_: QLPreviewController, transitionViewFor _: QLPreviewItem) -> UIView? { .init() }
+    public func previewController(
+        _: QLPreviewController,
+        transitionViewFor _: QLPreviewItem
+    ) -> UIView? { .init() }
 
-    public func previewControllerDidDismiss(_ controller: QLPreviewController) {
-        guard needToDelete else { return }
-        urls.forEach { url in
-            try? FileManager.default.removeItem(at: url)
-        }
+    public func previewControllerWillDismiss(_: QLPreviewController) {
+        itemsToBeRemoved = items
+    }
+
+    public func previewControllerDidDismiss(_: QLPreviewController) {
+        // if new items presented before dismissing the previous ones: do not delete everything
+        // because some items could be presenting again
+        let urlToDelete = itemsToBeRemoved.id == items.id
+            ? items.urls
+            : Set(itemsToBeRemoved.urls).subtracting(.init(items.urls)).map { $0 }
+
+        urlToDelete.forEach { try? FileManager.default.removeItem(at: $0) }
     }
 }
 
-final class QLPreviewItemEq: NSObject, QLPreviewItem {
-    let previewItemURL: URL?
+private extension DocumentInteractionService {
+    struct ItemsList {
+        let id: UUID = .init()
+        let urls: [URL]
+
+        static let `default` = Self(urls: .init())
+    }
 
-    init(url: URL) {
-        previewItemURL = url
+    final class QLPreviewItemEq: NSObject, QLPreviewItem {
+        let previewItemURL: URL?
+
+        init(url: URL?) {
+            previewItemURL = url
+        }
     }
 }