ch/ChWebsiteApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Full generation, file type cleanup

Browse Source
This commit is contained in:
Christoph Hagen
2024-12-25 18:06:05 +01:00
parent 41887a1401
commit 1e4682dad1
56 changed files with 1577 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
CHDataManagement/Generator/ImageGenerator.swift
View File

@ -11,8 +11,6 @@ final class ImageGenerator {
private var generatedImages: [String : Set<String>] = [:]
private var jobs: [ImageGenerationJob] = []
init(storage: Storage, settings: Settings) {
self.storage = storage
self.settings = settings
@ -23,20 +21,6 @@ final class ImageGenerator {
settings.paths.imagesOutputFolderPath
}
func runJobs(callback: (String) -> Void) -> Bool {
guard !jobs.isEmpty else {
return true
}
print("Generating \(jobs.count) images...")
while let job = jobs.popLast() {
callback("Generating image \(job.version)")
guard generate(job: job) else {
return false
}
}
return true
}
func save() -> Bool {
guard storage.save(listOfGeneratedImages: generatedImages) else {
print("Failed to save list of generated images")
@ -45,50 +29,6 @@ final class ImageGenerator {
return true
}
private func versionFileName(image: String, type: ImageFileType, width: CGFloat, height: CGFloat) -> String {
let fileName = image.fileNameAndExtension.fileName
let prefix = "\(fileName)@\(Int(width))x\(Int(height))"
return "\(prefix).\(type.fileExtension)"
}
func generateImageSet(for image: String, maxWidth: CGFloat, maxHeight: CGFloat) {
let type = ImageFileType(fileExtension: image.fileExtension!)!
let width2x = maxWidth * 2
let height2x = maxHeight * 2
generateVersion(for: image, type: .avif, maximumWidth: maxWidth, maximumHeight: maxHeight)
generateVersion(for: image, type: .avif, maximumWidth: width2x, maximumHeight: height2x)
generateVersion(for: image, type: .webp, maximumWidth: maxWidth, maximumHeight: maxHeight)
generateVersion(for: image, type: .webp, maximumWidth: width2x, maximumHeight: height2x)
generateVersion(for: image, type: type, maximumWidth: maxWidth, maximumHeight: maxHeight)
generateVersion(for: image, type: type, maximumWidth: width2x, maximumHeight: height2x)
}
func generateVersion(for image: String, type: ImageFileType, maximumWidth: CGFloat, maximumHeight: CGFloat) {
let version = versionFileName(image: image, type: type, width: maximumWidth, height: maximumHeight)
guard needsToGenerate(version: version, for: image) else {
// Image already present
return
}
guard !jobs.contains(where: { $0.version == version }) else {
// Job already in queue
return
}
let job = ImageGenerationJob(
image: image,
version: version,
maximumWidth: maximumWidth,
maximumHeight: maximumHeight,
quality: 0.7,
type: type)
jobs.append(job)
}
/**
Remove all versions of an image, so that they will be recreated on the next run.
@ -105,6 +45,9 @@ final class ImageGenerator {
}
private func needsToGenerate(version: String, for image: String) -> Bool {
if exists(version) {
return false
}
guard let versions = generatedImages[image] else {
return true
}
@ -143,7 +86,7 @@ final class ImageGenerator {
// MARK: Image operations
private func generate(job: ImageGenerationJob) -> Bool {
func generate(job: ImageGenerationJob) -> Bool {
guard needsToGenerate(version: job.version, for: job.image) else {
return true
}
@ -158,7 +101,7 @@ final class ImageGenerator {
return false
}
let representation = create(image: originalImage, width: job.maximumWidth, height: job.maximumHeight)
let representation = create(image: originalImage, width: CGFloat(job.maximumWidth), height: CGFloat(job.maximumHeight))
guard let data = create(image: representation, type: job.type, quality: job.quality) else {
print("Failed to get data for type \(job.type)")
@ -209,7 +152,7 @@ final class ImageGenerator {
// MARK: Avif images
private func create(image: NSBitmapImageRep, type: ImageFileType, quality: CGFloat) -> Data? {
private func create(image: NSBitmapImageRep, type: FileType, quality: CGFloat) -> Data? {
switch type {
case .jpg:
return image.representation(using: .jpeg, properties: [.compressionFactor: NSNumber(value: 0.6)])
@ -225,6 +168,8 @@ final class ImageGenerator {
return nil
case .tiff:
return nil
default:
return nil
}
}