Skip to content

fix: prevent app hang during image scrim color calculation #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent app hang during image scrim color calculation #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions View/Catalog/CatalogView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4019,7 +4019,9 @@ private struct CatalogHeroRemoteImage: View {
image = cached.image
hasFailed = false
isLoading = false
onScrimColorChange(CatalogHeroImageMetadata.scrimColor(from: cached.data) ?? .black)
let color = await CatalogHeroImageMetadata.scrimColor(from: cached.data)
guard !Task.isCancelled else { return }
onScrimColorChange(color ?? .black)
} else {
guard !Task.isCancelled else { return }
image = nil
Expand Down Expand Up @@ -4140,12 +4142,14 @@ private enum CatalogHeroImageMetadata {
let bottom: String?
}

static func scrimColor(from data: Data) -> CatalogMarqueeScrimColor? {
guard let source = CGImageSourceCreateWithData(data as CFData, nil) else { return nil }
if let metadataColor = metadataScrimColor(from: source) {
return metadataColor
}
return sampledLeftEdgeColor(from: source)
static func scrimColor(from data: Data) async -> CatalogMarqueeScrimColor? {
await Task.detached(priority: .userInitiated) {
guard let source = CGImageSourceCreateWithData(data as CFData, nil) else { return nil }
if let metadataColor = metadataScrimColor(from: source) {
return metadataColor
}
return sampledLeftEdgeColor(from: source)
}.value
}

private static func metadataScrimColor(from source: CGImageSource) -> CatalogMarqueeScrimColor? {
Expand Down