Skip to content

Save PDFs and SVGs with content hash #3024

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

Merged
NicoHinderling merged 2 commits into from
Dec 11, 2025
Merged

Save PDFs and SVGs with content hash #3024

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7acd373
change approach to use contentHash
NicoHinderling Dec 11, 2025
5cf1fa4
add extra comment
NicoHinderling Dec 11, 2025
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
Next Next commit
change approach to use contentHash
  • Loading branch information
@NicoHinderling
NicoHinderling committed Dec 11, 2025
commit 7acd3736dd1c97808fd343a8301da6e9a5fceb54
34 changes: 27 additions & 7 deletions ...rsing/native/swift/AssetCatalogParser/Sources/AssetCatalogParser/AssetCatalogReader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import CoreGraphics
import CryptoKit
import Foundation
import ImageIO
import UniformTypeIdentifiers
Expand Down Expand Up @@ -40,6 +41,7 @@ struct AssetCatalogEntry: Encodable {
let type: AssetType?
let idiom: String?
let colorspace: String?
let contentHash: String?
}

enum Error: Swift.Error {
Expand Down Expand Up @@ -112,7 +114,7 @@ enum AssetUtil {

let (structuredThemeStore, assetKeys) = initializeCatalog(from: file)

var images: [String: (cgImage: CGImage, format: String)] = [:]
var cgImages: [String: (cgImage: CGImage, format: String)] = [:]

// First pass: Build map of multisize sets and cache renditions for performance
var multisizeSets: [MultisizeSetInfo] = []
Expand Down Expand Up @@ -216,17 +218,22 @@ enum AssetUtil {
var width: Int?
var height: Int?
var unslicedImage: CGImage?
var contentHash: String? = nil

if isMultisizeImageSet {
continue
} else {
// Get image dimensions from regular rendition
(width, height, unslicedImage) = resolveImageDimensions(rendition, isVector)

// Skip SVGs, but save images even if they don't have an extension (default to png)
if fileExtension != "svg", let unslicedImage = unslicedImage {
// Compute content hash for PDFs/SVGs without saving to disk
if fileExtension == "pdf" || fileExtension == "svg" {
contentHash = data.sha256Hash()
}
// Save images that can be converted to CGImage (excluding PDFs/SVGs)
else if let unslicedImage = unslicedImage {
let format = fileExtension.isEmpty ? "png" : fileExtension
images[imageId] = (cgImage: unslicedImage, format: format)
cgImages[imageId] = (cgImage: unslicedImage, format: format)
}
}

Expand All @@ -251,7 +258,8 @@ enum AssetUtil {
filename: renditionTypeName,
type: assetType,
idiom: idiomToString(idiomValue),
colorspace: colorSpaceIDToString(colorSpaceID)
colorspace: colorSpaceIDToString(colorSpaceID),
contentHash: contentHash
)
assets.append(asset)
}
Expand All @@ -266,7 +274,8 @@ enum AssetUtil {
filename: nil,
type: nil,
idiom: nil,
colorspace: nil
colorspace: nil,
contentHash: nil
))

let data = try! JSONEncoder().encode(assets)
Expand All @@ -275,7 +284,7 @@ enum AssetUtil {
.appendingPathComponent("Assets")
.appendingPathExtension("json")
try! data.write(to: url, options: [])
for (id, imageInfo) in images {
for (id, imageInfo) in cgImages {
let format = imageInfo.format
let cgImage = imageInfo.cgImage
let fileURL = folder.appendingPathComponent(id).appendingPathExtension(format)
Expand Down Expand Up @@ -460,6 +469,17 @@ enum AssetUtil {
}
}

private extension Data {
func sha256Hash() -> String {
if #available(macOS 10.15, *) {
let digest = SHA256.hash(data: self)
return digest.map { String(format: "%02x", $0) }.joined()
}
// Fallback for older macOS (shouldn't happen with version 13+ requirement)
return ""
}
}

private extension NSObject {
func getUInt(forKey key: String) -> UInt? {
if let result = perform(Selector(key)) {
Expand Down