Issue #162: Make sure, proof is generated before upload.

OpenArchive · Mar 9, 2023 · 9969b26 · 9969b26
1 parent 3dca000
commit 9969b26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Save/Preview/PreviewViewController.swift b/Save/Preview/PreviewViewController.swift
@@ -191,6 +191,13 @@ class PreviewViewController: UIViewController, UITableViewDelegate, UITableViewD
                 .iterateKeysAndObjects(inGroup: group) { collection, key, object, index, stop in
 
                     if let asset = object as? Asset {
+                        // ProofMode might have been switched on in between import and now,
+                        // or something inhibited proof generation, so make sure,
+                        // proof is generated before upload.
+                        // Proofing will set asset to un-ready, so upload will not start
+                        // before proof is done as asset is set to ready again.
+                        asset.generateProof()
+
                         let upload = Upload(order: order, asset: asset)
                         transaction.setObject(upload, forKey: upload.id, inCollection: Upload.collection)
                         order += 1

diff --git a/Shared/Models/Asset.swift b/Shared/Models/Asset.swift
@@ -644,8 +644,6 @@ class Asset: NSObject, Item, YapDatabaseRelationshipNode, Encodable {
         item.proofFolder = Files.base
         item.proofFilesBaseName = id
 
-        print("Generating proof into: \(item.proofFolder?.path ?? "(nil)")")
-
         Proof.shared.process(
             mediaItem: item,
             options: .init(showDeviceIds: true, showLocation: false, showMobileNetwork: false, notarizationProviders: []))