From 6898eeb42ce3e5cc07d4978343f679a724314a29 Mon Sep 17 00:00:00 2001 From: relikd Date: Tue, 4 Nov 2025 19:26:07 +0100 Subject: [PATCH] ref: rename template values --- resources/template.html | 44 ++++++++++++++++---------------- src/Preview+AppInfo.swift | 24 ++++++++--------- src/Preview+Entitlements.swift | 4 +-- src/Preview+FileInfo.swift | 11 +++----- src/Preview+Footer.swift | 4 +-- src/Preview+Provisioning.swift | 26 +++++++++---------- src/Preview+iTunesPurchase.swift | 4 +-- src/PreviewGenerator.swift | 2 ++ 8 files changed, 58 insertions(+), 61 deletions(-) diff --git a/resources/template.html b/resources/template.html index d5fbc22..0b16d57 100644 --- a/resources/template.html +++ b/resources/template.html @@ -9,35 +9,35 @@

__AppInfoTitle__

App icon
- Name: __CFBundleName__
- Version: __CFBundleShortVersionString__ (__CFBundleVersion__)
- BundleId: __CFBundleIdentifier__
-
- Extension type: __ExtensionType__
+ Name: __AppName__
+ Version: __AppVersion__ (__AppBuildVer__)
+ BundleId: __AppId__
+
+ Extension type: __AppExtensionType__
- DeviceFamily: __UIDeviceFamily__
- SDK: __DTSDKName__
- Minimum OS Version: __MinimumOSVersion__
+ DeviceFamily: __AppDeviceFamily__
+ SDK: __AppSDK__
+ Minimum OS Version: __AppMinOS__

App Transport Security

- __AppTransportSecurityFormatted__ + __AppTransportSecurity__

Provisioning

- Profile name: __ProfileName__
+ Profile name: __ProvisionProfileName__
-

__ProfileName__

+

__ProvisionProfileName__

- Profile UUID: __ProfileUUID__
- Profile Type: __ProfilePlatform__ __ProfileType__
- Team: __TeamName__ (__TeamIds__)
- Creation date: __CreationDateFormatted__
- Expiration Date: __ExpirationDateFormatted__
+ Profile UUID: __ProvisionProfileId__
+ Profile Type: __ProvisionProfilePlatform__ __ProvisionProfileType__
+ Team: __ProvisionTeamName__ (__ProvisionTeamIds__)
+ Creation date: __ProvisionCreateDate__
+ Expiration Date: __ProvisionExpireDate__
@@ -45,17 +45,17 @@
Entitlements extraction failed.
- __EntitlementsFormatted__ + __EntitlementsDict__

Developer Certificates

- __DeveloperCertificatesFormatted__ + __ProvisionDevelopCertificates__
-

Devices (__ProvisionedDevicesCount__)

- __ProvisionedDevicesFormatted__ +

Devices (__ProvisionDeviceCount__)

+ __ProvisionDeviceIds__
@@ -73,11 +73,11 @@

File info

__FileName__
- __FileInfo__
+ __FileSize__, Modified __FileModified__
-

__SrcAppName__ v__BundleShortVersionString__ (__BundleVersion__) (Github: __SrcLinkName__)

+

__SrcAppName__ v__SrcVersion__ (__SrcBuildVer__) (Github: __SrcLinkName__)

diff --git a/src/Preview+AppInfo.swift b/src/Preview+AppInfo.swift index 1ab7765..fa7ed06 100644 --- a/src/Preview+AppInfo.swift +++ b/src/Preview+AppInfo.swift @@ -60,7 +60,7 @@ extension PreviewGenerator { mutating func procAppInfo(_ appPlist: PlistDict?) { guard let appPlist else { self.apply([ - "AppInfoHidden": "hiddenDiv", + "AppInfoHidden": CLASS_HIDDEN, "ProvisionTitleHidden": "", ]) return @@ -84,20 +84,20 @@ extension PreviewGenerator { let extensionType = (appPlist["NSExtension"] as? PlistDict)?["NSExtensionPointIdentifier"] as? String self.apply([ "AppInfoHidden": "", - "ProvisionTitleHidden": "hiddenDiv", + "ProvisionTitleHidden": CLASS_HIDDEN, - "CFBundleName": appPlist["CFBundleDisplayName"] as? String ?? appPlist["CFBundleName"] as? String ?? "", - "CFBundleShortVersionString": appPlist["CFBundleShortVersionString"] as? String ?? "", - "CFBundleVersion": appPlist["CFBundleVersion"] as? String ?? "", - "CFBundleIdentifier": appPlist["CFBundleIdentifier"] as? String ?? "", + "AppName": appPlist["CFBundleDisplayName"] as? String ?? appPlist["CFBundleName"] as? String ?? "", + "AppVersion": appPlist["CFBundleShortVersionString"] as? String ?? "", + "AppBuildVer": appPlist["CFBundleVersion"] as? String ?? "", + "AppId": appPlist["CFBundleIdentifier"] as? String ?? "", - "ExtensionTypeHidden": extensionType != nil ? "" : "hiddenDiv", - "ExtensionType": extensionType ?? "", + "AppExtensionTypeHidden": extensionType != nil ? "" : CLASS_HIDDEN, + "AppExtensionType": extensionType ?? "", - "UIDeviceFamily": platforms ?? "", - "DTSDKName": appPlist["DTSDKName"] as? String ?? "", - "MinimumOSVersion": minVersion, - "AppTransportSecurityFormatted": formattedAppTransportSecurity(appPlist), + "AppDeviceFamily": platforms ?? "", + "AppSDK": appPlist["DTSDKName"] as? String ?? "", + "AppMinOS": minVersion, + "AppTransportSecurity": formattedAppTransportSecurity(appPlist), ]) } } diff --git a/src/Preview+Entitlements.swift b/src/Preview+Entitlements.swift index 3b6d2ab..5d2dee7 100644 --- a/src/Preview+Entitlements.swift +++ b/src/Preview+Entitlements.swift @@ -29,8 +29,8 @@ extension PreviewGenerator { entitlements.applyFallbackIfNeeded(provisionPlist?["Entitlements"] as? PlistDict) self.apply([ - "EntitlementsWarningHidden": entitlements.hasError ? "" : "hiddenDiv", - "EntitlementsFormatted": entitlements.html ?? "No Entitlements", + "EntitlementsWarningHidden": entitlements.hasError ? "" : CLASS_HIDDEN, + "EntitlementsDict": entitlements.html ?? "No Entitlements", ]) } } diff --git a/src/Preview+FileInfo.swift b/src/Preview+FileInfo.swift index aa73fb8..d378091 100644 --- a/src/Preview+FileInfo.swift +++ b/src/Preview+FileInfo.swift @@ -17,16 +17,11 @@ extension PreviewGenerator { /// Process meta information about the file itself. Like file size and last modification. mutating func procFileInfo(_ url: URL) { - let formattedValue : String - if let attrs = try? FileManager.default.attributesOfItem(atPath: url.path) { - let size = ByteCountFormatter.string(fromByteCount: getFileSize(url.path), countStyle: .file) - formattedValue = "\(size), Modified \((attrs[.modificationDate] as! Date).mediumFormat())" - } else { - formattedValue = "" - } + let attrs = try? FileManager.default.attributesOfItem(atPath: url.path) self.apply([ "FileName": escapeXML(url.lastPathComponent), - "FileInfo": formattedValue, + "FileSize": ByteCountFormatter.string(fromByteCount: getFileSize(url.path), countStyle: .file), + "FileModified": (attrs?[.modificationDate] as? Date)?.mediumFormat() ?? "", ]) } } diff --git a/src/Preview+Footer.swift b/src/Preview+Footer.swift index d14d3b9..44d56b4 100644 --- a/src/Preview+Footer.swift +++ b/src/Preview+Footer.swift @@ -7,8 +7,8 @@ extension PreviewGenerator { "SrcAppName": "QLAppBundle", "SrcLinkUrl": "https://github.com/relikd/QLAppBundle", "SrcLinkName": "relikd/QLAppBundle", - "BundleShortVersionString": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "", - "BundleVersion": Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "", + "SrcVersion": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "", + "SrcBuildVer": Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "", ]) #if DEBUG self.data["SrcAppName"]! += " (debug)" diff --git a/src/Preview+Provisioning.swift b/src/Preview+Provisioning.swift index 60f0385..6403831 100644 --- a/src/Preview+Provisioning.swift +++ b/src/Preview+Provisioning.swift @@ -114,7 +114,7 @@ extension PreviewGenerator { /// Process info stored in `embedded.mobileprovision` mutating func procProvision(_ provisionPlist: PlistDict?, isOSX: Bool) { guard let provisionPlist else { - self.apply(["ProvisionHidden": "hiddenDiv"]) + self.apply(["ProvisionHidden": CLASS_HIDDEN]) return } @@ -125,21 +125,21 @@ extension PreviewGenerator { self.apply([ "ProvisionHidden": "", - "ProfileName": provisionPlist["Name"] as? String ?? "", - "ProfileUUID": provisionPlist["UUID"] as? String ?? "", - "TeamName": provisionPlist["TeamName"] as? String ?? "Team name not available", - "TeamIds": (provisionPlist["TeamIdentifier"] as? [String])?.joined(separator: ", ") ?? "Team ID not available", - "CreationDateFormatted": creationDate?.formattedCreationDate() ?? "", - "ExpirationDateFormatted": expireDate?.formattedExpirationDate() ?? "", - "ExpStatus": ExpirationStatus(expireDate).cssClass(), + "ProvisionProfileName": provisionPlist["Name"] as? String ?? "", + "ProvisionProfileId": provisionPlist["UUID"] as? String ?? "", + "ProvisionTeamName": provisionPlist["TeamName"] as? String ?? "Team name not available", + "ProvisionTeamIds": (provisionPlist["TeamIdentifier"] as? [String])?.joined(separator: ", ") ?? "Team ID not available", + "ProvisionCreateDate": creationDate?.formattedCreationDate() ?? "", + "ProvisionExpireDate": expireDate?.formattedExpirationDate() ?? "", + "ProvisionExpireStatus": ExpirationStatus(expireDate).cssClass(), - "ProfilePlatform": isOSX ? "Mac" : "iOS", - "ProfileType": stringForProfileType(provisionPlist, isOSX: isOSX), + "ProvisionProfilePlatform": isOSX ? "Mac" : "iOS", + "ProvisionProfileType": stringForProfileType(provisionPlist, isOSX: isOSX), - "ProvisionedDevicesCount": devices.isEmpty ? "No Devices" : "\(devices.count) Device\(devices.count == 1 ? "" : "s")", - "ProvisionedDevicesFormatted": devices.isEmpty ? "Distribution Profile" : formatAsTable(devices, header: ["", "UDID"]), + "ProvisionDeviceCount": devices.isEmpty ? "No Devices" : "\(devices.count) Device\(devices.count == 1 ? "" : "s")", + "ProvisionDeviceIds": devices.isEmpty ? "Distribution Profile" : formatAsTable(devices, header: ["", "UDID"]), - "DeveloperCertificatesFormatted": certs.isEmpty ? "No Developer Certificates" : formatAsTable(certs), + "ProvisionDevelopCertificates": certs.isEmpty ? "No Developer Certificates" : formatAsTable(certs), ]) } } diff --git a/src/Preview+iTunesPurchase.swift b/src/Preview+iTunesPurchase.swift index 1d9cd0f..08335db 100644 --- a/src/Preview+iTunesPurchase.swift +++ b/src/Preview+iTunesPurchase.swift @@ -35,7 +35,7 @@ extension PreviewGenerator { /// Process info stored in `iTunesMetadata.plist` mutating func procItunesMeta(_ itunesPlist: PlistDict?) { guard let itunesPlist else { - self.apply(["iTunesHidden": "hiddenDiv"]) + self.apply(["iTunesHidden": CLASS_HIDDEN]) return } @@ -57,7 +57,7 @@ extension PreviewGenerator { } self.apply([ "iTunesHidden": "", - "iTunesId": (itunesPlist["itemId"] as? Int)?.description ?? "", // description] + "iTunesId": (itunesPlist["itemId"] as? Int)?.description ?? "", "iTunesName": itunesPlist["itemName"] as? String ?? "", "iTunesGenres": formattedGenres(itunesPlist), "iTunesReleaseDate": releaseDate?.mediumFormat() ?? "", diff --git a/src/PreviewGenerator.swift b/src/PreviewGenerator.swift index adce4b5..8fb771a 100644 --- a/src/PreviewGenerator.swift +++ b/src/PreviewGenerator.swift @@ -1,5 +1,7 @@ import Foundation +let CLASS_HIDDEN = "hiddenDiv" + struct PreviewGenerator { var data: [String: String] = [:] // used for TAG replacements let meta: MetaInfo