- [+] Bug: nach dem ersten scan wird das Dokument nicht richtig angezeigt

Julian Kahnert · Julian Kahnert · commit fd6021f6894f · 2021-01-17T21:55:54.000+01:00
- [+] Dokumenten name nicht immer lowercased
- [+] Scan (&amp; Share) quick Action
diff --git a/AppClip/MainContentViewModel.swift b/AppClip/MainContentViewModel.swift
@@ -18,8 +18,7 @@ final class MainContentViewModel: ObservableObject {
 
     var sharingViewModel = PDFSharingViewModel()
     var scanViewModel = ScanTabViewModel(imageConverter: imageConverter,
-                                         iapService: AppClipIAPService(),
-                                         documentsFinishedHandler: {})
+                                         iapService: AppClipIAPService())
     private var disposables = Set<AnyCancellable>()
 
     init() {
diff --git a/ArchiveCore/Sources/ArchiveBackend/ArchiveStore.swift b/ArchiveCore/Sources/ArchiveBackend/ArchiveStore.swift
@@ -281,9 +281,9 @@ public final class ArchiveStore: ObservableObject, ArchiveStoreAPI, Log {
         // Do "--" and "__" exist in filename?
         guard url.lastPathComponent.contains("--"),
             url.lastPathComponent.contains("__"),
-            !url.lastPathComponent.contains(Constants.documentDatePlaceholder),
-            !url.lastPathComponent.contains(Constants.documentDescriptionPlaceholder),
-            !url.lastPathComponent.contains(Constants.documentTagPlaceholder) else { return .untagged }
+            !url.lastPathComponent.lowercased().contains(Constants.documentDatePlaceholder.lowercased()),
+            !url.lastPathComponent.lowercased().contains(Constants.documentDescriptionPlaceholder.lowercased()),
+            !url.lastPathComponent.lowercased().contains(Constants.documentTagPlaceholder.lowercased()) else { return .untagged }
 
         return .tagged
     }
diff --git a/ArchiveCore/Sources/ArchiveBackend/Models/Document.swift b/ArchiveCore/Sources/ArchiveBackend/Models/Document.swift
@@ -145,18 +145,19 @@ public final class Document: ObservableObject, Identifiable, Codable, Log {
         return "\(dateStr)--\(specification)__\(tagStr).pdf"
     }
 
+    /// This function updates the properties of the document.
+    ///
+    /// Since it might run some time, this should not be run on the main thread.
     func updateProperties(with downloadStatus: FileChange.DownloadStatus, shouldParseDate: Bool) {
-        if Thread.isMainThread {
-            log.errorAndAssert("updateProperties() must not be called from the main thread.")
-        }
         filename = (try? path.resourceValues(forKeys: [.localizedNameKey]).localizedName) ?? self.path.lastPathComponent
 
         // parse the current filename and add finder file tags
         let parsedFilename = Document.parseFilename(self.filename)
+        let placeholderTag = Constants.documentTagPlaceholder.lowercased()
         let tags = Set(parsedFilename.tagNames ?? []).union(path.fileTags)
-            .filter { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && $0 != Constants.documentTagPlaceholder }
+            .filter { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && $0.lowercased() != placeholderTag }
 
-        DispatchQueue.main.sync {
+        let workItem = DispatchWorkItem {
             self.downloadStatus = downloadStatus
 
             // set the date
@@ -173,6 +174,12 @@ public final class Document: ObservableObject, Identifiable, Codable, Log {
             self.tags = tags
         }
 
+        if Thread.isMainThread {
+            workItem.perform()
+        } else {
+            DispatchQueue.main.sync(execute: workItem)
+        }
+
         guard downloadStatus == .local,
               shouldParseDate else { return }
         self.parseContent()
diff --git a/ArchiveCore/Sources/ArchiveBackend/PathManager/PathManager.swift b/ArchiveCore/Sources/ArchiveBackend/PathManager/PathManager.swift
@@ -80,7 +80,7 @@ public final class PathManager: Log {
     public func getArchiveUrl() throws -> URL {
         let archiveURL: URL
         if UserDefaults.standard.isInDemoMode {
-            archiveURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
+            archiveURL = fileManager.temporaryDirectory
         } else {
             archiveURL = try archivePathType.getArchiveUrl()
         }
diff --git a/ArchiveCore/Sources/ArchiveSharedConstants/Tab.swift b/ArchiveCore/Sources/ArchiveSharedConstants/Tab.swift
@@ -15,7 +15,17 @@ public enum Tab: String, CaseIterable, Identifiable, Hashable, Equatable {
     #endif
 
     public var id: String { rawValue }
-    public var name: String { rawValue.capitalized }
+    public var name: String {
+        if self == .scan {
+            #if os(macOS)
+            return "Import"
+            #else
+            return "Scan"
+            #endif
+        } else {
+            return rawValue.capitalized
+        }
+    }
     public var iconName: String {
         switch self {
             case .scan:
diff --git a/ArchiveCore/Sources/ArchiveViews/MainNavigationViewModel.swift b/ArchiveCore/Sources/ArchiveViews/MainNavigationViewModel.swift
@@ -5,7 +5,7 @@
 //  Created by Julian Kahnert on 30.10.19.
 //  Copyright © 2019 Julian Kahnert. All rights reserved.
 //
-// swiftlint:disable function_body_length
+// swiftlint:disable function_body_length type_body_length
 
 import ArchiveBackend
 import Combine
@@ -32,36 +32,20 @@ public final class MainNavigationViewModel: ObservableObject, Log {
     @Published var showTutorial = !UserDefaults.appGroup.tutorialShown
     @Published var sheetType: SheetType?
 
-    public let imageConverter = ImageConverter(getDocumentDestination: getDocumentDestination)
-
-    lazy var scanViewModel = ScanTabViewModel(imageConverter: imageConverter, iapService: Self.iapService, documentsFinishedHandler: Self.scanFinished)
+    public let imageConverter: ImageConverter
+    var scanViewModel: ScanTabViewModel
     let tagViewModel = TagTabViewModel()
     let archiveViewModel = ArchiveViewModel()
-    public private(set) lazy var moreViewModel = MoreTabViewModel(iapService: Self.iapService, archiveStore: Self.archiveStore)
+    public let moreViewModel = MoreTabViewModel(iapService: MainNavigationViewModel.iapService, archiveStore: MainNavigationViewModel.archiveStore)
 
     let iapViewModel = IAPViewModel(iapService: iapService)
 
     private var disposables = Set<AnyCancellable>()
 
-    @ViewBuilder
-    func getView(for sheetType: SheetType) -> some View {
-        switch sheetType {
-        case .iapView:
-            IAPView(viewModel: iapViewModel)
-        #if canImport(MessageUI)
-        case .supportView:
-            SupportMailView(subject: Self.mailSubject,
-                            recipients: Self.mailRecipients,
-                            errorHandler: { NotificationCenter.default.postAlert($0) })
-        #endif
-        #if !os(macOS)
-        case .activityView(let items):
-            AppActivityView(activityItems: items)
-        #endif
-        }
-    }
-
     public init() {
+        imageConverter = ImageConverter(getDocumentDestination: Self.getDocumentDestination)
+        scanViewModel = ScanTabViewModel(imageConverter: imageConverter, iapService: Self.iapService)
+
         NotificationCenter.default.alertPublisher()
             .receive(on: DispatchQueue.main)
             .assign(to: &$alertDataModel)
@@ -176,18 +160,39 @@ public final class MainNavigationViewModel: ObservableObject, Log {
             }
         }
 
-        #if !os(macOS)
         imageConverter.$processedDocumentUrl
-            .compactMap { [weak self] url in
-                guard let url = url,
-                      self?.scanViewModel.shareDocumentAfterScan ?? false else { return nil }
-
-                // show share sheet
-                return .activityView(items: [url])
+            .compactMap { $0 }
+            .sink { [weak self] url in
+                #if os(macOS)
+                Self.showFirstDocumentFinishedDialogIfNeeded()
+                #else
+                if let self = self,
+                   self.scanViewModel.shareDocumentAfterScan {
+                    self.showShareDialog(with: url)
+                } else {
+                    Self.showFirstDocumentFinishedDialogIfNeeded()
+                }
+                #endif
             }
-            .assign(to: &$sheetType)
+            .store(in: &disposables)
+    }
 
+    @ViewBuilder
+    func getView(for sheetType: SheetType) -> some View {
+        switch sheetType {
+        case .iapView:
+            IAPView(viewModel: iapViewModel)
+        #if canImport(MessageUI)
+        case .supportView:
+            SupportMailView(subject: Self.mailSubject,
+                            recipients: Self.mailRecipients,
+                            errorHandler: { NotificationCenter.default.postAlert($0) })
+        #endif
+        #if !os(macOS)
+        case .activityView(let items):
+            AppActivityView(activityItems: items)
         #endif
+        }
     }
 
     func handleTempFilesIfNeeded(_ scenePhase: ScenePhase) {
@@ -279,6 +284,16 @@ public final class MainNavigationViewModel: ObservableObject, Log {
                                                                            action: showSupport))
     }
 
+    #if !os(macOS)
+    public func showScan(shareAfterScan: Bool) {
+        withAnimation {
+            currentTab = .scan
+            scanViewModel.shareDocumentAfterScan = shareAfterScan
+            scanViewModel.startScanning()
+        }
+    }
+    #endif
+
     // MARK: - Delegate Functions
 
     private static func getDocumentDestination() -> URL? {
@@ -290,18 +305,9 @@ public final class MainNavigationViewModel: ObservableObject, Log {
         }
     }
 
-//    private func documentProcessingCompletionHandler(_ url: URL) {
-//        guard scanViewModel.shareDocumentAfterScan else { return }
-//
-//        #if !os(macOS)
-//        // show share sheet
-//        sheetType = .activityView(items: [url])
-//        #endif
-//    }
-
     // MARK: - Helper Functions
 
-    private static func scanFinished() {
+    private static func showFirstDocumentFinishedDialogIfNeeded() {
         guard !UserDefaults.appGroup.firstDocumentScanAlertPresented else { return }
         UserDefaults.appGroup.firstDocumentScanAlertPresented = true
 
@@ -321,11 +327,29 @@ public final class MainNavigationViewModel: ObservableObject, Log {
             try imageConverter.handle(url)
         } catch {
             log.error("Unable to handle file.", metadata: ["filetype": "\(url.pathExtension)", "error": "\(error)"])
-//            try? FileManager.default.removeItem(at: url)
+            try? FileManager.default.removeItem(at: url)
 
             NotificationCenter.default.postAlert(error)
         }
     }
+
+    #if !os(macOS)
+    private func showShareDialog(with url: URL) {
+        let formatter = DateFormatter()
+        formatter.locale = .autoupdatingCurrent
+        formatter.setLocalizedDateFormatFromTemplate("dd-MM-yyyy jmmssa")
+        let dateString = formatter.string(from: Date()).replacingOccurrences(of: ":", with: ".").replacingOccurrences(of: ",", with: "")
+        let filename = "PDF Archiver \(dateString).pdf"
+        let destination = FileManager.default.temporaryDirectory.appendingPathComponent(filename)
+        do {
+            try FileManager.default.copyItem(at: url, to: destination)
+
+            self.sheetType = .activityView(items: [destination])
+        } catch {
+            NotificationCenter.default.postAlert(error)
+        }
+    }
+    #endif
 }
 
 extension MainNavigationViewModel {
@@ -377,7 +401,7 @@ extension MainNavigationViewModel {
         service.recipients = Self.mailRecipients
         service.subject = Self.mailSubject
 
-        let url = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("Diagnostics-Report.html")
+        let url = FileManager.default.temporaryDirectory.appendingPathComponent("Diagnostics-Report.html")
 
         // remove previous report
         try? FileManager.default.removeItem(at: url)
diff --git a/ArchiveCore/Sources/ArchiveViews/ScanTab/ScanTabView.swift b/ArchiveCore/Sources/ArchiveViews/ScanTab/ScanTabView.swift
@@ -133,10 +133,7 @@ struct ScanTabView_Previews: PreviewProvider {
 
     static var previews: some View {
         // swiftlint:disable:next trailing_closure
-        ScanTabView(viewModel: ScanTabViewModel(imageConverter: ImageConverter(), iapService: MockIAPService(), documentsFinishedHandler: {
-            print("Scan completed!")
-
-        }))
+        ScanTabView(viewModel: ScanTabViewModel(imageConverter: ImageConverter(), iapService: MockIAPService()))
         .frame(maxWidth: .infinity)
         .padding()
     }
diff --git a/ArchiveCore/Sources/ArchiveViews/ScanTab/ScanTabViewModel.swift b/ArchiveCore/Sources/ArchiveViews/ScanTab/ScanTabViewModel.swift
@@ -36,15 +36,13 @@ public final class ScanTabViewModel: ObservableObject, DropDelegate, Log {
 
     private let imageConverter: ImageConverterAPI
     private let iapService: IAPServiceAPI
-    private let documentsFinishedHandler: () -> Void
 
     private var lastProgressValue: CGFloat?
     private var disposables = Set<AnyCancellable>()
 
-    public init(imageConverter: ImageConverterAPI, iapService: IAPServiceAPI, documentsFinishedHandler: @escaping () -> Void) {
+    public init(imageConverter: ImageConverterAPI, iapService: IAPServiceAPI) {
         self.imageConverter = imageConverter
         self.iapService = iapService
-        self.documentsFinishedHandler = documentsFinishedHandler
 
         // show the processing indicator, if documents are currently processed
         if imageConverter.totalDocumentCount.value != 0 {
@@ -59,11 +57,6 @@ public final class ScanTabViewModel: ObservableObject, DropDelegate, Log {
                 guard let self = self else { return }
                 let documentProgress = notification.object as? Float
                 self.updateProcessingIndicator(with: documentProgress)
-
-                guard documentProgress == nil else { return }
-
-                // there might be a better way for this inout workaround
-                self.documentsFinishedHandler()
             }
             .store(in: &disposables)
     }
diff --git a/ArchiveCore/Sources/ArchiveViews/TagTab/TagTabViewModel.swift b/ArchiveCore/Sources/ArchiveViews/TagTab/TagTabViewModel.swift
@@ -225,7 +225,7 @@ final class TagTabViewModel: ObservableObject, Log {
         guard let document = currentDocument else { return }
 
         document.date = date
-        document.specification = specification.slugified(withSeparator: "-")
+        document.specification = specification.slugified(withSeparator: "-").lowercased()
         document.tags = Set(documentTags.map { $0.slugified(withSeparator: "") })
 
         DispatchQueue.global(qos: .userInitiated).async {
diff --git a/ArchiveCore/Tests/ArchiveBackendTests/DeepDirectoryWatcherTests.swift b/ArchiveCore/Tests/ArchiveBackendTests/DeepDirectoryWatcherTests.swift
@@ -16,7 +16,7 @@ final class DeepDirectoryWatcherTests: XCTestCase {
 
     override func setUpWithError() throws {
         try super.setUpWithError()
-        tempDir = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(UUID().uuidString)
+        tempDir = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
 
         guard let tempDir = tempDir else {
             XCTFail("TempDir could not be created.")
diff --git a/ArchiveCore/Tests/ArchiveBackendTests/DocumentTests.swift b/ArchiveCore/Tests/ArchiveBackendTests/DocumentTests.swift
@@ -6,6 +6,7 @@
 //
 
 @testable import ArchiveBackend
+import ArchiveSharedConstants
 import XCTest
 
 final class DocumentTests: XCTestCase {
@@ -231,7 +232,6 @@ final class DocumentTests: XCTestCase {
     func testComparableWithSameUUID() {
 
         // setup
-        _ = UUID()
         let document1 = Document(path: URL(fileURLWithPath: "~/Downloads/2018-05-12--example-description__tag1_tag2.pdf"), taggingStatus: .tagged, downloadStatus: defaultDownloadStatus, byteSize: defaultSize)
         let document2 = Document(path: URL(fileURLWithPath: "~/Downloads/2018-05-12--example-description__tag1_tag2.pdf"), taggingStatus: .tagged, downloadStatus: defaultDownloadStatus, byteSize: defaultSize)
 
@@ -366,6 +366,18 @@ final class DocumentTests: XCTestCase {
         XCTAssertNil(tagNames)
     }
 
+    func testPlaceholder() {
+
+        // setup
+        let document = Document(path: URL(fileURLWithPath: "~/Downloads/2018-05-12--\(Constants.documentDescriptionPlaceholder)__\(Constants.documentTagPlaceholder).pdf"), taggingStatus: .untagged, downloadStatus: defaultDownloadStatus, byteSize: defaultSize)
+
+        document.updateProperties(with: .local, shouldParseDate: false)
+
+        // assert - placeholders must not be in the tags or specification
+        XCTAssertEqual(document.tags, [])
+        XCTAssertEqual(document.specification, "")
+    }
+
 //    func testDocumentRenamingPath() {
 //
 //        // setup
diff --git a/ArchiveCore/Tests/ArchiveBackendTests/PDFProcessingTests.swift b/ArchiveCore/Tests/ArchiveBackendTests/PDFProcessingTests.swift
@@ -12,7 +12,7 @@ import PDFKit
 import XCTest
 
 final class PDFProcessingTests: XCTestCase {
-    private static let tempFolder = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(UUID().uuidString)
+    private static let tempFolder = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
     private static let referenceDocument = PDFDocument(url: Bundle.billPDFUrl)!
 
     private let queue: OperationQueue = {
diff --git a/ArchiveCore/Tests/ArchiveBackendTests/PathManagerTests.swift b/ArchiveCore/Tests/ArchiveBackendTests/PathManagerTests.swift
@@ -12,7 +12,7 @@ import PDFKit
 import XCTest
 
 final class PathManagerTests: XCTestCase {
-    static let tempFolder = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(UUID().uuidString)
+    static let tempFolder = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
 
     override func setUpWithError() throws {
         try super.setUpWithError()
@@ -27,6 +27,7 @@ final class PathManagerTests: XCTestCase {
     #if os(macOS)
     func testArchiveChangeMacOS() throws {
         let currentArchiveFolder = Self.tempFolder.appendingPathComponent("CurrentArchive")
+        XCTAssertNoThrow(try FileManager.default.createDirectory(at: currentArchiveFolder, withIntermediateDirectories: true, attributes: nil))
         UserDefaults.appGroup.archivePathType = .local(currentArchiveFolder)
 
         let archiveUrl = try PathManager.shared.getArchiveUrl()
diff --git a/ArchiveCore/Tests/ArchiveSharedConstantsTests/FileManagerMoveTests.swift b/ArchiveCore/Tests/ArchiveSharedConstantsTests/FileManagerMoveTests.swift
@@ -46,7 +46,7 @@ final class FileManagerMoveTests: XCTestCase {
 
     override func setUpWithError() throws {
         try super.setUpWithError()
-        tempDir = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(UUID().uuidString)
+        tempDir = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
 
         let url = try XCTUnwrap(tempDir)
 
diff --git a/ArchiveCore/Tests/ArchiveSharedConstantsTests/FileManagerTests.swift b/ArchiveCore/Tests/ArchiveSharedConstantsTests/FileManagerTests.swift
diff --git a/PDFArchiver.xcodeproj/project.pbxproj b/PDFArchiver.xcodeproj/project.pbxproj
diff --git a/Shared/PDFArchiverApp.swift b/Shared/PDFArchiverApp.swift
diff --git a/Shared/Resources/Settings.bundle/Root.plist b/Shared/Resources/Settings.bundle/Root.plist
diff --git a/Shared/Resources/de.lproj/Localizable.strings b/Shared/Resources/de.lproj/Localizable.strings

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public final class PathManager: Log {`
`80`	`80`	`public func getArchiveUrl() throws -> URL {`
`81`	`81`	`let archiveURL: URL`
`82`	`82`	`if UserDefaults.standard.isInDemoMode {`
`83`		`- archiveURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)`
	`83`	`+ archiveURL = fileManager.temporaryDirectory`
`84`	`84`	`} else {`
`85`	`85`	`archiveURL = try archivePathType.getArchiveUrl()`
`86`	`86`	`}`