From 7fe3fc75c0231f6464f91fdd4cf8fe9507d1fe27 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 09:09:08 -0700
Subject: [PATCH 01/29] Dont show the cloud icon while page scraping is running

---
 .../Sources/Views/ShareExtensionView.swift           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
index 1fc6557ab..6678e7fe5 100644
--- a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
+++ b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
@@ -178,8 +178,10 @@ public struct ShareExtensionChildView: View {
 
   private var cloudIconColor: Color {
     switch viewModel.status {
-    case .saved, .processing:
+    case .saved:
       return .appGrayText
+    case .processing:
+      return .clear
     case .failed(error: _), .syncFailed(error: _):
       return .red
     case .synced:
@@ -188,12 +190,8 @@ public struct ShareExtensionChildView: View {
   }
 
   private func localImage(from: URL) -> Image? {
-    do {
-      if let data = try? Data(contentsOf: from), let img = UIImage(data: data) {
-        return Image(uiImage: img)
-      }
-    } catch {
-      return nil
+    if let data = try? Data(contentsOf: from), let img = UIImage(data: data) {
+      return Image(uiImage: img)
     }
     return nil
   }

From 85cbd4e9d0b45972769a16b840a6fc2c9fc9935d Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 10:44:23 -0700
Subject: [PATCH 02/29] Handle errors updating elastic when saving pages

---
 .../Sources/Views/SyncingIcon.swift           |  8 ++++
 packages/api/src/services/save_page.ts        | 39 ++++++++++++++-----
 2 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 apple/OmnivoreKit/Sources/Views/SyncingIcon.swift

diff --git a/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift b/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift
new file mode 100644
index 000000000..a234eb638
--- /dev/null
+++ b/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift
@@ -0,0 +1,8 @@
+//
+//  File.swift
+//  
+//
+//  Created by Jackson Harper on 6/5/22.
+//
+
+import Foundation
diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts
index f56f95884..4d7315a95 100644
--- a/packages/api/src/services/save_page.ts
+++ b/packages/api/src/services/save_page.ts
@@ -1,6 +1,11 @@
 import { PubsubClient } from '../datalayer/pubsub'
 import { homePageURL } from '../env'
-import { Maybe, SavePageInput, SaveResult } from '../generated/graphql'
+import {
+  Maybe,
+  SaveErrorCode,
+  SavePageInput,
+  SaveResult,
+} from '../generated/graphql'
 import { DataModels } from '../resolvers/types'
 import { generateSlug, stringToHash, validatedDate } from '../utils/helpers'
 import { parsePreparedContent } from '../utils/parser'
@@ -102,14 +107,22 @@ export const savePage = async (
     state: ArticleSavingRequestStatus.Succeeded,
   })
   if (existingPage) {
-    await updatePage(
-      existingPage.id,
-      {
-        savedAt: new Date(),
-        archivedAt: undefined,
-      },
-      ctx
-    )
+    if (
+      !(await updatePage(
+        existingPage.id,
+        {
+          savedAt: new Date(),
+          archivedAt: undefined,
+        },
+        ctx
+      ))
+    ) {
+      console.log('FAILED TO UPDATE EXISTING PAGE WITH', input)
+      return {
+        errorCodes: [SaveErrorCode.Unknown],
+        message: 'Failed to update existing page',
+      }
+    }
     input.clientRequestId = existingPage.id
   } else if (shouldParseInBackend(input)) {
     await createPageSaveRequest(
@@ -120,7 +133,13 @@ export const savePage = async (
       input.clientRequestId
     )
   } else {
-    await createPage(articleToSave, ctx)
+    if (!(await createPage(articleToSave, ctx))) {
+      console.log('FAILED TO CREATE PAGE WITH INPUT', input)
+      return {
+        errorCodes: [SaveErrorCode.Unknown],
+        message: 'Failed to create new page',
+      }
+    }
   }
 
   return {

From 0efbfe6f139cde4a3c0a5eff3f534e50969ca7c0 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 11:10:21 -0700
Subject: [PATCH 03/29] Better variable name

---
 apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
index 6678e7fe5..afa165acc 100644
--- a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
+++ b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
@@ -189,8 +189,8 @@ public struct ShareExtensionChildView: View {
     }
   }
 
-  private func localImage(from: URL) -> Image? {
-    if let data = try? Data(contentsOf: from), let img = UIImage(data: data) {
+  private func localImage(from url: URL) -> Image? {
+    if let data = try? Data(contentsOf: url), let img = UIImage(data: data) {
       return Image(uiImage: img)
     }
     return nil

From 9baeb89742654eac39e5bf52d137b209c6f57e39 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 11:47:43 -0700
Subject: [PATCH 04/29] Add more elastic debugging

---
 packages/api/src/elastic/pages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/src/elastic/pages.ts b/packages/api/src/elastic/pages.ts
index 4640c9747..0f0e69f74 100644
--- a/packages/api/src/elastic/pages.ts
+++ b/packages/api/src/elastic/pages.ts
@@ -188,7 +188,7 @@ export const createPage = async (
 
     return body._id as string
   } catch (e) {
-    console.error('failed to create a page in elastic', e)
+    console.error('failed to create a page in elastic', JSON.stringify(e))
     return undefined
   }
 }

From bf2c0d6b6622ac588a36907cce0a8d4f2bced54c Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 11:53:11 -0700
Subject: [PATCH 05/29] WIP ios syncing improvements

---
 .../DataService/Mutations/SavePage.swift      | 14 ++++--
 .../Services/DataService/OfflineSync.swift    | 23 ++--------
 .../Queries/ArticleContentQuery.swift         |  1 +
 .../Sources/Views/FeedItem/GridCard.swift     |  4 ++
 .../Views/FeedItem/HomeFeedCardView.swift     |  3 +-
 .../Sources/Views/SyncingIcon.swift           | 44 ++++++++++++++++++-
 6 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePage.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePage.swift
index 57c2b3e79..f8b427b37 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePage.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePage.swift
@@ -3,7 +3,7 @@ import Models
 import SwiftGraphQL
 
 public extension DataService {
-  func savePage(id: String, url: String, title: String, originalHtml: String) async throws {
+  func savePage(id: String, url: String, title: String, originalHtml: String) async throws -> String? {
     enum MutationResult {
       case saved(requestId: String, url: String)
       case error(errorCode: Enums.SaveErrorCode)
@@ -20,7 +20,13 @@ public extension DataService {
     let selection = Selection<MutationResult, Unions.SaveResult> {
       try $0.on(
         saveError: .init { .error(errorCode: (try? $0.errorCodes().first) ?? .unknown) },
-        saveSuccess: .init { .saved(requestId: id, url: (try? $0.url()) ?? "") }
+        saveSuccess: .init {
+          if let requestId = try? $0.clientRequestId(), let url = try? $0.url() {
+            return .saved(requestId: requestId, url: url)
+          } else {
+            return .error(errorCode: .unknown)
+          }
+        }
       )
     }
 
@@ -42,8 +48,8 @@ public extension DataService {
             return
           }
           switch payload.data {
-          case .saved:
-            continuation.resume()
+          case let .saved(requestId: requestId, url: _):
+            continuation.resume(returning: requestId)
           case let .error(errorCode: errorCode):
             switch errorCode {
             case .unauthorized:
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index 4950b7c9d..d92ce1631 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -69,12 +69,14 @@ public extension DataService {
 
   func syncPage(id: String, originalHtml: String, title: String?, url: String) async throws {
     do {
-      try await savePage(id: id, url: url, title: title ?? url, originalHtml: originalHtml)
+      let newId = try await savePage(id: id, url: url, title: title ?? url, originalHtml: originalHtml)
+      print("NEW ID FOR ITEM", newId, "FROM OLD ID", id)
       try await updateLinkedItemStatus(id: id, status: .isNSync)
       try backgroundContext.performAndWait {
         try backgroundContext.save()
       }
     } catch {
+      print("ERROR SYNCING PAGE", error)
       backgroundContext.performAndWait {
         backgroundContext.rollback()
       }
@@ -186,23 +188,4 @@ public extension DataService {
       }
     }
   }
-
-  @objc
-  func locallyCreatedItemSynced(notification: NSNotification) {
-    print("SYNCED LOCALLY CREATED ITEM", notification)
-    if let objectId = notification.userInfo?["objectID"] as? String {
-      do {
-        try backgroundContext.performAndWait {
-          let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
-          fetchRequest.predicate = NSPredicate(format: "id == %@", objectId)
-          if let existingItem = try? self.backgroundContext.fetch(fetchRequest).first {
-            existingItem.serverSyncStatus = Int64(ServerSyncStatus.isNSync.rawValue)
-            try self.backgroundContext.save()
-          }
-        }
-      } catch {
-        print("ERROR", error)
-      }
-    }
-  }
 }
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index 89da84ecd..85fe53a79 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -332,6 +332,7 @@ extension DataService {
       serverSyncStatus = linkedItem.serverSyncStatus
     }
 
+    print("SERVER SYNC STATUS FOR LOADING ITEM", serverSyncStatus)
     if let id = id, let url = url, let title = title,
        let serverSyncStatus = serverSyncStatus,
        serverSyncStatus != ServerSyncStatus.isNSync.rawValue
diff --git a/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift b/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift
index fff4cc6d1..bb736984f 100644
--- a/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift
+++ b/apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift
@@ -161,6 +161,10 @@ public struct GridCard: View {
             }
             .onTapGesture { tapHandler() }
           }
+
+          if let status = item.serverSyncStatus, status != ServerSyncStatus.isNSync.rawValue {
+            SyncStatusIcon(status: ServerSyncStatus(rawValue: Int(status)) ?? ServerSyncStatus.isNSync)
+          }
         }
         .padding(.horizontal, 0)
         .padding(.top, 0)
diff --git a/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift b/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
index 1a39ef7f7..fa62c73fa 100644
--- a/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
+++ b/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
@@ -66,7 +66,7 @@ public struct FeedCard: View {
         }
       }
 
-      if item.sortedLabels.count > 0 {
+      if item.hasLabels {
         // Category Labels
         ScrollView(.horizontal, showsIndicators: false) {
           HStack {
@@ -93,5 +93,6 @@ public struct FeedCard: View {
       maxHeight: nil,
       alignment: .topLeading
     )
+    .overlay(SyncStatusIcon(status: ServerSyncStatus(rawValue: Int(item.serverSyncStatus)) ?? ServerSyncStatus.isNSync), alignment: .bottomTrailing)
   }
 }
diff --git a/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift b/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift
index a234eb638..de0dda106 100644
--- a/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift
+++ b/apple/OmnivoreKit/Sources/Views/SyncingIcon.swift
@@ -1,8 +1,50 @@
 //
 //  File.swift
-//  
+//
 //
 //  Created by Jackson Harper on 6/5/22.
 //
 
 import Foundation
+import Models
+import SwiftUI
+import Utils
+
+public struct SyncStatusIcon: View {
+  let status: ServerSyncStatus
+
+  init(status: ServerSyncStatus) {
+    self.status = status
+  }
+
+  private var cloudIconName: String {
+    switch status {
+//    case .isNSync:
+//      return "checkmark.icloud"
+    case .isNSync:
+      return "exclamationmark.icloud"
+    case .isSyncing, .needsCreation, .needsDeletion, .needsUpdate:
+      return "icloud"
+    }
+  }
+
+  private var cloudIconColor: Color {
+    switch status {
+//    case .isNSync:
+//      return .blue
+    case .isNSync:
+      return .red
+    case .isSyncing, .needsCreation, .needsDeletion, .needsUpdate:
+      return .appGrayText
+    }
+  }
+
+  public var body: some View {
+    Image(systemName: cloudIconName)
+      .resizable()
+      .aspectRatio(contentMode: .fill)
+      .frame(width: 12, height: 12, alignment: .trailing)
+      .foregroundColor(cloudIconColor)
+      .padding(EdgeInsets(top: 0, leading: 0, bottom: 8, trailing: 8))
+  }
+}

From b107a86ba9c5cd05256c4fe3a4a07c6c95a639cf Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 12:43:10 -0700
Subject: [PATCH 06/29] Handle response ids when saving items

This will be used when handling pages that change their IDs
when saved.
---
 .../DataService/Mutations/SavePDF.swift       | 15 +++++++++-----
 .../DataService/Mutations/SaveUrl.swift       | 14 +++++++++----
 .../Services/DataService/OfflineSync.swift    | 20 ++++++++++++-------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
index 22017a74d..43cd10ef6 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
@@ -110,8 +110,7 @@ public extension DataService {
     }
   }
 
-  // swiftlint:disable:next line_length
-  func saveFilePublisher(requestId: String, uploadFileId: String, url: String) async throws {
+  func saveFilePublisher(requestId: String, uploadFileId: String, url: String) async throws -> String? {
     enum MutationResult {
       case saved(requestId: String, url: String)
       case error(errorCode: Enums.SaveErrorCode)
@@ -127,7 +126,13 @@ public extension DataService {
     let selection = Selection<MutationResult, Unions.SaveResult> {
       try $0.on(
         saveError: .init { .error(errorCode: (try? $0.errorCodes().first) ?? .unknown) },
-        saveSuccess: .init { .saved(requestId: requestId, url: (try? $0.url()) ?? "") }
+        saveSuccess: .init {
+          if let requestId = try? $0.clientRequestId(), let url = try? $0.url() {
+            return .saved(requestId: requestId, url: url)
+          } else {
+            return .error(errorCode: .unknown)
+          }
+        }
       )
     }
 
@@ -148,8 +153,8 @@ public extension DataService {
           }
 
           switch payload.data {
-          case .saved:
-            continuation.resume()
+          case let .saved(requestId: requestId, url: _):
+            continuation.resume(returning: requestId)
           case let .error(errorCode: errorCode):
             switch errorCode {
             case .unauthorized:
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SaveUrl.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SaveUrl.swift
index 34ac0ddf3..ade5c1f5d 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SaveUrl.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SaveUrl.swift
@@ -3,7 +3,7 @@ import Models
 import SwiftGraphQL
 
 public extension DataService {
-  func saveURL(id: String, url: String) async throws {
+  func saveURL(id: String, url: String) async throws -> String? {
     enum MutationResult {
       case saved(requestId: String, url: String)
       case error(errorCode: Enums.SaveErrorCode)
@@ -18,7 +18,13 @@ public extension DataService {
     let selection = Selection<MutationResult, Unions.SaveResult> {
       try $0.on(
         saveError: .init { .error(errorCode: (try? $0.errorCodes().first) ?? .unknown) },
-        saveSuccess: .init { .saved(requestId: id, url: (try? $0.url()) ?? "") }
+        saveSuccess: .init {
+          if let requestId = try? $0.clientRequestId(), let url = try? $0.url() {
+            return .saved(requestId: requestId, url: url)
+          } else {
+            return .error(errorCode: .unknown)
+          }
+        }
       )
     }
 
@@ -41,8 +47,8 @@ public extension DataService {
           }
 
           switch payload.data {
-          case .saved:
-            continuation.resume()
+          case let .saved(requestId: requestId, url: _):
+            continuation.resume(returning: requestId)
           case let .error(errorCode: errorCode):
             switch errorCode {
             case .unauthorized:
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index d92ce1631..b3b74e7b0 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -35,18 +35,22 @@ public extension DataService {
     }
   }
 
-  private func updateLinkedItemStatus(id: String, status: ServerSyncStatus) async throws {
+  private func updateLinkedItemStatus(id: String, newId _: String?, status: ServerSyncStatus) async throws {
     try backgroundContext.performAndWait {
       let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
       fetchRequest.predicate = NSPredicate(format: "id == %@", id)
 
       guard let linkedItem = (try? backgroundContext.fetch(fetchRequest))?.first else { return }
+      // TODO: handle item id changes
+      // linkedItem.id =
       linkedItem.serverSyncStatus = Int64(status.rawValue)
     }
   }
 
   func syncPdf(id: String, localPdfURL: URL, url: String) async throws {
     do {
+      try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
+
       let uploadRequest = try await uploadFileRequest(id: id, url: url)
       if let urlString = uploadRequest.urlString, let uploadUrl = URL(string: urlString) {
         try await uploadFile(id: id, localPdfURL: localPdfURL, url: uploadUrl)
@@ -55,7 +59,7 @@ public extension DataService {
         throw SaveArticleError.badData
       }
 
-      try await updateLinkedItemStatus(id: id, status: .isNSync)
+      try await updateLinkedItemStatus(id: id, newId: nil, status: .isNSync)
       try backgroundContext.performAndWait {
         try backgroundContext.save()
       }
@@ -69,14 +73,14 @@ public extension DataService {
 
   func syncPage(id: String, originalHtml: String, title: String?, url: String) async throws {
     do {
+      try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
+
       let newId = try await savePage(id: id, url: url, title: title ?? url, originalHtml: originalHtml)
-      print("NEW ID FOR ITEM", newId, "FROM OLD ID", id)
-      try await updateLinkedItemStatus(id: id, status: .isNSync)
+      try await updateLinkedItemStatus(id: id, newId: newId, status: .isNSync)
       try backgroundContext.performAndWait {
         try backgroundContext.save()
       }
     } catch {
-      print("ERROR SYNCING PAGE", error)
       backgroundContext.performAndWait {
         backgroundContext.rollback()
       }
@@ -86,8 +90,10 @@ public extension DataService {
 
   func syncUrl(id: String, url: String) async throws {
     do {
-      try await updateLinkedItemStatus(id: id, status: .isSyncing)
-      try await saveURL(id: id, url: url)
+      try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
+
+      let newId = try await saveURL(id: id, url: url)
+      try await updateLinkedItemStatus(id: id, newId: newId, status: .isNSync)
       try backgroundContext.performAndWait {
         try backgroundContext.save()
       }

From 3136705a75953b3ab6d9f0f23707f66600d5aea6 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Sun, 5 Jun 2022 12:50:05 -0700
Subject: [PATCH 07/29] Handle errors when creating a page save request on
 savePage

---
 packages/api/src/services/save_page.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts
index 4d7315a95..a973ecf23 100644
--- a/packages/api/src/services/save_page.ts
+++ b/packages/api/src/services/save_page.ts
@@ -117,7 +117,6 @@ export const savePage = async (
         ctx
       ))
     ) {
-      console.log('FAILED TO UPDATE EXISTING PAGE WITH', input)
       return {
         errorCodes: [SaveErrorCode.Unknown],
         message: 'Failed to update existing page',
@@ -125,16 +124,22 @@ export const savePage = async (
     }
     input.clientRequestId = existingPage.id
   } else if (shouldParseInBackend(input)) {
-    await createPageSaveRequest(
-      saver.userId,
-      input.url,
-      ctx.models,
-      ctx.pubsub,
-      input.clientRequestId
-    )
+    try {
+      await createPageSaveRequest(
+        saver.userId,
+        input.url,
+        ctx.models,
+        ctx.pubsub,
+        input.clientRequestId
+      )
+    } catch (e) {
+      return {
+        errorCodes: [SaveErrorCode.Unknown],
+        message: 'Failed to create page save request',
+      }
+    }
   } else {
     if (!(await createPage(articleToSave, ctx))) {
-      console.log('FAILED TO CREATE PAGE WITH INPUT', input)
       return {
         errorCodes: [SaveErrorCode.Unknown],
         message: 'Failed to create new page',

From 8d271daf38a139eeb9ee789024befe0ef9dc36ad Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Jun 2022 12:35:44 -0700
Subject: [PATCH 08/29] Only attempt to force sync content if it needs creation
 before reading

---
 .../Services/DataService/Queries/ArticleContentQuery.swift      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index 85fe53a79..d612aa82e 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -335,7 +335,7 @@ extension DataService {
     print("SERVER SYNC STATUS FOR LOADING ITEM", serverSyncStatus)
     if let id = id, let url = url, let title = title,
        let serverSyncStatus = serverSyncStatus,
-       serverSyncStatus != ServerSyncStatus.isNSync.rawValue
+       serverSyncStatus == ServerSyncStatus.needsCreation.rawValue
     {
       do {
         if let originalHtml = originalHtml {

From 754db717ccb52c2fd31274f2819edb4767a1bc09 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Jun 2022 12:36:07 -0700
Subject: [PATCH 09/29] Used savedat instead of createdat for sort descriptors

---
 apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift b/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift
index ba0919203..0c5efd1fa 100644
--- a/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift
+++ b/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift
@@ -42,9 +42,9 @@ public extension LinkedItemSort {
   var sortDescriptors: [NSSortDescriptor] {
     switch self {
     case .newest /* , .relevance */:
-      return [NSSortDescriptor(keyPath: \LinkedItem.createdAt, ascending: false)]
+      return [NSSortDescriptor(keyPath: \LinkedItem.savedAt, ascending: false)]
     case .oldest:
-      return [NSSortDescriptor(keyPath: \LinkedItem.createdAt, ascending: true)]
+      return [NSSortDescriptor(keyPath: \LinkedItem.savedAt, ascending: true)]
 //    case .recentlyRead:
 //      return [NSSortDescriptor(keyPath: \LinkedItem.updatedAt, ascending: false)]
     case .recentlyPublished:

From 311c5172cc7720254422c40c0a2c777c1a0d44d4 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Jun 2022 22:30:01 -0700
Subject: [PATCH 10/29] Status is moved to the child view model now

---
 .../App/AppExtensions/Share/ShareExtensionScene.swift | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
index a5ea021e1..8e28686a9 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
@@ -22,7 +22,6 @@ public extension PlatformViewController {
 
 public class ShareExtensionViewModel: ObservableObject {
   @Published var title: String?
-  @Published var status: ShareExtensionStatus = .processing
   @Published var debugText: String?
 
   let saveService = ExtensionSaveService()
@@ -42,13 +41,9 @@ public class ShareExtensionViewModel: ObservableObject {
     if let extensionContext = extensionContext {
       saveService.save(extensionContext, requestId: requestId, shareExtensionViewModel: shareExtensionViewModel)
     } else {
-      updateStatus(.failed(error: .unknown(description: "Internal Error")))
-    }
-  }
-
-  private func updateStatus(_ newStatus: ShareExtensionStatus) {
-    DispatchQueue.main.async {
-      self.status = newStatus
+      DispatchQueue.main.async {
+        shareExtensionViewModel.status = .failed(error: .unknown(description: "Internal Error"))
+      }
     }
   }
 }

From 5315d1a4ace328bc82726a210d1a7ce03b29789a Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Jun 2022 22:30:29 -0700
Subject: [PATCH 11/29] Update link item IDs if they are changed

---
 .../Sources/Services/DataService/OfflineSync.swift       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index b3b74e7b0..53574fa37 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -35,14 +35,15 @@ public extension DataService {
     }
   }
 
-  private func updateLinkedItemStatus(id: String, newId _: String?, status: ServerSyncStatus) async throws {
-    try backgroundContext.performAndWait {
+  private func updateLinkedItemStatus(id: String, newId: String?, status: ServerSyncStatus) async throws {
+    backgroundContext.performAndWait {
       let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
       fetchRequest.predicate = NSPredicate(format: "id == %@", id)
 
       guard let linkedItem = (try? backgroundContext.fetch(fetchRequest))?.first else { return }
-      // TODO: handle item id changes
-      // linkedItem.id =
+      if let newId = newId {
+        linkedItem.id = newId
+      }
       linkedItem.serverSyncStatus = Int64(status.rawValue)
     }
   }

From 9ab2f1c991f0aba4734b30c03dc3320ab46b4be8 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Jun 2022 22:49:17 -0700
Subject: [PATCH 12/29] Remove sync status button until we have failures

---
 apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift b/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
index fa62c73fa..f7515393c 100644
--- a/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
+++ b/apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
@@ -93,6 +93,5 @@ public struct FeedCard: View {
       maxHeight: nil,
       alignment: .topLeading
     )
-    .overlay(SyncStatusIcon(status: ServerSyncStatus(rawValue: Int(item.serverSyncStatus)) ?? ServerSyncStatus.isNSync), alignment: .bottomTrailing)
   }
 }

From 9e88a11ddabaa37a1800aab881b93c491e8fa909 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Mon, 6 Jun 2022 22:49:49 -0700
Subject: [PATCH 13/29] Enable Read Now, handle scenarios where an article is
 already saved so the LinkedItem.id is updated

---
 .../Share/ExtensionSaveService.swift          | 42 +++++++++++--------
 .../Share/ShareExtensionScene.swift           |  7 ++--
 .../Services/DataService/OfflineSync.swift    |  6 ++-
 .../Sources/Views/ShareExtensionView.swift    | 22 +++++-----
 4 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
index c3c7faf3c..1350d936a 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
@@ -18,7 +18,7 @@ class ExtensionSaveService {
     self.queue = OperationQueue()
   }
 
-  private func queueSaveOperation(_ pageScrape: PageScrapePayload, requestId: String, shareExtensionViewModel: ShareExtensionChildViewModel) {
+  private func queueSaveOperation(_ pageScrape: PageScrapePayload, shareExtensionViewModel: ShareExtensionChildViewModel) {
     ProcessInfo().performExpiringActivity(withReason: "app.omnivore.SaveActivity") { [self] expiring in
       guard !expiring else {
         self.queue.cancelAllOperations()
@@ -26,14 +26,14 @@ class ExtensionSaveService {
         return
       }
 
-      let operation = SaveOperation(pageScrapePayload: pageScrape, requestId: requestId, shareExtensionViewModel: shareExtensionViewModel)
+      let operation = SaveOperation(pageScrapePayload: pageScrape, shareExtensionViewModel: shareExtensionViewModel)
 
       self.queue.addOperation(operation)
       self.queue.waitUntilAllOperationsAreFinished()
     }
   }
 
-  public func save(_ extensionContext: NSExtensionContext, requestId: String, shareExtensionViewModel: ShareExtensionChildViewModel) {
+  public func save(_ extensionContext: NSExtensionContext, shareExtensionViewModel: ShareExtensionChildViewModel) {
     PageScraper.scrape(extensionContext: extensionContext) { [weak self] result in
       guard let self = self else { return }
 
@@ -68,8 +68,8 @@ class ExtensionSaveService {
             }
           }
         }
-        self.queueSaveOperation(payload, requestId: requestId, shareExtensionViewModel: shareExtensionViewModel)
-      case let .failure:
+        self.queueSaveOperation(payload, shareExtensionViewModel: shareExtensionViewModel)
+      case .failure:
         DispatchQueue.main.async {
           shareExtensionViewModel.status = .failed(error: .unknown(description: "Could not retrieve content"))
         }
@@ -78,7 +78,6 @@ class ExtensionSaveService {
   }
 
   class SaveOperation: Operation, URLSessionDelegate {
-    let requestId: String
     let services: Services
     let pageScrapePayload: PageScrapePayload
     let shareExtensionViewModel: ShareExtensionChildViewModel
@@ -92,9 +91,8 @@ class ExtensionSaveService {
       case finished
     }
 
-    init(pageScrapePayload: PageScrapePayload, requestId: String, shareExtensionViewModel: ShareExtensionChildViewModel) {
+    init(pageScrapePayload: PageScrapePayload, shareExtensionViewModel: ShareExtensionChildViewModel) {
       self.pageScrapePayload = pageScrapePayload
-      self.requestId = requestId
       self.shareExtensionViewModel = shareExtensionViewModel
 
       self.state = .created
@@ -138,7 +136,7 @@ class ExtensionSaveService {
       queue = OperationQueue()
 
       Task {
-        await persist(services: self.services, pageScrapePayload: self.pageScrapePayload, requestId: self.requestId)
+        await persist(services: self.services, pageScrapePayload: self.pageScrapePayload)
       }
     }
 
@@ -146,38 +144,48 @@ class ExtensionSaveService {
       super.cancel()
     }
 
-    private func updateStatus(newStatus: ShareExtensionStatus) {
+    private func updateStatus(_ requestId: String?, newStatus: ShareExtensionStatus) {
       DispatchQueue.main.async {
         self.shareExtensionViewModel.status = newStatus
+        if let requestId = requestId {
+          self.shareExtensionViewModel.requestId = requestId
+        }
       }
     }
 
-    private func persist(services: Services, pageScrapePayload: PageScrapePayload, requestId: String) async {
+    private func persist(services: Services, pageScrapePayload: PageScrapePayload) async {
+      var requestId = shareExtensionViewModel.requestId
+
       do {
         try await services.dataService.persistPageScrapePayload(pageScrapePayload, requestId: requestId)
       } catch {
-        updateStatus(newStatus: .failed(error: SaveArticleError.unknown(description: "Unable to access content")))
+        updateStatus(nil, newStatus: .failed(error: SaveArticleError.unknown(description: "Unable to access content")))
         return
       }
 
       do {
-        updateStatus(newStatus: .saved)
+        updateStatus(requestId, newStatus: .saved)
 
         switch pageScrapePayload.contentType {
         case .none:
-          try await services.dataService.syncUrl(id: requestId, url: pageScrapePayload.url)
+          requestId = try await services.dataService.syncUrl(id: requestId, url: pageScrapePayload.url)
         case let .pdf(localUrl):
           try await services.dataService.syncPdf(id: requestId, localPdfURL: localUrl, url: pageScrapePayload.url)
         case let .html(html, title, _):
-          try await services.dataService.syncPage(id: requestId, originalHtml: html, title: title, url: pageScrapePayload.url)
+          requestId = try await services.dataService.syncPage(
+            id: requestId,
+            originalHtml: html,
+            title: title,
+            url: pageScrapePayload.url
+          )
         }
 
       } catch {
-        updateStatus(newStatus: .syncFailed(error: SaveArticleError.unknown(description: "Unknown Error")))
+        updateStatus(nil, newStatus: .syncFailed(error: SaveArticleError.unknown(description: "Unknown Error")))
         return
       }
 
-      updateStatus(newStatus: .synced)
+      updateStatus(requestId, newStatus: .synced)
       state = .finished
     }
   }
diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
index 8e28686a9..467d158f7 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
@@ -25,9 +25,8 @@ public class ShareExtensionViewModel: ObservableObject {
   @Published var debugText: String?
 
   let saveService = ExtensionSaveService()
-  let requestId = UUID().uuidString.lowercased()
 
-  func handleReadNowAction(extensionContext: NSExtensionContext?) {
+  func handleReadNowAction(requestId: String, extensionContext: NSExtensionContext?) {
     #if os(iOS)
       if let application = UIApplication.value(forKeyPath: #keyPath(UIApplication.shared)) as? UIApplication {
         let deepLinkUrl = NSURL(string: "omnivore://shareExtensionRequestID/\(requestId)")
@@ -39,7 +38,7 @@ public class ShareExtensionViewModel: ObservableObject {
 
   func savePage(extensionContext: NSExtensionContext?, shareExtensionViewModel: ShareExtensionChildViewModel) {
     if let extensionContext = extensionContext {
-      saveService.save(extensionContext, requestId: requestId, shareExtensionViewModel: shareExtensionViewModel)
+      saveService.save(extensionContext, shareExtensionViewModel: shareExtensionViewModel)
     } else {
       DispatchQueue.main.async {
         shareExtensionViewModel.status = .failed(error: .unknown(description: "Internal Error"))
@@ -57,7 +56,7 @@ struct ShareExtensionView: View {
     ShareExtensionChildView(
       viewModel: childViewModel,
       onAppearAction: { viewModel.savePage(extensionContext: extensionContext, shareExtensionViewModel: childViewModel) },
-      readNowButtonAction: { viewModel.handleReadNowAction(extensionContext: extensionContext) },
+      readNowButtonAction: { viewModel.handleReadNowAction(requestId: $0, extensionContext: extensionContext) },
       dismissButtonTappedAction: { _, _ in
         extensionContext?.completeRequest(returningItems: [], completionHandler: nil)
       }
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index 53574fa37..8a9239957 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -72,7 +72,7 @@ public extension DataService {
     }
   }
 
-  func syncPage(id: String, originalHtml: String, title: String?, url: String) async throws {
+  func syncPage(id: String, originalHtml: String, title: String?, url: String) async throws -> String {
     do {
       try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
 
@@ -81,6 +81,7 @@ public extension DataService {
       try backgroundContext.performAndWait {
         try backgroundContext.save()
       }
+      return newId ?? id
     } catch {
       backgroundContext.performAndWait {
         backgroundContext.rollback()
@@ -89,7 +90,7 @@ public extension DataService {
     }
   }
 
-  func syncUrl(id: String, url: String) async throws {
+  func syncUrl(id: String, url: String) async throws -> String {
     do {
       try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
 
@@ -98,6 +99,7 @@ public extension DataService {
       try backgroundContext.performAndWait {
         try backgroundContext.save()
       }
+      return newId ?? id
     } catch {
       backgroundContext.performAndWait {
         backgroundContext.rollback()
diff --git a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
index afa165acc..8d6f4774d 100644
--- a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
+++ b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift
@@ -7,8 +7,11 @@ public class ShareExtensionChildViewModel: ObservableObject {
   @Published public var title: String?
   @Published public var url: String?
   @Published public var iconURL: String?
+  @Published public var requestId: String
 
-  public init() {}
+  public init() {
+    self.requestId = UUID().uuidString.lowercased()
+  }
 }
 
 public enum ShareExtensionStatus {
@@ -126,7 +129,7 @@ struct CheckmarkButtonView: View {
 public struct ShareExtensionChildView: View {
   let viewModel: ShareExtensionChildViewModel
   let onAppearAction: () -> Void
-  let readNowButtonAction: () -> Void
+  let readNowButtonAction: (String) -> Void
   let dismissButtonTappedAction: (ReminderTime?, Bool) -> Void
 
   @State var reminderTime: ReminderTime?
@@ -135,7 +138,7 @@ public struct ShareExtensionChildView: View {
   public init(
     viewModel: ShareExtensionChildViewModel,
     onAppearAction: @escaping () -> Void,
-    readNowButtonAction: @escaping () -> Void,
+    readNowButtonAction: @escaping (String) -> Void,
     dismissButtonTappedAction: @escaping (ReminderTime?, Bool) -> Void
   ) {
     self.viewModel = viewModel
@@ -281,13 +284,12 @@ public struct ShareExtensionChildView: View {
       Spacer()
 
       HStack {
-        if FeatureFlag.enableReadNow {
-          Button(
-            action: { readNowButtonAction() },
-            label: { Text("Read Now").frame(maxWidth: .infinity) }
-          )
-          .buttonStyle(RoundedRectButtonStyle())
-        }
+        Button(
+          action: { readNowButtonAction(self.viewModel.requestId) },
+          label: { Text("Read Now").frame(maxWidth: .infinity) }
+        )
+        .buttonStyle(RoundedRectButtonStyle())
+
         Button(
           action: {
             dismissButtonTappedAction(reminderTime, hideUntilReminded)

From 8460ba1cea08894eeeb4c8c9cbd8650d3dbd35c4 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Tue, 7 Jun 2022 07:59:28 -0700
Subject: [PATCH 14/29] pop read now link when archiving or deleting from
 reader

---
 .../Sources/App/Views/WebReader/WebReaderContainer.swift        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
index f984ad1d8..6031bd02f 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
@@ -89,6 +89,7 @@ import WebKit
               Button(
                 action: {
                   dataService.archiveLink(objectID: item.objectID, archived: !item.isArchived)
+                  presentationMode.wrappedValue.dismiss()
                   Snackbar.show(message: !item.isArchived ? "Link archived" : "Link moved to Inbox")
                 },
                 label: {
@@ -122,6 +123,7 @@ import WebKit
         Button("Remove Link", role: .destructive) {
           Snackbar.show(message: "Link removed")
           dataService.removeLink(objectID: item.objectID)
+          presentationMode.wrappedValue.dismiss()
         }
         Button("Cancel", role: .cancel, action: {})
       }

From ea0b689b5c1a50d2b030fbf58201dc2d482ab09c Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 7 Jun 2022 11:03:32 -0700
Subject: [PATCH 15/29] Remove unused var

---
 apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift b/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
index ee4435cc2..1b997e82f 100644
--- a/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
+++ b/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
@@ -53,7 +53,6 @@ public enum PageScraper {
 
     var pageScrapePayload: PageScrapePayload?
     let PDFKey = UTType.pdf.identifier
-    let publicFileKey = UTType.fileURL.identifier
     let propertyListKey = UTType.propertyList.identifier
 
     let group = DispatchGroup()

From b76b2ef4cb794ec653c9728c02c4fd17cfe116a5 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 7 Jun 2022 11:04:06 -0700
Subject: [PATCH 16/29] Better naming for sync methods

---
 .../Sources/Services/DataService/OfflineSync.swift   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index 8a9239957..faa00c72a 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -48,7 +48,7 @@ public extension DataService {
     }
   }
 
-  func syncPdf(id: String, localPdfURL: URL, url: String) async throws {
+  func createPageFromPdf(id: String, localPdfURL: URL, url: String) async throws {
     do {
       try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
 
@@ -72,7 +72,7 @@ public extension DataService {
     }
   }
 
-  func syncPage(id: String, originalHtml: String, title: String?, url: String) async throws -> String {
+  func createPage(id: String, originalHtml: String, title: String?, url: String) async throws -> String {
     do {
       try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
 
@@ -90,7 +90,7 @@ public extension DataService {
     }
   }
 
-  func syncUrl(id: String, url: String) async throws -> String {
+  func createPageFromUrl(id: String, url: String) async throws -> String {
     do {
       try await updateLinkedItemStatus(id: id, newId: nil, status: .isSyncing)
 
@@ -117,7 +117,7 @@ public extension DataService {
 
       if let pdfUrlStr = localPdfURL, let localPdfURL = URL(string: pdfUrlStr) {
         Task {
-          try await syncPdf(id: id, localPdfURL: localPdfURL, url: url)
+          try await createPageFromPdf(id: id, localPdfURL: localPdfURL, url: url)
         }
       } else {
         // TODO: This is an invalid object, we should have a way of reflecting that with an error state
@@ -131,9 +131,9 @@ public extension DataService {
 
       Task {
         if let originalHtml = originalHtml {
-          try await syncPage(id: id, originalHtml: originalHtml, title: title, url: url)
+          try await createPage(id: id, originalHtml: originalHtml, title: title, url: url)
         } else {
-          try await syncUrl(id: id, url: url)
+          try await createPageFromUrl(id: id, url: url)
         }
       }
     default:

From 4ff8a9b83d1dbbccc6666d06b06e0ae54e2b2246 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 7 Jun 2022 11:05:53 -0700
Subject: [PATCH 17/29] When opening with a request id check core data first
 for an item

---
 .../Views/WebReader/WebReaderLoadingContainer.swift   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
index 046d0673a..756a9b57c 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
@@ -1,3 +1,4 @@
+import CoreData
 import Models
 import Services
 import SwiftUI
@@ -24,6 +25,16 @@ import Utils
 
       guard let username = username else { return }
 
+      let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
+      fetchRequest.predicate = NSPredicate(format: "id == %@", requestID)
+      if let existingItem = try? dataService.viewContext.fetch(fetchRequest).first,
+         existingItem.serverSyncStatus == ServerSyncStatus.isNSync.rawValue
+      {
+        print("USING EXISTING ITEM", existingItem.serverSyncStatus)
+        item = existingItem
+        return
+      }
+
       // If the page was locally created, make sure they are synced before we pull content
       await dataService.syncUnsyncedArticleContent(itemID: requestID)
       await fetchLinkedItem(dataService: dataService, requestID: requestID, username: username)

From 611b237e1703cf365caf28019b11657dd99787bc Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 7 Jun 2022 12:00:22 -0700
Subject: [PATCH 18/29] Handle save operations completing in the background
 while opening itemIDs

---
 .../Share/ExtensionSaveService.swift          |  6 +--
 .../WebReader/WebReaderLoadingContainer.swift | 40 ++++++++++++++-----
 .../CoreDataModel.xcdatamodel/contents        |  3 +-
 .../Services/DataService/DataService.swift    |  1 +
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
index 1350d936a..f40b8a61c 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
@@ -168,11 +168,11 @@ class ExtensionSaveService {
 
         switch pageScrapePayload.contentType {
         case .none:
-          requestId = try await services.dataService.syncUrl(id: requestId, url: pageScrapePayload.url)
+          requestId = try await services.dataService.createPageFromUrl(id: requestId, url: pageScrapePayload.url)
         case let .pdf(localUrl):
-          try await services.dataService.syncPdf(id: requestId, localPdfURL: localUrl, url: pageScrapePayload.url)
+          try await services.dataService.createPageFromPdf(id: requestId, localPdfURL: localUrl, url: pageScrapePayload.url)
         case let .html(html, title, _):
-          requestId = try await services.dataService.syncPage(
+          requestId = try await services.dataService.createPage(
             id: requestId,
             originalHtml: html,
             title: title,
diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
index 756a9b57c..c09fc7816 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
@@ -25,19 +25,15 @@ import Utils
 
       guard let username = username else { return }
 
-      let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
-      fetchRequest.predicate = NSPredicate(format: "id == %@", requestID)
-      if let existingItem = try? dataService.viewContext.fetch(fetchRequest).first,
-         existingItem.serverSyncStatus == ServerSyncStatus.isNSync.rawValue
-      {
-        print("USING EXISTING ITEM", existingItem.serverSyncStatus)
+      let existing = existingItemOrItemId(dataService: dataService, requestID: requestID)
+      if let existingItem = existing.existingItem {
         item = existingItem
         return
       }
 
       // If the page was locally created, make sure they are synced before we pull content
-      await dataService.syncUnsyncedArticleContent(itemID: requestID)
-      await fetchLinkedItem(dataService: dataService, requestID: requestID, username: username)
+      await dataService.syncUnsyncedArticleContent(itemID: existing.itemID)
+      await fetchLinkedItem(dataService: dataService, requestID: existing.itemID, username: username)
     }
 
     private func fetchLinkedItem(
@@ -64,9 +60,16 @@ import Utils
       do {
         let retryDelayInNanoSeconds = UInt64(requestCount * 2 * 1_000_000_000)
         try await Task.sleep(nanoseconds: retryDelayInNanoSeconds)
+
+        let existing = existingItemOrItemId(dataService: dataService, requestID: requestID)
+        if let existingItem = existing.existingItem {
+          item = existingItem
+          return
+        }
+
         await fetchLinkedItem(
           dataService: dataService,
-          requestID: requestID,
+          requestID: existing.itemID,
           username: username,
           requestCount: requestCount + 1
         )
@@ -75,6 +78,25 @@ import Utils
       }
     }
 
+    private func existingItemOrItemId(dataService: DataService, requestID: String) -> (existingItem: LinkedItem?, itemID: String) {
+      let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
+      fetchRequest.predicate = NSPredicate(format: "createdId == %@ OR id == %@", requestID, requestID)
+      if let existingItem = try? dataService.viewContext.fetch(fetchRequest).first {
+        // If the existing item is synced, we can use it
+        if let itemID = existingItem.id, existingItem.serverSyncStatus == ServerSyncStatus.isNSync.rawValue {
+          item = existingItem
+          return (existingItem: item, itemID: itemID)
+        }
+
+        // If the existing item is not synced, we might have an updated request id
+        if let existingID = existingItem.id {
+          return (existingItem: nil, itemID: existingID)
+        }
+      }
+
+      return (existingItem: nil, itemID: requestID)
+    }
+
     func trackReadEvent() {
       guard let item = item else { return }
 
diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
index 63bdc0cd9..3316d15b9 100644
--- a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
+++ b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
@@ -24,6 +24,7 @@
         <attribute name="author" optional="YES" attributeType="String"/>
         <attribute name="contentReader" optional="YES" attributeType="String"/>
         <attribute name="createdAt" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="createdId" optional="YES" attributeType="String"/>
         <attribute name="descriptionText" optional="YES" attributeType="String"/>
         <attribute name="htmlContent" optional="YES" attributeType="String"/>
         <attribute name="id" attributeType="String"/>
@@ -89,7 +90,7 @@
     </entity>
     <elements>
         <element name="Highlight" positionX="27" positionY="225" width="128" height="224"/>
-        <element name="LinkedItem" positionX="-18" positionY="63" width="128" height="404"/>
+        <element name="LinkedItem" positionX="-18" positionY="63" width="128" height="419"/>
         <element name="LinkedItemLabel" positionX="-36" positionY="18" width="128" height="134"/>
         <element name="NewsletterEmail" positionX="0" positionY="180" width="128" height="74"/>
         <element name="Viewer" positionX="45" positionY="234" width="128" height="89"/>
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
index 123faa838..7e12640b0 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
@@ -121,6 +121,7 @@ public final class DataService: ObservableObject {
       let existingItem = try? self.backgroundContext.fetch(fetchRequest).first
       let linkedItem = existingItem ?? LinkedItem(entity: LinkedItem.entity(), insertInto: self.backgroundContext)
 
+      linkedItem.createdId = requestId
       linkedItem.id = existingItem?.unwrappedID ?? requestId
       linkedItem.title = normalizedURL
       linkedItem.pageURLString = normalizedURL

From d8e2285f2bd75189e0c66a016ef74f8ddebc1b37 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 7 Jun 2022 14:04:58 -0700
Subject: [PATCH 19/29] Make sure titles are updated when fetching updated
 article content

---
 .../Sources/App/Views/WebReader/WebReader.swift   |  6 ++----
 .../App/Views/WebReader/WebReaderContainer.swift  |  3 +--
 .../App/Views/WebReader/WebReaderContent.swift    | 15 ++++++---------
 .../Models/DataModels/ArticleContent.swift        |  3 +++
 .../DataService/Queries/ArticleContentQuery.swift |  2 ++
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift
index c24689f14..514d9c8f4 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift
@@ -6,9 +6,8 @@ import WebKit
 
 #if os(iOS)
   struct WebReader: UIViewRepresentable {
-    let htmlContent: String
-    let highlightsJSONString: String
     let item: LinkedItem
+    let articleContent: ArticleContent
     let openLinkAction: (URL) -> Void
     let webViewActionHandler: (WKScriptMessage, WKScriptMessageReplyHandler?) -> Void
     let navBarVisibilityRatioUpdater: (Double) -> Void
@@ -143,9 +142,8 @@ import WebKit
 
       webView.loadHTMLString(
         WebReaderContent(
-          htmlContent: htmlContent,
-          highlightsJSONString: highlightsJSONString,
           item: item,
+          articleContent: articleContent,
           isDark: UITraitCollection.current.userInterfaceStyle == .dark,
           fontSize: fontSize(),
           lineHeight: lineHeight(),
diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
index 6031bd02f..4050d4cff 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
@@ -136,9 +136,8 @@ import WebKit
       ZStack {
         if let articleContent = viewModel.articleContent {
           WebReader(
-            htmlContent: articleContent.htmlContent,
-            highlightsJSONString: articleContent.highlightsJSONString,
             item: item,
+            articleContent: articleContent,
             openLinkAction: {
               #if os(macOS)
                 NSWorkspace.shared.open($0)
diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift
index 87902f01a..df4bece5a 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift
@@ -7,16 +7,14 @@ struct WebReaderContent {
   let textFontSize: Int
   let lineHeight: Int
   let margin: Int
-  let htmlContent: String
-  let highlightsJSONString: String
   let item: LinkedItem
   let themeKey: String
   let fontFamily: WebFont
+  let articleContent: ArticleContent
 
   init(
-    htmlContent: String,
-    highlightsJSONString: String,
     item: LinkedItem,
+    articleContent: ArticleContent,
     isDark: Bool,
     fontSize: Int,
     lineHeight: Int,
@@ -26,11 +24,10 @@ struct WebReaderContent {
     self.textFontSize = fontSize
     self.lineHeight = lineHeight
     self.margin = margin
-    self.htmlContent = htmlContent
-    self.highlightsJSONString = highlightsJSONString
     self.item = item
     self.themeKey = isDark ? "Gray" : "LightGray"
     self.fontFamily = fontFamily
+    self.articleContent = articleContent
   }
 
   // swiftlint:disable line_length
@@ -52,7 +49,7 @@ struct WebReaderContent {
       <body>
         <div id="root" />
         <div id='_omnivore-htmlContent' style="display: none;">
-          \(htmlContent)
+          \(articleContent.htmlContent)
         </div>
         <script type="text/javascript">
           window.omnivoreEnv = {
@@ -70,14 +67,14 @@ struct WebReaderContent {
             savedAt: \(savedAt),
             publishedAt: \(publishedAt),
             url: `\(item.unwrappedPageURLString)`,
-            title: `\(item.unwrappedTitle.replacingOccurrences(of: "`", with: "\\`"))`,
+            title: `\(articleContent.title.replacingOccurrences(of: "`", with: "\\`"))`,
             content: document.getElementById('_omnivore-htmlContent').innerHTML,
             originalArticleUrl: "\(item.unwrappedPageURLString)",
             contentReader: "WEB",
             readingProgressPercent: \(item.readingProgress),
             readingProgressAnchorIndex: \(item.readingProgressAnchor),
             labels: \(item.labelsJSONString),
-            highlights: \(highlightsJSONString),
+            highlights: \(articleContent.highlightsJSONString),
           }
 
           window.fontSize = \(textFontSize)
diff --git a/apple/OmnivoreKit/Sources/Models/DataModels/ArticleContent.swift b/apple/OmnivoreKit/Sources/Models/DataModels/ArticleContent.swift
index 4e969e987..0242712e4 100644
--- a/apple/OmnivoreKit/Sources/Models/DataModels/ArticleContent.swift
+++ b/apple/OmnivoreKit/Sources/Models/DataModels/ArticleContent.swift
@@ -8,15 +8,18 @@ public enum ArticleContentStatus {
 }
 
 public struct ArticleContent {
+  public let title: String
   public let htmlContent: String
   public let highlightsJSONString: String
   public let contentStatus: ArticleContentStatus
 
   public init(
+    title: String,
     htmlContent: String,
     highlightsJSONString: String,
     contentStatus: ArticleContentStatus
   ) {
+    self.title = title
     self.htmlContent = htmlContent
     self.highlightsJSONString = highlightsJSONString
     self.contentStatus = contentStatus
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index d612aa82e..a80da3706 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -177,6 +177,7 @@ extension DataService {
           }
 
           let articleContent = ArticleContent(
+            title: result.item.title,
             htmlContent: result.htmlContent,
             highlightsJSONString: result.highlights.asJSONString,
             contentStatus: result.item.isPDF ? .succeeded : .make(from: result.contentStatus)
@@ -302,6 +303,7 @@ extension DataService {
         .filter { $0.serverSyncStatus != ServerSyncStatus.needsDeletion.rawValue }
 
       return ArticleContent(
+        title: linkedItem.unwrappedTitle,
         htmlContent: htmlContent,
         highlightsJSONString: highlights.map { InternalHighlight.make(from: $0) }.asJSONString,
         contentStatus: .succeeded

From bb97039cf107e3d76c80e5c30f7b30496d6bd567 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 7 Jun 2022 20:41:27 -0700
Subject: [PATCH 20/29] Track page state so we know if we are able to read a
 page yet

---
 .../CoreDataModel.xcdatamodel/contents                         | 3 ++-
 .../Services/DataService/Queries/ArticleContentQuery.swift     | 2 ++
 .../Services/DataService/Queries/LibraryItemsQuery.swift       | 2 ++
 .../Sources/Services/InternalModels/InternalLinkedItem.swift   | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
index 3316d15b9..c677d228a 100644
--- a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
+++ b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
@@ -43,6 +43,7 @@
         <attribute name="serverSyncStatus" attributeType="Integer 64" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="siteName" optional="YES" attributeType="String"/>
         <attribute name="slug" attributeType="String"/>
+        <attribute name="state" optional="YES" attributeType="String"/>
         <attribute name="title" attributeType="String"/>
         <attribute name="updatedAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <relationship name="highlights" toMany="YES" deletionRule="Cascade" destinationEntity="Highlight" inverseName="linkedItem" inverseEntity="Highlight"/>
@@ -90,7 +91,7 @@
     </entity>
     <elements>
         <element name="Highlight" positionX="27" positionY="225" width="128" height="224"/>
-        <element name="LinkedItem" positionX="-18" positionY="63" width="128" height="419"/>
+        <element name="LinkedItem" positionX="-18" positionY="63" width="128" height="434"/>
         <element name="LinkedItemLabel" positionX="-36" positionY="18" width="128" height="134"/>
         <element name="NewsletterEmail" positionX="0" positionY="180" width="128" height="74"/>
         <element name="Viewer" positionX="45" positionY="234" width="128" height="89"/>
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index a80da3706..401b369fb 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -101,6 +101,7 @@ extension DataService {
           createdAt: try $0.createdAt().value ?? Date(),
           savedAt: try $0.savedAt().value ?? Date(),
           updatedAt: try $0.updatedAt().value ?? Date(),
+          state: try $0.state()?.rawValue ?? "SUCCEEDED",
           readingProgress: try $0.readingProgressPercent(),
           readingProgressAnchor: try $0.readingProgressAnchorIndex(),
           imageURLString: try $0.image(),
@@ -222,6 +223,7 @@ extension DataService {
         linkedItem.slug = item.slug
         linkedItem.isArchived = item.isArchived
         linkedItem.contentReader = item.contentReader
+        linkedItem.serverSyncStatus = Int64(ServerSyncStatus.isNSync.rawValue)
 
         if linkedItem.isPDF, linkedItem.localPdfURL == nil {
           do {
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/LibraryItemsQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/LibraryItemsQuery.swift
index 6d2acdf74..ed81fe955 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/LibraryItemsQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/LibraryItemsQuery.swift
@@ -98,6 +98,7 @@ public extension DataService {
         createdAt: try $0.createdAt().value ?? Date(),
         savedAt: try $0.savedAt().value ?? Date(),
         updatedAt: try $0.updatedAt().value ?? Date(),
+        state: try $0.state()?.rawValue ?? "SUCCEEDED",
         readingProgress: try $0.readingProgressPercent(),
         readingProgressAnchor: try $0.readingProgressAnchorIndex(),
         imageURLString: try $0.image(),
@@ -164,6 +165,7 @@ private let libraryArticleSelection = Selection.Article {
     createdAt: try $0.createdAt().value ?? Date(),
     savedAt: try $0.savedAt().value ?? Date(),
     updatedAt: try $0.updatedAt().value ?? Date(),
+    state: try $0.state()?.rawValue ?? "SUCCEEDED",
     readingProgress: try $0.readingProgressPercent(),
     readingProgressAnchor: try $0.readingProgressAnchorIndex(),
     imageURLString: try $0.image(),
diff --git a/apple/OmnivoreKit/Sources/Services/InternalModels/InternalLinkedItem.swift b/apple/OmnivoreKit/Sources/Services/InternalModels/InternalLinkedItem.swift
index 9e60704c9..f5f089fd7 100644
--- a/apple/OmnivoreKit/Sources/Services/InternalModels/InternalLinkedItem.swift
+++ b/apple/OmnivoreKit/Sources/Services/InternalModels/InternalLinkedItem.swift
@@ -8,6 +8,7 @@ struct InternalLinkedItem {
   let createdAt: Date
   let savedAt: Date
   let updatedAt: Date
+  let state: String
   var readingProgress: Double
   var readingProgressAnchor: Int
   let imageURLString: String?
@@ -41,6 +42,7 @@ struct InternalLinkedItem {
     linkedItem.createdAt = createdAt
     linkedItem.savedAt = savedAt
     linkedItem.updatedAt = updatedAt
+    linkedItem.state = state
     linkedItem.readingProgress = readingProgress
     linkedItem.readingProgressAnchor = Int64(readingProgressAnchor)
     linkedItem.imageURLString = imageURLString
@@ -98,6 +100,7 @@ extension JSONArticle {
       createdAt: createdAt,
       savedAt: savedAt,
       updatedAt: updatedAt,
+      state: "SUCCEEDED",
       readingProgress: readingProgressPercent,
       readingProgressAnchor: readingProgressAnchorIndex,
       imageURLString: image,

From 544454e0879d617a218090f9c35460fe00c15b41 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 09:03:16 -0700
Subject: [PATCH 21/29] Ensure items are ready to read before presenting in
 Read now

- HTML items: content is downloaded, no longer in processing state
- PDF items: PDF content is downloaded
---
 .../Views/WebReader/WebReaderLoadingContainer.swift |  4 ++--
 .../Sources/Models/DataModels/FeedItem.swift        | 13 +++++++++++++
 .../Sources/Services/DataService/DataService.swift  |  2 +-
 .../DataService/Queries/ArticleContentQuery.swift   |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
index c09fc7816..af9173d5a 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
@@ -26,7 +26,7 @@ import Utils
       guard let username = username else { return }
 
       let existing = existingItemOrItemId(dataService: dataService, requestID: requestID)
-      if let existingItem = existing.existingItem {
+      if let existingItem = existing.existingItem, existingItem.isReadyToRead {
         item = existingItem
         return
       }
@@ -117,7 +117,7 @@ import Utils
     @StateObject var viewModel = WebReaderLoadingContainerViewModel()
 
     public var body: some View {
-      if let item = viewModel.item {
+      if let item = viewModel.item, item.isReadyToRead {
         WebReaderContainerView(item: item)
           .navigationBarHidden(true)
           .navigationViewStyle(.stack)
diff --git a/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift b/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
index 30935ec9a..057f1d17a 100644
--- a/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
+++ b/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
@@ -43,6 +43,19 @@ public extension LinkedItem {
     readingProgress >= 0.98
   }
 
+  var isReadyToRead: Bool {
+    if isPDF {
+      // If its a PDF we verify the local file is available
+      if let localPath = localPdfURL, FileManager.default.fileExists(atPath: localPath) {
+        return true
+      } else {
+        return false
+      }
+    }
+    // Check the state and whether we have HTML
+    return state == "SUCCEEDED"
+  }
+
   var isPDF: Bool {
     if let contentReader = contentReader {
       return contentReader == "PDF"
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
index 7e12640b0..69b85d10c 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
@@ -125,6 +125,7 @@ public final class DataService: ObservableObject {
       linkedItem.id = existingItem?.unwrappedID ?? requestId
       linkedItem.title = normalizedURL
       linkedItem.pageURLString = normalizedURL
+      linkedItem.state = existingItem != nil ? existingItem?.state : "PROCESSING"
       linkedItem.serverSyncStatus = Int64(ServerSyncStatus.needsCreation.rawValue)
       linkedItem.savedAt = currentTime
       linkedItem.createdAt = currentTime
@@ -158,7 +159,6 @@ public final class DataService: ObservableObject {
         linkedItem.imageURLString = iconURL
         linkedItem.title = title ?? PDFUtils.titleFromPdfFile(pageScrape.url)
       case .none:
-        print("SAVING URL", linkedItem.unwrappedPageURLString)
         linkedItem.contentReader = "WEB"
       }
 
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index 401b369fb..04549bd18 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -336,7 +336,6 @@ extension DataService {
       serverSyncStatus = linkedItem.serverSyncStatus
     }
 
-    print("SERVER SYNC STATUS FOR LOADING ITEM", serverSyncStatus)
     if let id = id, let url = url, let title = title,
        let serverSyncStatus = serverSyncStatus,
        serverSyncStatus == ServerSyncStatus.needsCreation.rawValue
@@ -353,6 +352,7 @@ extension DataService {
       } catch {
         // We don't propogate these errors, we just let it pass through so
         // the user can attempt to fetch content again.
+        print("Error syncUnsyncedArticleContent")
       }
     }
   }

From fb1027dc38001e2ada5aa080ee5b7e6141c7d8f3 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 10:45:04 -0700
Subject: [PATCH 22/29] Make the full fetchContent process a single await

This will ensure the full pages content is fully downloaded
before it returns.
---
 .../Queries/ArticleContentQuery.swift         | 211 +++++++++---------
 1 file changed, 101 insertions(+), 110 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index 04549bd18..81f992514 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -143,8 +143,8 @@ extension DataService {
     let path = appEnvironment.graphqlPath
     let headers = networker.defaultHeaders
 
-    return try await withCheckedThrowingContinuation { continuation in
-      send(query, to: path, headers: headers) { [weak self] queryResult in
+    let result: ArticleProps = try await withCheckedThrowingContinuation { continuation in
+      send(query, to: path, headers: headers) { queryResult in
         guard let payload = try? queryResult.get() else {
           continuation.resume(throwing: ContentFetchError.network)
           return
@@ -159,130 +159,124 @@ extension DataService {
             continuation.resume(throwing: ContentFetchError.badData)
             return
           }
-
-          if status == .succeeded || result.item.isPDF {
-            do {
-              try self?.persistArticleContent(
-                item: result.item,
-                htmlContent: result.htmlContent,
-                highlights: result.highlights
-              )
-            } catch {
-              var message = "unknown error"
-              let basicError = (error as? BasicError) ?? BasicError.message(messageText: "unknown error")
-              if case let BasicError.message(messageText) = basicError {
-                message = messageText
-              }
-              continuation.resume(throwing: ContentFetchError.unknown(description: message))
-            }
-          }
-
-          let articleContent = ArticleContent(
-            title: result.item.title,
-            htmlContent: result.htmlContent,
-            highlightsJSONString: result.highlights.asJSONString,
-            contentStatus: result.item.isPDF ? .succeeded : .make(from: result.contentStatus)
-          )
-
-          continuation.resume(returning: articleContent)
+          continuation.resume(returning: result)
         case .error:
           continuation.resume(throwing: ContentFetchError.badData)
         }
       }
     }
+
+    let articleContent = ArticleContent(
+      title: result.item.title,
+      htmlContent: result.htmlContent,
+      highlightsJSONString: result.highlights.asJSONString,
+      contentStatus: result.item.isPDF ? .succeeded : .make(from: result.contentStatus)
+    )
+
+    if result.contentStatus == .succeeded || result.item.isPDF {
+      do {
+        try await persistArticleContent(
+          item: result.item,
+          htmlContent: result.htmlContent,
+          highlights: result.highlights
+        )
+      } catch {
+        var message = "unknown error"
+        let basicError = (error as? BasicError) ?? BasicError.message(messageText: "unknown error")
+        if case let BasicError.message(messageText) = basicError {
+          message = messageText
+        }
+        throw ContentFetchError.unknown(description: message)
+      }
+    }
+
+    return articleContent
   }
 
-  func persistArticleContent(item: InternalLinkedItem, htmlContent: String, highlights: [InternalHighlight]) throws {
-    Task {
-      try await backgroundContext.perform { [weak self] in
-        guard let self = self else { return }
-        let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
-        fetchRequest.predicate = NSPredicate(format: "id == %@", item.id)
+  func persistArticleContent(item: InternalLinkedItem, htmlContent: String, highlights: [InternalHighlight]) async throws {
+    try await backgroundContext.perform { [weak self] in
+      guard let self = self else { return }
+      let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
+      fetchRequest.predicate = NSPredicate(format: "id == %@", item.id)
 
-        let existingItem = try? self.backgroundContext.fetch(fetchRequest).first
-        let linkedItem = existingItem ?? LinkedItem(entity: LinkedItem.entity(), insertInto: self.backgroundContext)
+      let existingItem = try? self.backgroundContext.fetch(fetchRequest).first
+      let linkedItem = existingItem ?? LinkedItem(entity: LinkedItem.entity(), insertInto: self.backgroundContext)
 
-        let highlightObjects = highlights.map {
-          $0.asManagedObject(context: self.backgroundContext)
-        }
-        linkedItem.addToHighlights(NSSet(array: highlightObjects))
-        linkedItem.htmlContent = htmlContent
-        linkedItem.id = item.id
-        linkedItem.title = item.title
-        linkedItem.createdAt = item.createdAt
-        linkedItem.savedAt = item.savedAt
-        linkedItem.readingProgress = item.readingProgress
-        linkedItem.readingProgressAnchor = Int64(item.readingProgressAnchor)
-        linkedItem.imageURLString = item.imageURLString
-        linkedItem.onDeviceImageURLString = item.onDeviceImageURLString
-        linkedItem.pageURLString = item.pageURLString
-        linkedItem.descriptionText = item.descriptionText
-        linkedItem.publisherURLString = item.publisherURLString
-        linkedItem.author = item.author
-        linkedItem.publishDate = item.publishDate
-        linkedItem.slug = item.slug
-        linkedItem.isArchived = item.isArchived
-        linkedItem.contentReader = item.contentReader
-        linkedItem.serverSyncStatus = Int64(ServerSyncStatus.isNSync.rawValue)
+      let highlightObjects = highlights.map {
+        $0.asManagedObject(context: self.backgroundContext)
+      }
+      linkedItem.addToHighlights(NSSet(array: highlightObjects))
+      linkedItem.htmlContent = htmlContent
+      linkedItem.id = item.id
+      linkedItem.state = item.state
+      linkedItem.title = item.title
+      linkedItem.createdAt = item.createdAt
+      linkedItem.savedAt = item.savedAt
+      linkedItem.readingProgress = item.readingProgress
+      linkedItem.readingProgressAnchor = Int64(item.readingProgressAnchor)
+      linkedItem.imageURLString = item.imageURLString
+      linkedItem.onDeviceImageURLString = item.onDeviceImageURLString
+      linkedItem.pageURLString = item.pageURLString
+      linkedItem.descriptionText = item.descriptionText
+      linkedItem.publisherURLString = item.publisherURLString
+      linkedItem.author = item.author
+      linkedItem.publishDate = item.publishDate
+      linkedItem.slug = item.slug
+      linkedItem.isArchived = item.isArchived
+      linkedItem.contentReader = item.contentReader
+      linkedItem.serverSyncStatus = Int64(ServerSyncStatus.isNSync.rawValue)
+    }
 
-        if linkedItem.isPDF, linkedItem.localPdfURL == nil {
-          do {
-            try self.fetchPDFData(slug: linkedItem.unwrappedSlug, pageURLString: linkedItem.unwrappedPageURLString)
-          } catch {
-            throw error
-          }
-        }
+    if item.isPDF {
+      try await fetchPDFData(slug: item.slug, pageURLString: item.pageURLString)
+    }
 
-        do {
-          try self.backgroundContext.save()
-          logger.debug("ArticleContent saved succesfully")
-        } catch {
-          self.backgroundContext.rollback()
-          logger.debug("Failed to save ArticleContent")
-          throw error
-        }
+    try await backgroundContext.perform { [weak self] in
+      do {
+        try self?.backgroundContext.save()
+        logger.debug("ArticleContent saved succesfully")
+      } catch {
+        self?.backgroundContext.rollback()
+        logger.debug("Failed to save ArticleContent")
+        throw error
       }
     }
   }
 
-  func fetchPDFData(slug: String, pageURLString: String) throws {
-    Task {
-      guard let url = URL(string: pageURLString) else { return }
-      let result: (Data, URLResponse)? = try? await URLSession.shared.data(from: url)
-      guard let httpResponse = result?.1 as? HTTPURLResponse, 200 ..< 300 ~= httpResponse.statusCode else {
-        throw BasicError.message(messageText: "pdfFetch failed. no response or bad status code.")
-      }
-      guard let data = result?.0 else {
-        throw BasicError.message(messageText: "pdfFetch failed. no data received.")
+  func fetchPDFData(slug: String, pageURLString: String) async throws {
+    guard let url = URL(string: pageURLString) else { return }
+    let result: (Data, URLResponse)? = try? await URLSession.shared.data(from: url)
+    guard let httpResponse = result?.1 as? HTTPURLResponse, 200 ..< 300 ~= httpResponse.statusCode else {
+      throw BasicError.message(messageText: "pdfFetch failed. no response or bad status code.")
+    }
+    guard let data = result?.0 else {
+      throw BasicError.message(messageText: "pdfFetch failed. no data received.")
+    }
+
+    try await backgroundContext.perform { [weak self] in
+      let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
+      fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(LinkedItem.slug), slug)
+
+      let linkedItem = try? self?.backgroundContext.fetch(fetchRequest).first
+      guard let linkedItem = linkedItem else {
+        let errorMessage = "pdfFetch failed. could not find LinkedItem from fetch request"
+        throw BasicError.message(messageText: errorMessage)
       }
 
-      try await backgroundContext.perform { [weak self] in
-        let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
-        fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(LinkedItem.slug), slug)
+      let subPath = UUID().uuidString + ".pdf" // linkedItem.title.isEmpty ? UUID().uuidString : linkedItem.title
 
-        let linkedItem = try? self?.backgroundContext.fetch(fetchRequest).first
-        guard let linkedItem = linkedItem else {
-          let errorMessage = "pdfFetch failed. could not find LinkedItem from fetch request"
-          throw BasicError.message(messageText: errorMessage)
-        }
+      let path = FileManager.default
+        .urls(for: .cachesDirectory, in: .userDomainMask)[0]
+        .appendingPathComponent(subPath)
 
-        let subPath = UUID().uuidString + ".pdf" // linkedItem.title.isEmpty ? UUID().uuidString : linkedItem.title
-
-        let path = FileManager.default
-          .urls(for: .cachesDirectory, in: .userDomainMask)[0]
-          .appendingPathComponent(subPath)
-
-        do {
-          try data.write(to: path)
-          linkedItem.localPdfURL = path.absoluteString
-          try self?.backgroundContext.save()
-          logger.debug("PDF data saved succesfully")
-        } catch {
-          self?.backgroundContext.rollback()
-          logger.debug("PDF data saved succesfully")
-          let errorMessage = "pdfFetch failed. core data save failed."
-          throw BasicError.message(messageText: errorMessage)
-        }
+      do {
+        try data.write(to: path)
+        linkedItem.localPdfURL = path.absoluteString
+        try self?.backgroundContext.save()
+      } catch {
+        self?.backgroundContext.rollback()
+        let errorMessage = "pdfFetch failed. core data save failed."
+        throw BasicError.message(messageText: errorMessage)
       }
     }
   }
@@ -346,9 +340,6 @@ extension DataService {
         } else {
           try await saveURL(id: id, url: url)
         }
-        try backgroundContext.performAndWait {
-          try backgroundContext.save()
-        }
       } catch {
         // We don't propogate these errors, we just let it pass through so
         // the user can attempt to fetch content again.

From 717edf780978cb08f7ef74bb36690493c970bdec Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 10:49:02 -0700
Subject: [PATCH 23/29] Fix slug in local page creation

---
 .../Sources/Services/DataService/DataService.swift            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
index 69b85d10c..b161c23c4 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
@@ -138,8 +138,8 @@ public final class DataService: ObservableObject {
       linkedItem.author = nil
       linkedItem.publishDate = nil
 
-      if let currentViewer = self.currentViewer {
-        linkedItem.slug = "\(currentViewer)/\(requestId)"
+      if let currentViewer = self.currentViewer, let username = currentViewer.username {
+        linkedItem.slug = "\(username)/\(requestId)"
       } else {
         // Technically this is invalid, but I don't think slug is used at all locally anymore
         linkedItem.slug = requestId

From 2e3ff15b51bca6ce1354113a3e903b345c6696e5 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 10:49:31 -0700
Subject: [PATCH 24/29] WIP: Ensure local items are available in Read Now view

---
 .../WebReader/WebReaderLoadingContainer.swift | 60 ++++++++++++++-----
 .../Sources/Models/DataModels/FeedItem.swift  |  2 +-
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
index af9173d5a..49aea7391 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
@@ -33,7 +33,24 @@ import Utils
 
       // If the page was locally created, make sure they are synced before we pull content
       await dataService.syncUnsyncedArticleContent(itemID: existing.itemID)
-      await fetchLinkedItem(dataService: dataService, requestID: existing.itemID, username: username)
+
+      // Fetch the item and it's content
+      let item = await fetchLinkedItem(dataService: dataService, requestID: existing.itemID, username: username)
+      if let item = item, let itemID = item.id {
+        do {
+          let articleContent = try await dataService.fetchArticleContent(itemID: itemID, username: username, requestCount: 0)
+          // We've fetched the article content, now reload the item from core data
+          if let linkedItem = dataService.viewContext.object(with: item.objectID) as? LinkedItem {
+            self.item = linkedItem
+          } else {
+            self.item = nil
+          }
+        } catch {
+          self.item = nil
+        }
+      } else {
+        self.item = nil
+      }
     }
 
     private func fetchLinkedItem(
@@ -41,19 +58,22 @@ import Utils
       requestID: String,
       username: String,
       requestCount: Int = 1
-    ) async {
+    ) async -> LinkedItem? {
       guard requestCount < 7 else {
         errorMessage = "Unable to fetch item."
-        return
+        return nil
       }
 
+      print("FETCHING", requestID, requestCount)
+
       if let objectID = try? await dataService.fetchLinkedItem(username: username, itemID: requestID) {
         if let linkedItem = dataService.viewContext.object(with: objectID) as? LinkedItem {
-          item = linkedItem
+          print(" - FROM DATA SERVICE", linkedItem)
+          return linkedItem
         } else {
           errorMessage = "Unable to fetch item."
         }
-        return
+        return nil
       }
 
       // Retry on error
@@ -62,20 +82,24 @@ import Utils
         try await Task.sleep(nanoseconds: retryDelayInNanoSeconds)
 
         let existing = existingItemOrItemId(dataService: dataService, requestID: requestID)
-        if let existingItem = existing.existingItem {
-          item = existingItem
-          return
+        if let existingItem = existing.existingItem, existingItem.isReadyToRead {
+          print(" - FROM CORE DATA SERVICE", existingItem)
+          return existingItem
         }
 
-        await fetchLinkedItem(
+        let result = await fetchLinkedItem(
           dataService: dataService,
           requestID: existing.itemID,
           username: username,
           requestCount: requestCount + 1
         )
+        if let result = result {
+          return result
+        }
       } catch {
         errorMessage = "Unable to fetch item."
       }
+      return nil
     }
 
     private func existingItemOrItemId(dataService: DataService, requestID: String) -> (existingItem: LinkedItem?, itemID: String) {
@@ -118,11 +142,19 @@ import Utils
 
     public var body: some View {
       if let item = viewModel.item, item.isReadyToRead {
-        WebReaderContainerView(item: item)
-          .navigationBarHidden(true)
-          .navigationViewStyle(.stack)
-          .accentColor(.appGrayTextContrast)
-          .task { viewModel.trackReadEvent() }
+        if let pdfItem = PDFItem.make(item: item), let urlStr = item.pageURLString, let remoteUrl = URL(string: urlStr) {
+          PDFViewer(remoteURL: remoteUrl, viewModel: PDFViewerViewModel(pdfItem: pdfItem))
+            .navigationBarHidden(true)
+            .navigationViewStyle(.stack)
+            .accentColor(.appGrayTextContrast)
+            .task { viewModel.trackReadEvent() }
+        } else {
+          WebReaderContainerView(item: item)
+            .navigationBarHidden(true)
+            .navigationViewStyle(.stack)
+            .accentColor(.appGrayTextContrast)
+            .task { viewModel.trackReadEvent() }
+        }
       } else if let errorMessage = viewModel.errorMessage {
         Text(errorMessage)
       } else {
diff --git a/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift b/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
index 057f1d17a..5b9cab98a 100644
--- a/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
+++ b/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
@@ -46,7 +46,7 @@ public extension LinkedItem {
   var isReadyToRead: Bool {
     if isPDF {
       // If its a PDF we verify the local file is available
-      if let localPath = localPdfURL, FileManager.default.fileExists(atPath: localPath) {
+      if let localPdfURL = localPdfURL, let url = URL(string: localPdfURL), FileManager.default.fileExists(atPath: url.path) {
         return true
       } else {
         return false

From c86c18507e9da3d7451e6888f2342c8b0993491f Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 11:22:26 -0700
Subject: [PATCH 25/29] Fix issue with URL normalization, add tests

---
 .../OmnivoreKit/Sources/Utils/NormalizeURL.swift  |  6 +++++-
 .../OmnivoreKit/Tests/UtilsTests/UtilsTests.swift | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/Utils/NormalizeURL.swift b/apple/OmnivoreKit/Sources/Utils/NormalizeURL.swift
index 3d31dbe52..ea417ad68 100644
--- a/apple/OmnivoreKit/Sources/Utils/NormalizeURL.swift
+++ b/apple/OmnivoreKit/Sources/Utils/NormalizeURL.swift
@@ -26,9 +26,13 @@ public func normalizeURL(_ dirtyURL: String) -> String {
     }
 
     urlObject.queryItems = urlObject.queryItems?.filter { item in
-      item.name.starts(with: "utm_")
+      !item.name.starts(with: "utm_")
     }
 
+    urlObject.queryItems = urlObject.queryItems?.sorted(by: { first, second in
+      first.name <= second.name
+    })
+
     if /* options.removeTrailingSlash */ true {
       urlObject.path = urlObject.path.replacingRegex(pattern: "/$", replaceWith: "")
     }
diff --git a/apple/OmnivoreKit/Tests/UtilsTests/UtilsTests.swift b/apple/OmnivoreKit/Tests/UtilsTests/UtilsTests.swift
index 2fd256f9f..8439564aa 100644
--- a/apple/OmnivoreKit/Tests/UtilsTests/UtilsTests.swift
+++ b/apple/OmnivoreKit/Tests/UtilsTests/UtilsTests.swift
@@ -9,7 +9,20 @@ final class UtilsTests: XCTestCase {
     XCTAssertEqual("Hello", "Hello")
   }
 
+  func testNormalizeUrl() {
+    // trailing slash removed
+    XCTAssertEqual(normalizeURL("https://omnivore.app/"), "https://omnivore.app")
+
+    // utm_ removed
+    XCTAssertEqual(normalizeURL("https://omnivore.app/?aa=a&bb=b&utm_track=track&cc=c"), "https://omnivore.app?aa=a&bb=b&cc=c")
+
+    // query params sorted
+    XCTAssertEqual(normalizeURL("https://omnivore.app/?aa=a&cc=c&bb=b"), "https://omnivore.app?aa=a&bb=b&cc=c")
+    XCTAssertEqual(normalizeURL("https://omnivore.app/?cc=c&bb=b&aa=a"), "https://omnivore.app?aa=a&bb=b&cc=c")
+  }
+
   static var allTests = [
-    ("testExample", testExample)
+    ("testExample", testExample),
+    ("testNormalizeUrl", testNormalizeUrl)
   ]
 }

From 7b81ad253d895fcf6ff131c2709b81646f6d342a Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 16:08:32 -0700
Subject: [PATCH 26/29] Store PDF paths as filenames instead of full URLs

This fixes issues where the full URL of our directory path
changes, also it moves files into documents instead of
caches, and ensures PDFs are downloaded before opening.
---
 .../Sources/App/PDFSupport/PDFViewer.swift    | 19 +++++---
 .../App/PDFSupport/PDFViewerViewModel.swift   | 19 +++++++-
 .../App/Views/LinkItemDetailView.swift        |  2 +-
 .../WebReader/WebReaderLoadingContainer.swift |  2 +-
 .../CoreDataModel.xcdatamodel/contents        |  2 +-
 .../Sources/Models/DataModels/FeedItem.swift  |  7 +--
 .../Sources/Models/DataModels/PDFItem.swift   | 12 ++++-
 .../Services/DataService/DataService.swift    |  5 +--
 .../DataService/Mutations/SavePDF.swift       | 15 -------
 .../Services/DataService/OfflineSync.swift    |  6 +--
 .../Queries/ArticleContentQuery.swift         | 44 +++++++++++--------
 .../OmnivoreKit/Sources/Utils/PDFUtils.swift  | 24 ++++++++++
 12 files changed, 98 insertions(+), 59 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
index e4a80b185..c1ef3e84a 100644
--- a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
+++ b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
@@ -21,15 +21,14 @@ import Utils
       let url: URL
     }
 
-    let pdfURL: URL
     let viewModel: PDFViewerViewModel
 
     @StateObject var pdfStateObject = PDFStateObject()
     @State var readerView: Bool = false
     @State private var shareLink: ShareLink?
+    @State private var errorMessage: String?
 
-    init(remoteURL: URL, viewModel: PDFViewerViewModel) {
-      self.pdfURL = viewModel.pdfItem.localPdfURL ?? remoteURL
+    init(viewModel: PDFViewerViewModel) {
       self.viewModel = viewModel
     }
 
@@ -135,12 +134,20 @@ import Utils
           .sheet(item: $shareLink) {
             ShareSheet(activityItems: [$0.url])
           }
+      } else if let errorMessage = errorMessage {
+        Text(errorMessage)
       } else {
         ProgressView()
           .task {
-            let document = HighlightedDocument(url: pdfURL, viewModel: viewModel)
-            pdfStateObject.document = document
-            pdfStateObject.coordinator = PDFViewCoordinator(document: document, viewModel: viewModel)
+            // NOTE: the issue here is the PDF is downloaded, but saved to a URL we don't know about
+            // because it is changed.
+            if let pdfURL = await viewModel.downloadPDF(dataService: dataService) {
+              let document = HighlightedDocument(url: pdfURL, viewModel: viewModel)
+              pdfStateObject.document = document
+              pdfStateObject.coordinator = PDFViewCoordinator(document: document, viewModel: viewModel)
+            } else {
+              errorMessage = "Unable to download PDF."
+            }
           }
       }
     }
diff --git a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
index 978063551..fc9a2f4b1 100644
--- a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
+++ b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
@@ -9,7 +9,6 @@ public final class PDFViewerViewModel: ObservableObject {
   @Published public var readerView: Bool = false
 
   public let pdfItem: PDFItem
-  private var storedURL: URL?
 
   var subscriptions = Set<AnyCancellable>()
 
@@ -81,4 +80,22 @@ public final class PDFViewerViewModel: ObservableObject {
 
     return components?.url
   }
+
+  public var itemDownloaded: Bool {
+    if let localPdfURL = pdfItem.localPdfURL, FileManager.default.fileExists(atPath: localPdfURL.path) {
+      return true
+    }
+    return false
+  }
+
+  public func downloadPDF(dataService: DataService) async -> URL? {
+    do {
+      if let localURL = try await dataService.fetchPDFData(slug: pdfItem.slug, pageURLString: pdfItem.originalArticleURL) {
+        return localURL
+      }
+    } catch {
+      print("error downloading PDF", error)
+    }
+    return nil
+  }
 }
diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift
index dea6b1963..79eb3a002 100644
--- a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift
@@ -300,7 +300,7 @@ struct LinkItemDetailView: View {
   @ViewBuilder private var fixedNavBarReader: some View {
     if let pdfItem = viewModel.pdfItem, let pdfURL = pdfItem.pdfURL {
       #if os(iOS)
-        PDFViewer(remoteURL: pdfURL, viewModel: PDFViewerViewModel(pdfItem: pdfItem))
+        PDFViewer(viewModel: PDFViewerViewModel(pdfItem: pdfItem))
           .navigationBarTitleDisplayMode(.inline)
       #elseif os(macOS)
         PDFWrapperView(pdfURL: pdfURL)
diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
index 49aea7391..adb28284f 100644
--- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
@@ -143,7 +143,7 @@ import Utils
     public var body: some View {
       if let item = viewModel.item, item.isReadyToRead {
         if let pdfItem = PDFItem.make(item: item), let urlStr = item.pageURLString, let remoteUrl = URL(string: urlStr) {
-          PDFViewer(remoteURL: remoteUrl, viewModel: PDFViewerViewModel(pdfItem: pdfItem))
+          PDFViewer(viewModel: PDFViewerViewModel(pdfItem: pdfItem))
             .navigationBarHidden(true)
             .navigationViewStyle(.stack)
             .accentColor(.appGrayTextContrast)
diff --git a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
index c677d228a..fec76121b 100644
--- a/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
+++ b/apple/OmnivoreKit/Sources/Models/CoreData/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents
@@ -30,7 +30,7 @@
         <attribute name="id" attributeType="String"/>
         <attribute name="imageURLString" optional="YES" attributeType="String"/>
         <attribute name="isArchived" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="localPdfURL" optional="YES" attributeType="String"/>
+        <attribute name="localPDF" optional="YES" attributeType="String"/>
         <attribute name="onDeviceImageURLString" optional="YES" attributeType="String"/>
         <attribute name="originalHtml" optional="YES" attributeType="String"/>
         <attribute name="pageURLString" attributeType="String"/>
diff --git a/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift b/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
index 5b9cab98a..4147401d9 100644
--- a/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
+++ b/apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
@@ -1,5 +1,6 @@
 import CoreData
 import Foundation
+import Utils
 
 public struct HomeFeedData { // TODO: rename this
   public let items: [NSManagedObjectID]
@@ -46,11 +47,7 @@ public extension LinkedItem {
   var isReadyToRead: Bool {
     if isPDF {
       // If its a PDF we verify the local file is available
-      if let localPdfURL = localPdfURL, let url = URL(string: localPdfURL), FileManager.default.fileExists(atPath: url.path) {
-        return true
-      } else {
-        return false
-      }
+      return PDFUtils.exists(filename: localPDF)
     }
     // Check the state and whether we have HTML
     return state == "SUCCEEDED"
diff --git a/apple/OmnivoreKit/Sources/Models/DataModels/PDFItem.swift b/apple/OmnivoreKit/Sources/Models/DataModels/PDFItem.swift
index 3380e48f1..475f8dfb9 100644
--- a/apple/OmnivoreKit/Sources/Models/DataModels/PDFItem.swift
+++ b/apple/OmnivoreKit/Sources/Models/DataModels/PDFItem.swift
@@ -1,11 +1,12 @@
 import CoreData
 import Foundation
+import Utils
 
 public struct PDFItem {
   public let objectID: NSManagedObjectID
   public let itemID: String
   public let pdfURL: URL?
-  public let localPdfURL: URL?
+  public let localPDF: String?
   public let title: String
   public let slug: String
   public let readingProgress: Double
@@ -22,7 +23,7 @@ public struct PDFItem {
       objectID: item.objectID,
       itemID: item.unwrappedID,
       pdfURL: URL(string: item.unwrappedPageURLString),
-      localPdfURL: item.localPdfURL.flatMap { URL(string: $0) },
+      localPDF: item.localPDF,
       title: item.unwrappedID,
       slug: item.unwrappedSlug,
       readingProgress: item.readingProgress,
@@ -33,4 +34,11 @@ public struct PDFItem {
       highlights: item.highlights.asArray(of: Highlight.self)
     )
   }
+
+  public var localPdfURL: URL? {
+    if let localPDF = localPDF {
+      return PDFUtils.localPdfURL(filename: localPDF)
+    }
+    return nil
+  }
 }
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
index b161c23c4..0d3ef1d42 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
@@ -148,11 +148,8 @@ public final class DataService: ObservableObject {
       switch pageScrape.contentType {
       case let .pdf(localUrl):
         linkedItem.contentReader = "PDF"
-        linkedItem.localPdfURL = localUrl.absoluteString
         linkedItem.title = PDFUtils.titleFromPdfFile(pageScrape.url)
-//        let thumbnailUrl = PDFUtils.thumbnailUrl(localUrl: localUrl)
-//        linkedItem.imageURLString = await PDFUtils.createThumbnailFor(inputUrl: localUrl, at: thumbnailUrl)
-
+        linkedItem.localPDF = try PDFUtils.moveToLocal(url: localUrl)
       case let .html(html: html, title: title, iconURL: iconURL):
         linkedItem.contentReader = "WEB"
         linkedItem.originalHtml = html
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
index 43cd10ef6..dd62e5639 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
@@ -95,21 +95,6 @@ public extension DataService {
     }
   }
 
-  func uploadFileInBackground(id: String, localPdfURL: String?, url: URL, usingSession session: URLSession) -> URLSessionTask? {
-    if let localPdfURL = localPdfURL, let localUrl = URL(string: localPdfURL) {
-      var request = URLRequest(url: url)
-      request.httpMethod = "PUT"
-      request.setValue("application/pdf", forHTTPHeaderField: "content-type")
-      request.setValue(id, forHTTPHeaderField: "clientRequestId")
-
-      let task = session.uploadTask(with: request, fromFile: localUrl)
-      return task
-    } else {
-      // TODO: How should we handle this scenario?
-      return nil
-    }
-  }
-
   func saveFilePublisher(requestId: String, uploadFileId: String, url: String) async throws -> String? {
     enum MutationResult {
       case saved(requestId: String, url: String)
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index faa00c72a..840622f67 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -1,6 +1,7 @@
 import CoreData
 import Foundation
 import Models
+import Utils
 
 public extension DataService {
   internal func syncOfflineItemsWithServerIfNeeded() async throws {
@@ -55,7 +56,6 @@ public extension DataService {
       let uploadRequest = try await uploadFileRequest(id: id, url: url)
       if let urlString = uploadRequest.urlString, let uploadUrl = URL(string: urlString) {
         try await uploadFile(id: id, localPdfURL: localPdfURL, url: uploadUrl)
-        // try await services.dataService.saveFilePublisher(requestId: requestId, uploadFileId: uploadFileID, url: url)
       } else {
         throw SaveArticleError.badData
       }
@@ -112,10 +112,8 @@ public extension DataService {
     switch item.contentReader {
     case "PDF":
       let id = item.unwrappedID
-      let localPdfURL = item.localPdfURL
       let url = item.unwrappedPageURLString
-
-      if let pdfUrlStr = localPdfURL, let localPdfURL = URL(string: pdfUrlStr) {
+      if let localPDF = item.localPDF, let localPdfURL = PDFUtils.localPdfURL(filename: localPDF) {
         Task {
           try await createPageFromPdf(id: id, localPdfURL: localPdfURL, url: url)
         }
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
index 81f992514..8c3b98c57 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift
@@ -2,14 +2,15 @@ import CoreData
 import Foundation
 import Models
 import SwiftGraphQL
+import Utils
 
-extension DataService {
-  struct PendingLink {
+public extension DataService {
+  internal struct PendingLink {
     let itemID: String
     let retryCount: Int
   }
 
-  public func prefetchPages(itemIDs: [String], username: String) async {
+  func prefetchPages(itemIDs: [String], username: String) async {
     // TODO: make this concurrent
     // TODO: make a non-pending page option for BG tasks
     for itemID in itemIDs {
@@ -17,7 +18,7 @@ extension DataService {
     }
   }
 
-  func prefetchPage(pendingLink: PendingLink, username: String) async {
+  internal func prefetchPage(pendingLink: PendingLink, username: String) async {
     let content = try? await articleContent(username: username, itemID: pendingLink.itemID, useCache: false)
 
     if content?.contentStatus == .processing, pendingLink.retryCount < 7 {
@@ -40,7 +41,7 @@ extension DataService {
     }
   }
 
-  public func fetchArticleContent(
+  func fetchArticleContent(
     itemID: String,
     username: String? = nil,
     requestCount: Int = 1
@@ -69,7 +70,7 @@ extension DataService {
   }
 
   // swiftlint:disable:next function_body_length
-  public func articleContent(
+  func articleContent(
     username: String,
     itemID: String,
     useCache: Bool
@@ -193,7 +194,7 @@ extension DataService {
     return articleContent
   }
 
-  func persistArticleContent(item: InternalLinkedItem, htmlContent: String, highlights: [InternalHighlight]) async throws {
+  internal func persistArticleContent(item: InternalLinkedItem, htmlContent: String, highlights: [InternalHighlight]) async throws {
     try await backgroundContext.perform { [weak self] in
       guard let self = self else { return }
       let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
@@ -243,8 +244,10 @@ extension DataService {
     }
   }
 
-  func fetchPDFData(slug: String, pageURLString: String) async throws {
-    guard let url = URL(string: pageURLString) else { return }
+  func fetchPDFData(slug: String, pageURLString: String) async throws -> URL? {
+    guard let url = URL(string: pageURLString) else {
+      throw BasicError.message(messageText: "No PDF URL found")
+    }
     let result: (Data, URLResponse)? = try? await URLSession.shared.data(from: url)
     guard let httpResponse = result?.1 as? HTTPURLResponse, 200 ..< 300 ~= httpResponse.statusCode else {
       throw BasicError.message(messageText: "pdfFetch failed. no response or bad status code.")
@@ -253,6 +256,11 @@ extension DataService {
       throw BasicError.message(messageText: "pdfFetch failed. no data received.")
     }
 
+    var localPdfURL: URL?
+    let tempPath = FileManager.default
+      .urls(for: .cachesDirectory, in: .userDomainMask)[0]
+      .appendingPathComponent(UUID().uuidString + ".pdf")
+
     try await backgroundContext.perform { [weak self] in
       let fetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
       fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(LinkedItem.slug), slug)
@@ -263,15 +271,11 @@ extension DataService {
         throw BasicError.message(messageText: errorMessage)
       }
 
-      let subPath = UUID().uuidString + ".pdf" // linkedItem.title.isEmpty ? UUID().uuidString : linkedItem.title
-
-      let path = FileManager.default
-        .urls(for: .cachesDirectory, in: .userDomainMask)[0]
-        .appendingPathComponent(subPath)
-
       do {
-        try data.write(to: path)
-        linkedItem.localPdfURL = path.absoluteString
+        try data.write(to: tempPath)
+        let localPDF = try PDFUtils.moveToLocal(url: tempPath)
+        localPdfURL = PDFUtils.localPdfURL(filename: localPDF)
+        linkedItem.localPDF = localPDF
         try self?.backgroundContext.save()
       } catch {
         self?.backgroundContext.rollback()
@@ -279,9 +283,11 @@ extension DataService {
         throw BasicError.message(messageText: errorMessage)
       }
     }
+
+    return localPdfURL
   }
 
-  func cachedArticleContent(itemID: String) async -> ArticleContent? {
+  internal func cachedArticleContent(itemID: String) async -> ArticleContent? {
     let linkedItemFetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
     linkedItemFetchRequest.predicate = NSPredicate(
       format: "id == %@", itemID
@@ -307,7 +313,7 @@ extension DataService {
     }
   }
 
-  public func syncUnsyncedArticleContent(itemID: String) async {
+  func syncUnsyncedArticleContent(itemID: String) async {
     let linkedItemFetchRequest: NSFetchRequest<Models.LinkedItem> = LinkedItem.fetchRequest()
     linkedItemFetchRequest.predicate = NSPredicate(
       format: "id == %@", itemID
diff --git a/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift b/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift
index 87f483918..5989b57e4 100644
--- a/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift
+++ b/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift
@@ -11,6 +11,30 @@ import QuickLookThumbnailing
 import UIKit
 
 public enum PDFUtils {
+  public static func moveToLocal(url: URL) throws -> String {
+    let subPath = UUID().uuidString + ".pdf"
+    let dest = FileManager.default
+      .urls(for: .documentDirectory, in: .userDomainMask)[0]
+      .appendingPathComponent(subPath)
+
+    try FileManager.default.moveItem(at: url, to: dest)
+    return subPath
+  }
+
+  public static func localPdfURL(filename: String) -> URL? {
+    let url = FileManager.default
+      .urls(for: .documentDirectory, in: .userDomainMask)[0]
+      .appendingPathComponent(filename)
+    return url
+  }
+
+  public static func exists(filename: String?) -> Bool {
+    if let filename = filename, let localPdfURL = localPdfURL(filename: filename) {
+      return FileManager.default.fileExists(atPath: localPdfURL.absoluteString)
+    }
+    return false
+  }
+
   public static func titleFromPdfFile(_ urlStr: String) -> String {
     let url = URL(string: urlStr)
     if let url = url {

From 7522f22f51e63b6224dc99bd99eecadde0ef2c26 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Thu, 9 Jun 2022 13:53:15 -0700
Subject: [PATCH 27/29] Pull in bundle.js from main

---
 .../components/templates/article/ArticleContainer.tsx    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/web/components/templates/article/ArticleContainer.tsx b/packages/web/components/templates/article/ArticleContainer.tsx
index 0311309ed..c02b48064 100644
--- a/packages/web/components/templates/article/ArticleContainer.tsx
+++ b/packages/web/components/templates/article/ArticleContainer.tsx
@@ -267,15 +267,6 @@ export function ArticleContainer(props: ArticleContainerProps): JSX.Element {
               ))}
             </SpanBox>
           ) : null}
-          {props.isAppleAppEmbed && (
-            <ArticleHeaderToolbar
-              articleTitle={props.article.title}
-              articleShareURL={props.highlightsBaseURL}
-              setShowShareArticleModal={setShowShareModal}
-              setShowHighlightsModal={props.setShowHighlightsModal}
-              hasHighlights={props.article.highlights?.length > 0}
-            />
-          )}
         </VStack>
         <Article
           highlightReady={highlightReady}

From 5537766a45cc027e622b34ca892aed96dc80b198 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 8 Jun 2022 20:11:09 -0700
Subject: [PATCH 28/29] WIP: PDF URLs

---
 .../Sources/App/PDFSupport/PDFViewer.swift          |  5 +++--
 .../Sources/Models/PageScrapePayload.swift          | 13 +++++++++++++
 .../Sources/Services/DataService/DataService.swift  |  3 ++-
 .../Services/DataService/Mutations/SavePDF.swift    |  8 +++++++-
 .../Sources/Services/DataService/OfflineSync.swift  |  5 +++++
 apple/OmnivoreKit/Sources/Utils/PDFUtils.swift      | 10 ++++++++++
 6 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
index c1ef3e84a..d6217081c 100644
--- a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
+++ b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
@@ -141,12 +141,13 @@ import Utils
           .task {
             // NOTE: the issue here is the PDF is downloaded, but saved to a URL we don't know about
             // because it is changed.
-            if let pdfURL = await viewModel.downloadPDF(dataService: dataService) {
+            let pdfURL = await viewModel.downloadPDF(dataService: dataService)
+            if let pdfURL = pdfURL {
               let document = HighlightedDocument(url: pdfURL, viewModel: viewModel)
               pdfStateObject.document = document
               pdfStateObject.coordinator = PDFViewCoordinator(document: document, viewModel: viewModel)
             } else {
-              errorMessage = "Unable to download PDF."
+              errorMessage = "Unable to download PDF: \(pdfURL)"
             }
           }
       }
diff --git a/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift b/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
index 1b997e82f..106d425b4 100644
--- a/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
+++ b/apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
@@ -256,7 +256,20 @@ private extension PageScrapePayload {
         let localFile = UUID().uuidString.lowercased() + ".pdf"
         dest.appendPathComponent(localFile)
         do {
+          print("EXISTING PDF URL", url)
+          let attr = try? FileManager.default.attributesOfItem(atPath: url.path)
+          if let attr = attr {
+            print("EXISTING FILE SIZE", attr[.size])
+          }
+
           try FileManager.default.copyItem(at: url, to: dest)
+          print("COPIED TO URL", dest)
+
+          let attr2 = try? FileManager.default.attributesOfItem(atPath: dest.path)
+          if let attr2 = attr2 {
+            print("COPIED FILE SIZE", attr2[.size])
+          }
+
           return PageScrapePayload(url: url.absoluteString, localUrl: dest)
         } catch {
           print("error copying file locally", error)
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
index 0d3ef1d42..eb464759c 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/DataService.swift
@@ -149,7 +149,8 @@ public final class DataService: ObservableObject {
       case let .pdf(localUrl):
         linkedItem.contentReader = "PDF"
         linkedItem.title = PDFUtils.titleFromPdfFile(pageScrape.url)
-        linkedItem.localPDF = try PDFUtils.moveToLocal(url: localUrl)
+        print("PERSISTING PDF", localUrl)
+        linkedItem.localPDF = try PDFUtils.copyToLocal(url: localUrl)
       case let .html(html: html, title: title, iconURL: iconURL):
         linkedItem.contentReader = "WEB"
         linkedItem.originalHtml = html
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
index dd62e5639..c0e9e186e 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/SavePDF.swift
@@ -19,7 +19,7 @@ public extension DataService {
     let input = InputObjects.UploadFileRequestInput(
       clientRequestId: OptionalArgument(id),
       contentType: "application/pdf",
-      createPageEntry: OptionalArgument(false),
+      createPageEntry: OptionalArgument(true),
       url: url
     )
 
@@ -83,6 +83,12 @@ public extension DataService {
     request.httpMethod = "PUT"
     request.addValue("application/pdf", forHTTPHeaderField: "content-type")
 
+    print("UPLOADING PDF", localPdfURL)
+    let attr = try? FileManager.default.attributesOfItem(atPath: localPdfURL.path)
+    if let attr = attr {
+      print("UPLOADING ATTR", attr[.size])
+    }
+
     return try await withCheckedThrowingContinuation { continuation in
       let task = networker.urlSession.uploadTask(with: request, fromFile: localPdfURL) { _, response, _ in
         if let httpResponse = response as? HTTPURLResponse, 200 ... 299 ~= httpResponse.statusCode {
diff --git a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
index 840622f67..c5c5e2777 100644
--- a/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
+++ b/apple/OmnivoreKit/Sources/Services/DataService/OfflineSync.swift
@@ -55,6 +55,11 @@ public extension DataService {
 
       let uploadRequest = try await uploadFileRequest(id: id, url: url)
       if let urlString = uploadRequest.urlString, let uploadUrl = URL(string: urlString) {
+        let attr = try? FileManager.default.attributesOfItem(atPath: localPdfURL.path)
+        if let attr = attr {
+          print("ATTR", attr[.size])
+        }
+
         try await uploadFile(id: id, localPdfURL: localPdfURL, url: uploadUrl)
       } else {
         throw SaveArticleError.badData
diff --git a/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift b/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift
index 5989b57e4..0d4a4c19c 100644
--- a/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift
+++ b/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift
@@ -11,6 +11,16 @@ import QuickLookThumbnailing
 import UIKit
 
 public enum PDFUtils {
+  public static func copyToLocal(url: URL) throws -> String {
+    let subPath = UUID().uuidString + ".pdf"
+    let dest = FileManager.default
+      .urls(for: .documentDirectory, in: .userDomainMask)[0]
+      .appendingPathComponent(subPath)
+
+    try FileManager.default.copyItem(at: url, to: dest)
+    return subPath
+  }
+
   public static func moveToLocal(url: URL) throws -> String {
     let subPath = UUID().uuidString + ".pdf"
     let dest = FileManager.default

From ce040b89832d2b5bcdbf651f568b465a9124cf4c Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Thu, 9 Jun 2022 10:44:00 -0700
Subject: [PATCH 29/29] Use cached PDFs if available

---
 .../Sources/App/PDFSupport/PDFViewerViewModel.swift            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
index fc9a2f4b1..5b25456cb 100644
--- a/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
+++ b/apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewerViewModel.swift
@@ -90,6 +90,9 @@ public final class PDFViewerViewModel: ObservableObject {
 
   public func downloadPDF(dataService: DataService) async -> URL? {
     do {
+      if itemDownloaded {
+        return pdfItem.localPdfURL
+      }
       if let localURL = try await dataService.fetchPDFData(slug: pdfItem.slug, pageURLString: pdfItem.originalArticleURL) {
         return localURL
       }