relikd/QLAppBundle
1
0
Fork 0
Code Pull Requests Releases Activity

fix: CoreUI support via Framework abstraction

Browse Source
This commit is contained in:
relikd
2025-11-01 22:14:34 +01:00
parent 6d91972e97
commit 5902bf9aa3
11 changed files with 257 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/AppIcon+Car.swift
View File

@@ -1,91 +0,0 @@
import Foundation
import AppKit // NSImage
import CoreUI // CUICatalog
import os // OSLog
private let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "AppIcon+Car")
// this has been written from scratch but general usage on
// including the private framework has been taken from:
// https://github.com/showxu/cartools
// also see:
// https://blog.timac.org/2018/1018-reverse-engineering-the-car-file-format/
extension AppIcon {
/// Use `CUICatalog` to extract an image from `Assets.car`
func imageFromAssetsCar(_ imageName: String) -> NSImage? {
guard let data = meta.readPayloadFile("Assets.car") else {
return nil
}
let catalog: CUICatalog
do {
catalog = try data.withUnsafeBytes { try CUICatalog(bytes: $0.baseAddress!, length: UInt64(data.count)) }
} catch {
os_log(.error, log: log, "[icon-car] ERROR: could not open catalog: %{public}@", error.localizedDescription)
return nil
}
if let validName = carVerifyNameExists(imageName, in: catalog) {
if let bestImage = carFindHighestResolutionIcon(catalog.images(withName: validName)) {
os_log(.debug, log: log, "[icon-car] using Assets.car with key %{public}@", validName)
return NSImage(cgImage: bestImage.image, size: bestImage.size)
}
}
return nil;
}
// MARK: - Helper: Assets.car
/// Helper method to check available icon names. Will return a valid name or `nil` if no image with that key is found.
func carVerifyNameExists(_ imageName: String, in catalog: CUICatalog) -> String? {
if let availableNames = catalog.allImageNames(), !availableNames.contains(imageName) {
// Theoretically this should never happen. Assuming the image name is found in an image file.
os_log(.info, log: log, "[icon-car] WARN: key '%{public}@' does not match any available key", imageName)
if let alternativeName = carSearchAlternativeName(imageName, inAvailable: availableNames) {
os_log(.info, log: log, "[icon-car] falling back to '%{public}@'", alternativeName)
return alternativeName
}
os_log(.debug, log: log, "[icon-car] available keys: %{public}@", catalog.allImageNames() ?? [])
return nil
}
return imageName;
}
/// If exact name does not exist in catalog, search for a name that shares the same prefix.
/// E.g., "AppIcon60x60" may match "AppIcon" or "AppIcon60x60_small"
func carSearchAlternativeName(_ originalName: String, inAvailable availableNames: [String]) -> String? {
var bestOption: String? = nil
var bestDiff: Int = 999
for option in availableNames {
if option.hasPrefix(originalName) || originalName.hasPrefix(option) {
let thisDiff = max(originalName.count, option.count) - min(originalName.count, option.count)
if thisDiff < bestDiff {
bestDiff = thisDiff
bestOption = option
}
}
}
return bestOption
}
/// Given a list of `CUINamedImage`, return the one with the highest resolution. Vector graphics are ignored.
func carFindHighestResolutionIcon(_ availableImages: [CUINamedImage]) -> CUINamedImage? {
var largestWidth: CGFloat = 0
var largestImage: CUINamedImage? = nil
// cast to NSArray is necessary as otherwise this will crash
for img in availableImages as NSArray {
guard let img = img as? CUINamedImage else {
continue // ignore CUINamedMultisizeImageSet
}
let w = img.size.width
if w > largestWidth {
largestWidth = w
largestImage = img
}
}
return largestImage
}
}

9
src/AppIcon.swift
View File

@@ -1,5 +1,6 @@
import Foundation
import AppKit // NSImage
import AssetCarReader // CarReader
import os // OSLog
private let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "AppIcon")
@@ -50,6 +51,14 @@ struct AppIcon {
let iconURL = Bundle.main.url(forResource: "defaultIcon", withExtension: "png")!
return NSImage(contentsOf: iconURL)!
}
/// Extract an image from `Assets.car`
func imageFromAssetsCar(_ imageName: String) -> NSImage? {
guard let data = meta.readPayloadFile("Assets.car") else {
return nil
}
return CarReader(data)?.imageFromAssetsCar(imageName)
}
}