Skip to content

chore(preprod): Add image dedupping logic when creating ParsedAssets folder #2855

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

Closed
NicoHinderling wants to merge 1 commit into from
Closed

chore(preprod): Add image dedupping logic when creating ParsedAssets folder #2855

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
35 changes: 33 additions & 2 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 @@ -78,6 +79,7 @@ enum AssetUtil {
let (structuredThemeStore, assetKeys) = initializeCatalog(from: file)

var images: [String: CGImage] = [:]
var seenImageKeys: [String: String] = [:] // SHA256 -> imageId mapping
Copy link
Copy Markdown
Contributor

@noahsmartin noahsmartin Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem right to me, where is an equivalent mapping used in the emerge code?

Copy link
Copy Markdown
Contributor Author

@NicoHinderling NicoHinderling Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had some misunderstanding , we do logic to set the isDuplicate flag, but we don't actually do de-dupping in the parsing. The main misunderstanding I had was around how we will no longer be doing app thinning automatically for users, so I think I'm going to close this PR for now


for key in assetKeys {
let keyList = unsafeBitCast(
Expand Down Expand Up @@ -128,8 +130,17 @@ enum AssetUtil {
let isVector = type == 9
let (width, height, unslicedImage) = resolveImageDimensions(rendition, isVector)
let assetType = determineAssetType(key)
let imageId = UUID().uuidString
images[imageId] = unslicedImage

let imageKey = generateImageKey(from: rendition, className: className, data: data)

let imageId: String
if let existingImageId = seenImageKeys[imageKey] {
continue
} else {
imageId = UUID().uuidString
seenImageKeys[imageKey] = imageId
images[imageId] = unslicedImage
}

let asset = AssetCatalogEntry(
imageId: imageId,
Expand Down Expand Up @@ -293,6 +304,26 @@ enum AssetUtil {

return (width, height, unslicedImage)
}

private static func generateImageKey(from rendition: NSObject, className: String, data: Data) -> String {
if let unslicedImage = rendition.perform(Selector(("unslicedImage"))) {
let image = unslicedImage.takeUnretainedValue() as! CGImage
if let imageData = image.dataProvider?.data as? Data {
return imageData.sha256()
}
} else if className == "_CUIThemePDFRendition" {
return data.sha256()
}

return data.sha256()
}
}

extension Data {
func sha256() -> String {
let digest = SHA256.hash(data: self)
return digest.compactMap { String(format: "%02x", $0) }.joined()
}
}

private extension NSObject {
Expand Down