Merge pull request #697 from ThePalaceProject/release/2.0.2

Release/2.0.2

Author: mauricecarrier7

Palace.xcodeproj/project.pbxproj

@@ -4731,7 +4731,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 389;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4753,7 +4753,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_MODULE_NAME = Palace;
 				PRODUCT_NAME = "Palace-noDRM";
@@ -4790,7 +4790,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 389;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4812,7 +4812,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_MODULE_NAME = Palace;
 				PRODUCT_NAME = "Palace-noDRM";
@@ -4974,7 +4974,7 @@
 				CODE_SIGN_ENTITLEMENTS = Palace/PalaceDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 389;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5000,7 +5000,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -5035,7 +5035,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 389;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -5062,7 +5062,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store";

Palace.xcodeproj/xcshareddata/xcschemes/Palace.xcscheme

@@ -143,12 +143,12 @@
       </EnvironmentVariables>
       <AdditionalOptions>
          <AdditionalOption
-            key = "MallocStackLogging"
+            key = "PrefersMallocStackLoggingLite"
             value = ""
             isEnabled = "YES">
          </AdditionalOption>
          <AdditionalOption
-            key = "PrefersMallocStackLoggingLite"
+            key = "MallocStackLogging"
             value = ""
             isEnabled = "YES">
          </AdditionalOption>

Palace/Accounts/Library/AccountsManager.swift

@@ -257,14 +257,6 @@ let currentAccountIdentifierKey = "TPPCurrentAccountIdentifier"
         }
       }
 
-      for acct in newAccounts {
-        group.enter()
-        DispatchQueue.global(qos: .background).async {
-          acct.loadLogo()
-          group.leave()
-        }
-      }
-
       group.notify(queue: .main) {
         var mainFeed = URL(string: self.currentAccount?.catalogUrl ?? "")
         if let cur = self.currentAccount, cur.details?.needsAgeCheck ?? false {

Palace/AppInfrastructure/NavigationCoordinator.swift

@@ -190,7 +190,6 @@ final class NavigationCoordinator: ObservableObject {
 
 struct CatalogLaneFilterState {
   let appliedSelections: Set<String>
-  let currentSort: String  // Store as string to avoid enum duplication
   let facetGroups: [CatalogFilterGroup]
 }
 

Palace/AppInfrastructure/TPPAppDelegate.swift

@@ -223,14 +223,16 @@ extension TPPAppDelegate {
     if needsAccount {
       var nav: UINavigationController!
       let accountList = TPPAccountList { account in
-        // Match CatalogView's Add Library flow: persist, switch account, update feed URL, notify, dismiss
         if !TPPSettings.shared.settingsAccountIdsList.contains(account.uuid) {
           TPPSettings.shared.settingsAccountIdsList.append(account.uuid)
         }
-        AccountsManager.shared.currentAccount = account
         if let urlString = account.catalogUrl, let url = URL(string: urlString) {
           TPPSettings.shared.accountMainFeedURL = url
         }
+        AccountsManager.shared.currentAccount = account
+        
+        account.loadAuthenticationDocument { _ in }
+        
         NotificationCenter.default.post(name: .TPPCurrentAccountDidChange, object: nil)
         nav?.dismiss(animated: true)
       }
@@ -306,9 +308,6 @@ final class MemoryPressureMonitor {
       URLCache.shared.removeAllCachedResponses()
       TPPNetworkExecutor.shared.clearCache()
 
-      ImageCache.shared.clear()
-      GeneralCache<String, Data>.clearAllCaches()
-
       MyBooksDownloadCenter.shared.pauseAllDownloads()
 
       self.reclaimDiskSpaceIfNeeded(minimumFreeMegabytes: 256)

Palace/Book/Models/TPPBook.swift

@@ -557,10 +557,9 @@ extension TPPBook {
 
       TPPBookCoverRegistryBridge.shared.thumbnailImageForBook(self) { [weak self] image in
         guard let self = self else { return }
-        let final = image ?? UIImage(systemName: "book")
 
-        self.thumbnailImage = final
-        if let img = final {
+        self.thumbnailImage = image
+        if let img = image {
           self.imageCache.set(img, for: self.identifier)
           self.imageCache.set(img, for: thumbnailKey)
           if self.coverImage == nil {
@@ -595,38 +594,69 @@ extension TPPBook {
 
 // MARK: - Dominant Color (async, off main thread)
 private extension TPPBook {
+  private static let colorProcessingQueue = DispatchQueue(label: "org.thepalaceproject.dominantcolor", qos: .utility)
+  private static let sharedCIContext: CIContext = {
+    guard let colorSpace = CGColorSpace(name: CGColorSpace.sRGB) else {
+      return CIContext()
+    }
+    return CIContext(options: [
+      .workingColorSpace: colorSpace,
+      .outputColorSpace: colorSpace,
+      .useSoftwareRenderer: false
+    ])
+  }()
+  
   func updateDominantColor(using image: UIImage) {
     let inputImage = image
-    DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+    Self.colorProcessingQueue.async { [weak self] in
       guard let self = self else { return }
 
-      let ciImage = CIImage(image: inputImage)
-      let filter = CIFilter.areaAverage()
-      filter.inputImage = ciImage
-      filter.extent = ciImage?.extent ?? .zero
-
-      guard let outputImage = filter.outputImage else { return }
-
-      var bitmap = [UInt8](repeating: 0, count: 4)
-      let context = CIContext(options: [CIContextOption.useSoftwareRenderer: false])
-      context.render(
-        outputImage,
-        toBitmap: &bitmap,
-        rowBytes: 4,
-        bounds: CGRect(x: 0, y: 0, width: 1, height: 1),
-        format: .RGBA8,
-        colorSpace: nil
-      )
+      autoreleasepool {
+        guard let ciImage = CIImage(image: inputImage) else {
+          Log.debug(#file, "Failed to create CIImage from UIImage for book: \(self.identifier)")
+          return
+        }
 
-      let color = UIColor(
-        red: CGFloat(bitmap[0]) / 255.0,
-        green: CGFloat(bitmap[1]) / 255.0,
-        blue: CGFloat(bitmap[2]) / 255.0,
-        alpha: CGFloat(bitmap[3]) / 255.0
-      )
+        guard !ciImage.extent.isEmpty else {
+          Log.debug(#file, "CIImage has empty extent for book: \(self.identifier)")
+          return
+        }
 
-      DispatchQueue.main.async {
-        self.dominantUIColor = color
+        let filter = CIFilter.areaAverage()
+        filter.inputImage = ciImage
+        filter.extent = ciImage.extent
+
+        guard let outputImage = filter.outputImage else {
+          Log.debug(#file, "Failed to generate output image from filter for book: \(self.identifier)")
+          return
+        }
+
+        guard let colorSpace = CGColorSpace(name: CGColorSpace.sRGB) else {
+          Log.debug(#file, "Failed to create sRGB color space for book: \(self.identifier)")
+          return
+        }
+
+        var bitmap = [UInt8](repeating: 0, count: 4)
+        
+        Self.sharedCIContext.render(
+          outputImage,
+          toBitmap: &bitmap,
+          rowBytes: 4,
+          bounds: CGRect(x: 0, y: 0, width: 1, height: 1),
+          format: .RGBA8,
+          colorSpace: colorSpace
+        )
+
+        let color = UIColor(
+          red: CGFloat(bitmap[0]) / 255.0,
+          green: CGFloat(bitmap[1]) / 255.0,
+          blue: CGFloat(bitmap[2]) / 255.0,
+          alpha: CGFloat(bitmap[3]) / 255.0
+        )
+
+        DispatchQueue.main.async {
+          self.dominantUIColor = color
+        }
       }
     }
   }

Palace/Book/Models/TPPBookCoverRegistry.swift

@@ -13,16 +13,19 @@ actor TPPBookCoverRegistry {
   }
 
   func coverImage(for book: TPPBook) async -> UIImage? {
-    guard let url = book.imageURL else { return await thumbnailImage(for: book) }
-    return await fetchImage(from: url, for: book, isCover: true)
+    if let url = book.imageURL, let image = await fetchImage(from: url, for: book, isCover: true) {
+      return image
+    }
+    
+    return await thumbnailImage(for: book)
   }
 
   func thumbnailImage(for book: TPPBook) async -> UIImage? {
-    guard let url = book.imageThumbnailURL else {
-      return await placeholder(for: book)
+    if let url = book.imageThumbnailURL, let image = await fetchImage(from: url, for: book, isCover: false) {
+      return image
     }
 
-    return await fetchImage(from: url, for: book, isCover: false)
+    return await placeholder(for: book)
   }
 
   private func fetchImage(from url: URL, for book: TPPBook, isCover: Bool) async -> UIImage? {
@@ -36,16 +39,19 @@ actor TPPBookCoverRegistry {
     }
 
     let task = Task<UIImage?, Never> { [weak self] in
-      guard let self else { return UIImage() }
+      guard let self else { return nil }
 
       do {
         let (data, _) = try await URLSession.shared.data(from: url)
-        guard let image = UIImage(data: data) else { return nil }
+        guard let image = UIImage(data: data) else {
+          Log.error(#file, "Failed to decode image data from URL: \(url)")
+          return nil
+        }
 
         self.imageCache.set(image, for: key as String, expiresIn: nil)
         return image
       } catch {
-        Log.error(#file, "Failed to fetch image: \(error.localizedDescription)")
+        Log.error(#file, "Failed to fetch image from \(url): \(error.localizedDescription)")
         return nil
       }
     }

Palace/Book/UI/AudiobookSampleToolbar.swift

@@ -14,7 +14,7 @@ struct AudiobookSampleToolbar: View {
   @ObservedObject var player: AudiobookSamplePlayer
 
   private var book: TPPBook
-  private let imageLoader = AsyncImage(image: UIImage(systemName: "book.closed.fill") ?? UIImage())
+  private let imageLoader: AsyncImage
   private let toolbarHeight: CGFloat = 70
   private let toolbarPadding: CGFloat = 5
   private let imageViewHeight: CGFloat = 70
@@ -25,10 +25,31 @@ struct AudiobookSampleToolbar: View {
     self.book = book
     guard let sample = book.sample as? AudiobookSample else { return nil }
     player = AudiobookSamplePlayer(sample: sample)
+    
+    let placeholderImage = Self.generatePlaceholder(for: book)
+    imageLoader = AsyncImage(image: placeholderImage)
+    
     if let imageURL = book.imageThumbnailURL ?? book.imageURL {
       imageLoader.loadImage(url: imageURL)
     }
   }
+  
+  private static func generatePlaceholder(for book: TPPBook) -> UIImage {
+    let size = CGSize(width: 80, height: 120)
+    let format = UIGraphicsImageRendererFormat()
+    format.scale = UIScreen.main.scale
+    return UIGraphicsImageRenderer(size: size, format: format)
+      .image { ctx in
+        if let view = NYPLTenPrintCoverView(
+          frame: CGRect(origin: .zero, size: size),
+          withTitle: book.title,
+          withAuthor: book.authors ?? "Unknown Author",
+          withScale: 0.4
+        ) {
+          view.layer.render(in: ctx.cgContext)
+        }
+      }
+  }
 
   var body: some View {
     HStack {