fix: html modify instructions in readme

CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project does adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.5.0] – 2025-12-01
+Fixed:
+- `.appex` macOS extensions (`Info.plist` was not found)
+- Removed `.appex` from `ThumbnailProvider` (extension probably dont have icons anyway)
+
+Changed:
+- Template uses `{{X}}` instead of `__X__`
+
+
 ## [1.4.0] – 2025-11-29
 Added:
 - Support for `.apk` files
@@ -43,6 +52,7 @@ Added:
 Initial release
 
 
+[1.5.0]: https://github.com/relikd/QLAppBundle/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/relikd/QLAppBundle/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/relikd/QLAppBundle/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/relikd/QLAppBundle/compare/v1.1.0...v1.2.0

Config.xcconfig

@@ -8,7 +8,7 @@ ENABLE_HARDENED_RUNTIME = YES
 SWIFT_VERSION = 5.0
 
 MACOSX_DEPLOYMENT_TARGET = 10.15
-MARKETING_VERSION = 1.4.0
+MARKETING_VERSION = 1.5.0
 PRODUCT_NAME = QLAppBundle
 PRODUCT_BUNDLE_IDENTIFIER = de.relikd.QLAppBundle
-CURRENT_PROJECT_VERSION = 1930
+CURRENT_PROJECT_VERSION = 2018

QLAppBundle.xcodeproj/project.pbxproj

@@ -9,12 +9,15 @@
 /* Begin PBXBuildFile section */
 		5405CF5E2EA1199B00613856 /* MetaInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5405CF5D2EA1199B00613856 /* MetaInfo.swift */; };
 		5405CF652EA1376B00613856 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5405CF642EA1376B00613856 /* Zip.swift */; };
-		540B77D92ED79BBD009E030C /* MetaInfo+Apk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540B77D82ED79BB2009E030C /* MetaInfo+Apk.swift */; };
+		540B77D92ED79BBD009E030C /* Apk+Manifest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540B77D82ED79BB2009E030C /* Apk+Manifest.swift */; };
-		540B77DA2ED79C6B009E030C /* MetaInfo+Apk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540B77D82ED79BB2009E030C /* MetaInfo+Apk.swift */; };
 		540B77DC2ED79CC1009E030C /* AndroidXML in Frameworks */ = {isa = PBXBuildFile; productRef = 540B77DB2ED79CC1009E030C /* AndroidXML */; };
 		540B77DE2ED79CC8009E030C /* AndroidXML in Frameworks */ = {isa = PBXBuildFile; productRef = 540B77DD2ED79CC8009E030C /* AndroidXML */; };
 		5412DECE2EBC168600F9040D /* Preview+ArchiveInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5412DECD2EBC168600F9040D /* Preview+ArchiveInfo.swift */; };
 		5412DED02EBC283000F9040D /* RuntimeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5412DECF2EBC283000F9040D /* RuntimeError.swift */; };
+		543899082EDCA223007C02FC /* Apk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 543899072EDCA223007C02FC /* Apk.swift */; };
+		543899092EDCA26D007C02FC /* Apk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 543899072EDCA223007C02FC /* Apk.swift */; };
+		5438990B2EDCA27F007C02FC /* Apk+Icon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5438990A2EDCA27F007C02FC /* Apk+Icon.swift */; };
+		5438990E2EDCB126007C02FC /* Apk+Icon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5438990A2EDCA27F007C02FC /* Apk+Icon.swift */; };
 		543FE5742EB3BB5E0059F98B /* AppIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 543FE5732EB3BB5E0059F98B /* AppIcon.icns */; };
 		54442C232E378BAF008A870E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54442C222E378BAF008A870E /* Quartz.framework */; };
 		54442C702E378BDD008A870E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54442C6A2E378BDD008A870E /* AppDelegate.swift */; };
@@ -41,6 +44,12 @@
 		547F52F42EB2CA05002B6D5F /* Preview+Entitlements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547F52F32EB2CA05002B6D5F /* Preview+Entitlements.swift */; };
 		547F52F72EB2CAC7002B6D5F /* Preview+Footer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547F52F62EB2CAC7002B6D5F /* Preview+Footer.swift */; };
 		547F52F92EB2CBAB002B6D5F /* Date+Format.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547F52F82EB2CBAB002B6D5F /* Date+Format.swift */; };
+		54993B882EDB9AA1008B656D /* Plist+Info.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54993B872EDB9A9B008B656D /* Plist+Info.swift */; };
+		54993B8A2EDBA596008B656D /* Plist+Icon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54993B892EDBA596008B656D /* Plist+Icon.swift */; };
+		54993B8B2EDBA75A008B656D /* Plist+Icon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54993B892EDBA596008B656D /* Plist+Icon.swift */; };
+		54993B932EDBB41D008B656D /* Plist+iTunesMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54993B922EDBB419008B656D /* Plist+iTunesMetadata.swift */; };
+		54993B952EDBC819008B656D /* Plist+MobileProvision.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54993B942EDBC813008B656D /* Plist+MobileProvision.swift */; };
+		54993B972EDC7C65008B656D /* Provisioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54993B962EDC7C61008B656D /* Provisioning.swift */; };
 		549E3B9F2EBA9D2500ADFF56 /* QLAppBundle Preview Extension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54442C202E378BAF008A870E /* QLAppBundle Preview Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		549E3BA12EBAE7D300ADFF56 /* URL+File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 549E3BA02EBAE7D300ADFF56 /* URL+File.swift */; };
 		549E3BA22EBAECD400ADFF56 /* URL+File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 549E3BA02EBAE7D300ADFF56 /* URL+File.swift */; };
@@ -52,6 +61,7 @@
 		54B6FFF12EB6AA0F007397C0 /* AssetCarReader.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 54352E8A2EB6A79A0082F61D /* AssetCarReader.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		54B6FFF52EB6AA14007397C0 /* AssetCarReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54352E8A2EB6A79A0082F61D /* AssetCarReader.framework */; };
 		54B6FFF62EB6AA14007397C0 /* AssetCarReader.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 54352E8A2EB6A79A0082F61D /* AssetCarReader.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		54CCF59E2EDC9A6800D766F9 /* AndroidSdkMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CCF59D2EDC9A6800D766F9 /* AndroidSdkMap.swift */; };
 		54D3A6EC2EA31B52001EF4F6 /* AppCategories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54D3A6EB2EA31B52001EF4F6 /* AppCategories.swift */; };
 		54D3A6EE2EA39CC6001EF4F6 /* AppIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54D3A6ED2EA39CC6001EF4F6 /* AppIcon.swift */; };
 		54D3A6F02EA3F49F001EF4F6 /* NSBezierPath+RoundedRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54D3A6EF2EA3F49F001EF4F6 /* NSBezierPath+RoundedRect.swift */; };
@@ -130,10 +140,12 @@
 /* Begin PBXFileReference section */
 		5405CF5D2EA1199B00613856 /* MetaInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaInfo.swift; sourceTree = "<group>"; };
 		5405CF642EA1376B00613856 /* Zip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Zip.swift; sourceTree = "<group>"; };
-		540B77D82ED79BB2009E030C /* MetaInfo+Apk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MetaInfo+Apk.swift"; sourceTree = "<group>"; };
+		540B77D82ED79BB2009E030C /* Apk+Manifest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Apk+Manifest.swift"; sourceTree = "<group>"; };
 		5412DECD2EBC168600F9040D /* Preview+ArchiveInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preview+ArchiveInfo.swift"; sourceTree = "<group>"; };
 		5412DECF2EBC283000F9040D /* RuntimeError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimeError.swift; sourceTree = "<group>"; };
 		54352E8A2EB6A79A0082F61D /* AssetCarReader.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AssetCarReader.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		543899072EDCA223007C02FC /* Apk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Apk.swift; sourceTree = "<group>"; };
+		5438990A2EDCA27F007C02FC /* Apk+Icon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Apk+Icon.swift"; sourceTree = "<group>"; };
 		543FE5732EB3BB5E0059F98B /* AppIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon.icns; sourceTree = "<group>"; };
 		543FE5752EB3BC740059F98B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		54442BF42E378B71008A870E /* QLAppBundle (debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "QLAppBundle (debug).app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -160,12 +172,18 @@
 		547F52F82EB2CBAB002B6D5F /* Date+Format.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Format.swift"; sourceTree = "<group>"; };
 		547F52FB2EB37F10002B6D5F /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		547F52FC2EB37F3A002B6D5F /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
+		54993B872EDB9A9B008B656D /* Plist+Info.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Plist+Info.swift"; sourceTree = "<group>"; };
+		54993B892EDBA596008B656D /* Plist+Icon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Plist+Icon.swift"; sourceTree = "<group>"; };
+		54993B922EDBB419008B656D /* Plist+iTunesMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Plist+iTunesMetadata.swift"; sourceTree = "<group>"; };
+		54993B942EDBC813008B656D /* Plist+MobileProvision.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Plist+MobileProvision.swift"; sourceTree = "<group>"; };
+		54993B962EDC7C61008B656D /* Provisioning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Provisioning.swift; sourceTree = "<group>"; };
 		549E3B9E2EBA8FDA00ADFF56 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		549E3BA02EBAE7D300ADFF56 /* URL+File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+File.swift"; sourceTree = "<group>"; };
 		549E3BA32EBC021500ADFF56 /* Preview+TransportSecurity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preview+TransportSecurity.swift"; sourceTree = "<group>"; };
 		54AE5BFB2EB3DB1000B4CFC7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		54AE5BFD2EB3DB1000B4CFC7 /* ThumbnailProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailProvider.swift; sourceTree = "<group>"; };
 		54B6FFEC2EB6A847007397C0 /* AssetCarReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetCarReader.swift; sourceTree = "<group>"; };
+		54CCF59D2EDC9A6800D766F9 /* AndroidSdkMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AndroidSdkMap.swift; sourceTree = "<group>"; };
 		54D3A6EB2EA31B52001EF4F6 /* AppCategories.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCategories.swift; sourceTree = "<group>"; };
 		54D3A6ED2EA39CC6001EF4F6 /* AppIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIcon.swift; sourceTree = "<group>"; };
 		54D3A6EF2EA3F49F001EF4F6 /* NSBezierPath+RoundedRect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBezierPath+RoundedRect.swift"; sourceTree = "<group>"; };
@@ -221,13 +239,20 @@
 		541051562E37AFC10083670B /* src */ = {
 			isa = PBXGroup;
 			children = (
-				5405CF5D2EA1199B00613856 /* MetaInfo.swift */,
+				543899122EDD0F38007C02FC /* Common */,
-				540B77D82ED79BB2009E030C /* MetaInfo+Apk.swift */,
+				543899112EDD0EE2007C02FC /* Data - Android */,
+				543899102EDD0ED1007C02FC /* Data - Apple */,
+				5438990F2EDD0EA1007C02FC /* Preview */,
+			);
+			path = src;
+			sourceTree = "<group>";
+		};
+		5438990F2EDD0EA1007C02FC /* Preview */ = {
+			isa = PBXGroup;
+			children = (
 				5412DECF2EBC283000F9040D /* RuntimeError.swift */,
-				54D3A6EB2EA31B52001EF4F6 /* AppCategories.swift */,
-				54D3A6ED2EA39CC6001EF4F6 /* AppIcon.swift */,
-				5469E11C2EA5930C00D46CE7 /* Entitlements.swift */,
 				547F52DC2EB2C15D002B6D5F /* ExpirationStatus.swift */,
+				547F52F82EB2CBAB002B6D5F /* Date+Format.swift */,
 				547F52E62EB2C41C002B6D5F /* PreviewGenerator.swift */,
 				547F52EC2EB2C822002B6D5F /* Preview+AppInfo.swift */,
 				5412DECD2EBC168600F9040D /* Preview+ArchiveInfo.swift */,
@@ -237,12 +262,45 @@
 				547F52EE2EB2C8E8002B6D5F /* Preview+Provisioning.swift */,
 				547F52E92EB2C672002B6D5F /* Preview+FileInfo.swift */,
 				547F52F62EB2CAC7002B6D5F /* Preview+Footer.swift */,
-				5405CF642EA1376B00613856 /* Zip.swift */,
+			);
+			path = Preview;
+			sourceTree = "<group>";
+		};
+		543899102EDD0ED1007C02FC /* Data - Apple */ = {
+			isa = PBXGroup;
+			children = (
+				54D3A6EB2EA31B52001EF4F6 /* AppCategories.swift */,
+				54993B892EDBA596008B656D /* Plist+Icon.swift */,
+				54993B872EDB9A9B008B656D /* Plist+Info.swift */,
+				54993B922EDBB419008B656D /* Plist+iTunesMetadata.swift */,
+				54993B942EDBC813008B656D /* Plist+MobileProvision.swift */,
+				54993B962EDC7C61008B656D /* Provisioning.swift */,
+				5469E11C2EA5930C00D46CE7 /* Entitlements.swift */,
+			);
+			path = "Data - Apple";
+			sourceTree = "<group>";
+		};
+		543899112EDD0EE2007C02FC /* Data - Android */ = {
+			isa = PBXGroup;
+			children = (
+				54CCF59D2EDC9A6800D766F9 /* AndroidSdkMap.swift */,
+				543899072EDCA223007C02FC /* Apk.swift */,
+				5438990A2EDCA27F007C02FC /* Apk+Icon.swift */,
+				540B77D82ED79BB2009E030C /* Apk+Manifest.swift */,
+			);
+			path = "Data - Android";
+			sourceTree = "<group>";
+		};
+		543899122EDD0F38007C02FC /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				5405CF5D2EA1199B00613856 /* MetaInfo.swift */,
+				54D3A6ED2EA39CC6001EF4F6 /* AppIcon.swift */,
 				549E3BA02EBAE7D300ADFF56 /* URL+File.swift */,
 				54D3A6EF2EA3F49F001EF4F6 /* NSBezierPath+RoundedRect.swift */,
-				547F52F82EB2CBAB002B6D5F /* Date+Format.swift */,
+				5405CF642EA1376B00613856 /* Zip.swift */,
 			);
-			path = src;
+			path = Common;
 			sourceTree = "<group>";
 		};
 		54442BEB2E378B71008A870E = {
@@ -547,25 +605,33 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				543899082EDCA223007C02FC /* Apk.swift in Sources */,
 				549E3BA42EBC021500ADFF56 /* Preview+TransportSecurity.swift in Sources */,
 				5412DECE2EBC168600F9040D /* Preview+ArchiveInfo.swift in Sources */,
 				54D3A6F02EA3F49F001EF4F6 /* NSBezierPath+RoundedRect.swift in Sources */,
 				547F52E42EB2C3D8002B6D5F /* Preview+iTunesPurchase.swift in Sources */,
 				547F52F72EB2CAC7002B6D5F /* Preview+Footer.swift in Sources */,
+				54993B8A2EDBA596008B656D /* Plist+Icon.swift in Sources */,
+				54993B972EDC7C65008B656D /* Provisioning.swift in Sources */,
 				5469E11D2EA5930C00D46CE7 /* Entitlements.swift in Sources */,
 				54442C792E378BE0008A870E /* PreviewViewController.swift in Sources */,
 				547F52EF2EB2C8E8002B6D5F /* Preview+Provisioning.swift in Sources */,
 				547F52DE2EB2C15D002B6D5F /* ExpirationStatus.swift in Sources */,
 				54D3A6EE2EA39CC6001EF4F6 /* AppIcon.swift in Sources */,
+				54993B952EDBC819008B656D /* Plist+MobileProvision.swift in Sources */,
 				547F52E82EB2C41C002B6D5F /* PreviewGenerator.swift in Sources */,
+				54993B882EDB9AA1008B656D /* Plist+Info.swift in Sources */,
+				5438990B2EDCA27F007C02FC /* Apk+Icon.swift in Sources */,
 				547F52EB2EB2C672002B6D5F /* Preview+FileInfo.swift in Sources */,
+				54CCF59E2EDC9A6800D766F9 /* AndroidSdkMap.swift in Sources */,
 				547F52ED2EB2C822002B6D5F /* Preview+AppInfo.swift in Sources */,
 				549E3BA12EBAE7D300ADFF56 /* URL+File.swift in Sources */,
 				547F52F42EB2CA05002B6D5F /* Preview+Entitlements.swift in Sources */,
-				540B77D92ED79BBD009E030C /* MetaInfo+Apk.swift in Sources */,
+				540B77D92ED79BBD009E030C /* Apk+Manifest.swift in Sources */,
 				5405CF5E2EA1199B00613856 /* MetaInfo.swift in Sources */,
 				547F52F92EB2CBAB002B6D5F /* Date+Format.swift in Sources */,
 				54D3A6EC2EA31B52001EF4F6 /* AppCategories.swift in Sources */,
+				54993B932EDBB41D008B656D /* Plist+iTunesMetadata.swift in Sources */,
 				5405CF652EA1376B00613856 /* Zip.swift in Sources */,
 				5412DED02EBC283000F9040D /* RuntimeError.swift in Sources */,
 			);
@@ -579,9 +645,11 @@
 				547899722EB38F3D00F96B80 /* MetaInfo.swift in Sources */,
 				547899732EB38F3D00F96B80 /* NSBezierPath+RoundedRect.swift in Sources */,
 				54AE5BFF2EB3DB1000B4CFC7 /* ThumbnailProvider.swift in Sources */,
+				543899092EDCA26D007C02FC /* Apk.swift in Sources */,
 				549E3BA22EBAECD400ADFF56 /* URL+File.swift in Sources */,
 				547899752EB38F3D00F96B80 /* AppIcon.swift in Sources */,
-				540B77DA2ED79C6B009E030C /* MetaInfo+Apk.swift in Sources */,
+				54993B8B2EDBA75A008B656D /* Plist+Icon.swift in Sources */,
+				5438990E2EDCB126007C02FC /* Apk+Icon.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

QLThumbnail/Info.plist

@@ -9,7 +9,6 @@
 			<key>QLSupportedContentTypes</key>
 			<array>
 				<string>com.apple.itunes.ipa</string>
-				<string>com.apple.application-and-system-extension</string>
 				<string>com.apple.xcode.archive</string>
 				<string>com.opa334.trollstore.tipa</string>
 				<string>dyn.ah62d4rv4ge81k4puqe</string>

README.md

@@ -37,10 +37,11 @@ Also, I've removed support for provisioning profiles (`.mobileprovision`, `.prov
 ### Customize HTML / CSS
 
 1. Right click on the app and select "Show Package Contents"
-2. Copy `Contents/Resources/template.html` (or `style.css`)
+2. Go to `PlugIns` and repeat "Show Package Contents" on the Preview extension.
-3. Open `~/Library/Containers/de.relikd.QLAppBundle.Preview/Data/Documents/`
+3. Copy `Contents/Resources/template.html` (or `style.css`)
-4. Paste the previous file and modify it to your liking
+4. Open `~/Library/Containers/de.relikd.QLAppBundle.Preview/Data/Documents/`
-5. `QLAppBundle` will use the new file from now on
+5. Paste the previous file and modify it to your liking
+6. `QLAppBundle` will use the new file from now on
 
 
 

resources/template.html

@@ -2,100 +2,100 @@
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-	<style>__CSS__</style>
+	<style>{{CSS}}</style>
 </head>
 <body>
-	<h1>__QuickLookTitle__</h1>
+	<h1>{{QuickLookTitle}}</h1>
 	
-	<div class="app __AppInfoHidden__">
+	<div class="app {{AppInfoHidden}}">
-		<div class="floatLeft icon"><img alt="App icon" src="data:image/png;base64,__AppIcon__"/></div>
+		<div class="floatLeft icon"><img alt="App icon" src="data:image/png;base64,{{AppIcon}}"/></div>
 		<div class="floatLeft info">
-			Name: <strong>__AppName__</strong><br />
+			Name: <strong>{{AppName}}</strong><br />
-			Version: __AppVersion__ (__AppBuildVer__)<br />
+			Version: {{AppVersion}} ({{AppBuildVer}})<br />
-			BundleId: __AppId__<br />
+			BundleId: {{AppId}}<br />
-			<div class="__AppExtensionTypeHidden__">
+			<div class="{{AppExtensionTypeHidden}}">
-				Extension type: __AppExtensionType__<br />
+				Extension type: {{AppExtensionType}}<br />
 			</div>
-			DeviceFamily: __AppDeviceFamily__<br />
+			DeviceFamily: {{AppDeviceFamily}}<br />
-			SDK: __AppSDK__<br />
+			SDK: {{AppSDK}}<br />
-			Minimum OS Version: __AppMinOS__<br />
+			Minimum OS Version: {{AppMinOS}}<br />
 		</div>
 		<br class="clear" />
 	</div>
 	
-	<div class="not-__AppInfoHidden__">
+	<div class="not-{{AppInfoHidden}}">
 		Could not find any Info.plist
 	</div>
 	
-	<div class="__ArchiveHidden__">
+	<div class="{{ArchiveHidden}}">
 		<h2>Archive Notes</h2>
-		<pre>__ArchiveComment__</pre>
+		<pre>{{ArchiveComment}}</pre>
 	</div>
 	
-	<div class="__iTunesHidden__">
+	<div class="{{iTunesHidden}}">
 		<h2>iTunes Metadata</h2>
-		iTunesId: __iTunesId__<br />
+		iTunesId: {{iTunesId}}<br />
-		Title: __iTunesName__<br />
+		Title: {{iTunesName}}<br />
-		Genres: __iTunesGenres__<br />
+		Genres: {{iTunesGenres}}<br />
-		Released: __iTunesReleaseDate__<br />
+		Released: {{iTunesReleaseDate}}<br />
 		<br />
-		AppleId: __iTunesAppleId__<br />
+		AppleId: {{iTunesAppleId}}<br />
-		Purchased: __iTunesPurchaseDate__<br />
+		Purchased: {{iTunesPurchaseDate}}<br />
-		Price: __iTunesPrice__<br />
+		Price: {{iTunesPrice}}<br />
 	</div>
 	
-	<div class="__TransportSecurityHidden__">
+	<div class="{{TransportSecurityHidden}}">
 		<h2>App Transport Security</h2>
-		__TransportSecurityDict__
+		{{TransportSecurityDict}}
 	</div>
 	
-	<div class="__EntitlementsHidden__">
+	<div class="{{EntitlementsHidden}}">
 		<h2>Entitlements</h2>
-		<div class="warning __EntitlementsWarningHidden__">
+		<div class="warning {{EntitlementsWarningHidden}}">
 			<strong>Entitlements extraction failed.</strong>
 		</div>
-		__EntitlementsDict__
+		{{EntitlementsDict}}
 	</div>
 	
-	<div class="__ProvisionHidden__">
+	<div class="{{ProvisionHidden}}">
 		<h2>Provisioning</h2>
-		Profile name: <strong>__ProvisionProfileName__</strong><br />
+		Profile name: <strong>{{ProvisionProfileName}}</strong><br />
-		Profile UUID: __ProvisionProfileId__<br />
+		Profile UUID: {{ProvisionProfileId}}<br />
-		Profile Type: __ProvisionProfilePlatform__ __ProvisionProfileType__<br />
+		Profile Type: {{ProvisionProfilePlatform}} {{ProvisionProfileType}}<br />
-		Team: __ProvisionTeamName__ (__ProvisionTeamIds__)<br />
+		Team: {{ProvisionTeamName}} ({{ProvisionTeamIds}})<br />
-		Creation date: __ProvisionCreateDate__<br />
+		Creation date: {{ProvisionCreateDate}}<br />
-		Expiration Date: <strong><span class="__ProvisionExpireStatus__">__ProvisionExpireDate__</span></strong><br />
+		Expiration Date: <strong><span class="{{ProvisionExpireStatus}}">{{ProvisionExpireDate}}</span></strong><br />
 		
 		<h2>Developer Certificates</h2>
-		__ProvisionDevelopCertificates__
+		{{ProvisionDevelopCertificates}}
 		
-		<h2>Devices (__ProvisionDeviceCount__)</h2>
+		<h2>Devices ({{ProvisionDeviceCount}})</h2>
-		__ProvisionDeviceIds__
+		{{ProvisionDeviceIds}}
 	</div>
 	
-	<div class="__ApkFeaturesRequiredHidden__">
+	<div class="{{ApkFeaturesRequiredHidden}}">
 		<h2>Features (required)</h2>
-		__ApkFeaturesRequiredList__
+		{{ApkFeaturesRequiredList}}
 	</div>
 	
-	<div class="__ApkFeaturesOptionalHidden__">
+	<div class="{{ApkFeaturesOptionalHidden}}">
 		<h2>Features (optional)</h2>
-		__ApkFeaturesOptionalList__
+		{{ApkFeaturesOptionalList}}
 	</div>
 	
-	<div class="__ApkPermissionsHidden__">
+	<div class="{{ApkPermissionsHidden}}">
 		<h2>Permissions</h2>
-		__ApkPermissionsList__
+		{{ApkPermissionsList}}
 	</div>
 	
 	<div>
 		<h2>File info</h2>
-		__FileName__<br />
+		{{FileName}}<br />
-		__FileSize__, Modified __FileModified__<br />
+		{{FileSize}}, Modified {{FileModified}}<br />
 	</div>
 	
 	<div class="footer">
-		<p>__SrcAppName__ v__SrcVersion__ (__SrcBuildVer__) (Github: <a href="__SrcLinkUrl__">__SrcLinkName__</a>)</p>
+		<p>{{SrcAppName}} v{{SrcVersion}} ({{SrcBuildVer}}) (Github: <a href="{{SrcLinkUrl}}">{{SrcLinkName}}</a>)</p>
 	</div>
 </body>
 </html>

src/Common/AppIcon.swift

@@ -17,15 +17,15 @@ struct AppIcon {
 	func extractImageForThumbnail() -> NSImage {
 		switch meta.type {
 		case .IPA, .Archive, .Extension:
-			extractImage(from: meta.readPlistApp())
+			extractImage(from: meta.readPlist_Icon()?.filenames)
 		case .APK:
-			extractImage(from: meta.readApkIconOnly())
+			extractImage(from: meta.readApk_Icon())
 		}
 	}
 	
 	/// Extract image from Android app bundle.
-	func extractImage(from manifest: ApkManifest?) -> NSImage {
+	func extractImage(from apkIcon: Apk_Icon?) -> NSImage {
-		if let data = manifest?.appIconData, let img = NSImage(data: data) {
+		if let data = apkIcon?.data, let img = NSImage(data: data) {
 			return img
 		}
 		return defaultIcon()
@@ -33,7 +33,7 @@ struct AppIcon {
 	
 	/// Try multiple methods to extract image.
 	/// This method will always return an image even if none is found, in which case it returns the default image.
-	func extractImage(from appPlist: PlistDict?) -> NSImage {
+	func extractImage(from plistIcons: [String]?) -> NSImage {
 		// no need to unwrap the plist, and most .ipa should include the Artwork anyway
 		if meta.type == .IPA {
 			if let data = meta.zipFile!.unzipFile("iTunesArtwork") {
@@ -44,7 +44,7 @@ struct AppIcon {
 		}
 		
 		// Extract image name from app plist
-		var plistImgNames = (appPlist == nil) ? [] : iconNamesFromPlist(appPlist!)
+		var plistImgNames = plistIcons ?? []
 		os_log(.debug, log: log, "[icon] icon names in plist: %{public}@", plistImgNames)
 		
 		// If no previous filename works (or empty), try default icon names
@@ -90,33 +90,6 @@ struct AppIcon {
 // MARK: - Plist
 
 extension AppIcon {
-	/// Parse app plist to find the bundle icon filename.
-	/// @param appPlist If `nil`, will load plist on the fly (used for thumbnail)
-	/// @return Filenames which do not necessarily exist on filesystem. This may include `@2x` and/or no file extension.
-	private func iconNamesFromPlist(_ appPlist: PlistDict) -> [String] {
-		// Check for CFBundleIcons (since 5.0)
-		if let icons = unpackNameListFromPlistDict(appPlist["CFBundleIcons"]), !icons.isEmpty {
-			return icons
-		}
-		// iPad-only apps
-		if let icons = unpackNameListFromPlistDict(appPlist["CFBundleIcons~ipad"]), !icons.isEmpty {
-			return icons
-		}
-		// Check for CFBundleIconFiles (since 3.2)
-		if let icons = appPlist["CFBundleIconFiles"] as? [String], !icons.isEmpty {
-			return icons
-		}
-		// key found on iTunesU app
-		if let icons = appPlist["Icon files"] as? [String], !icons.isEmpty {
-			return icons
-		}
-		// Check for CFBundleIconFile (legacy, before 3.2)
-		if let icon = appPlist["CFBundleIconFile"] as? String { // may be nil
-			return [icon]
-		}
-		return []
-	}
-	
 	/// Given a filename, search Bundle or Filesystem for files that match. Select the filename with the highest resolution.
 	private func expandImageName(_ iconList: [String]) -> String? {
 		var matches: [String] = []
@@ -162,21 +135,6 @@ extension AppIcon {
 		return matches.isEmpty ? nil : sortedByResolution(matches).first
 	}
 
-	/// Deep select icons from plist key `CFBundleIcons` and `CFBundleIcons~ipad`
-	private func unpackNameListFromPlistDict(_ bundleDict: Any?) -> [String]? {
-		if let bundleDict = bundleDict as? PlistDict {
-			if let primaryDict = bundleDict["CFBundlePrimaryIcon"] as? PlistDict {
-				if let icons = primaryDict["CFBundleIconFiles"] as? [String] {
-					return icons
-				}
-				if let name = primaryDict["CFBundleIconName"] as? String { // key found on a .tipa file
-					return [name]
-				}
-			}
-		}
-		return nil
-	}
-
 	/// @return lower index means higher resolution.
 	private func resolutionIndex(_ iconName: String) -> Int {
 		let lower = iconName.lowercased()

src/Common/MetaInfo.swift

@@ -47,6 +47,10 @@ struct MetaInfo {
 			}
 		case "com.apple.application-and-system-extension":
 			self.type = FileType.Extension
+			if let bundleDir = recursiveSearchInfoPlist(url) {
+				isOSX = bundleDir.appendingPathComponent("MacOS").exists() && bundleDir.lastPathComponent == "Contents"
+				effective = bundleDir
+			}
 		case "com.google.android.apk", "dyn.ah62d4rv4ge80c6dp" /* apk */, "public.archive.apk", "dyn.ah62d4rv4ge80c6dpry" /* apkm */:
 			self.type = FileType.APK
 			zipFile = ZipFile(self.url.path)
@@ -85,16 +89,6 @@ struct MetaInfo {
 			return try? Data(contentsOf: self.effectiveUrl(osxSubdir, filename))
 		}
 	}
-	
-	/// Read app default `Info.plist`. (used for both, Preview and Thumbnail)
-	func readPlistApp() -> PlistDict? {
-		switch self.type {
-		case .IPA, .Archive, .Extension:
-			return self.readPayloadFile("Info.plist", osxSubdir: nil)?.asPlistOrNil()
-		case .APK:
-			return nil // not applicable for Android
-		}
-	}
 }
 
 

src/Data - Android/AndroidSdkMap.swift

@@ -0,0 +1,45 @@
+// see https://developer.android.com/guide/topics/manifest/uses-sdk-element#api-level-table
+
+let AndroidSdkMap: [Int: String] = [
+	1: "1.0",
+	2: "1.1",
+	3: "1.5",
+	4: "1.6",
+	5: "2.0",
+	6: "2.0.1",
+	7: "2.1.x",
+	8: "2.2.x",
+	9: "2.3, 2.3.1, 2.3.2",
+	10: "2.3.3, 2.3.4",
+	11: "3.0.x",
+	12: "3.1.x",
+	13: "3.2",
+	14: "4.0, 4.0.1, 4.0.2",
+	15: "4.0.3, 4.0.4",
+	16: "4.1, 4.1.1",
+	17: "4.2, 4.2.2",
+	18: "4.3",
+	19: "4.4",
+	20: "4.4W",
+	21: "5.0",
+	22: "5.1",
+	23: "6.0",
+	24: "7.0",
+	25: "7.1, 7.1.1",
+	26: "8.0",
+	27: "8.1",
+	28: "9",
+	29: "10",
+	30: "11",
+	31: "12",
+	32: "12",
+	33: "13",
+	34: "14",
+	35: "15",
+	36: "16",
+	// can we assume new versions will stick to this scheme?
+	37: "17",
+	38: "18",
+	39: "19",
+	40: "20",
+]

src/Data - Android/Apk+Icon.swift

@@ -0,0 +1,74 @@
+import Foundation
+import AndroidXML
+
+extension MetaInfo {
+	/// Read `AndroidManifest.xml` but only extract `appIcon`.
+	func readApk_Icon() -> Apk_Icon? {
+		assert(type == .APK)
+		var apk = Apk(self)
+		return Apk_Icon(&apk)
+	}
+}
+
+
+// MARK: - Apk_Icon
+
+/// Representation of `AndroidManifest.xml` (containing only the icon extractor).
+/// Seperate from main class because everything else is not needed for `ThumbnailProvider`
+struct Apk_Icon {
+	let path: String
+	let data: Data
+	
+	init?(_ apk: inout Apk, iconRef: String? = nil) {
+		if apk.isApkm, let iconData = apk.mainZip.unzipFile("icon.png") {
+			path = "icon.png"
+			data = iconData
+			return
+		}
+		
+		guard let manifest = apk.manifest else {
+			return nil
+		}
+		
+		var ref = iconRef
+		// no need to parse xml if reference already supplied
+		if ref == nil {
+			if let xml = try? AndroidXML.init(data: manifest) {
+				let parser = xml.parseXml()
+				try? parser.iterElements({ startTag, attributes in
+					if startTag == "application" {
+						ref = try? attributes.get("android:icon")?.resolve(parser.stringPool)
+					}
+				}) {_ in}
+			} else {
+				// fallback to xml-string parser
+				ref = ApkXmlIconParser().run(manifest)
+			}
+		}
+		
+		guard let img = apk.resolveIcon(&ref) else {
+			return nil
+		}
+		path = ref!
+		data = img
+	}
+}
+
+/// Shorter form of `ApkXmlManifestParser` to only exctract the icon reference (used for Thumbnail Provider)
+private class ApkXmlIconParser: NSObject, XMLParserDelegate {
+	var result: String? = nil
+	
+	func run(_ data: Data) -> String? {
+		let parser = XMLParser(data: data)
+		parser.delegate = self
+		parser.parse()
+		return result
+	}
+	
+	func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attrs: [String : String] = [:]) {
+		if elementName == "application" {
+			result = attrs["android:icon"]
+			parser.abortParsing()
+		}
+	}
+}

src/Data - Android/Apk+Manifest.swift

@@ -0,0 +1,123 @@
+import Foundation
+import AndroidXML
+
+extension MetaInfo {
+	/// Read `AndroidManifest.xml` and parse its content
+	func readApk_Manifest() -> Apk_Manifest? {
+		assert(type == .APK)
+		var apk = Apk(self)
+		return Apk_Manifest.from(&apk)
+	}
+}
+
+
+// MARK: - Apk_Manifest
+
+/// Representation of `AndroidManifest.xml`.
+/// See: <https://developer.android.com/guide/topics/manifest/manifest-element>
+struct Apk_Manifest {
+	var packageId: String? = nil
+	var appName: String? = nil
+	var icon: Apk_Icon? = nil
+	/// Computed property
+	var appIconData: Data? = nil
+	var versionName: String? = nil
+	var versionCode: String? = nil
+	var sdkVerMin: Int? = nil
+	var sdkVerTarget: Int? = nil
+	
+	var featuresRequired: [String] = []
+	var featuresOptional: [String] = []
+	var permissions: [String] = []
+	
+	static func from(_ apk: inout Apk) -> Self? {
+		guard let manifest = apk.manifest else {
+			return nil
+		}
+		
+		let storage = ApkXmlManifestParser()
+		if let xml = try? AndroidXML.init(data: manifest) {
+			let parser = xml.parseXml()
+			let ignore = XMLParser()
+			try? parser.iterElements({ startTag, attributes in
+				if ALLOWED_TAGS.contains(startTag) {
+					storage.parser(ignore, didStartElement: startTag, namespaceURI: nil, qualifiedName: nil, attributes: try attributes.asDictStr())
+				}
+			}) { endTag in
+				if ALLOWED_TAGS.contains(endTag) {
+					storage.parser(ignore, didEndElement: endTag, namespaceURI: nil, qualifiedName: nil)
+				}
+			}
+		} else {
+			// fallback to xml-string parser
+			let parser = XMLParser(data: manifest)
+			parser.delegate = storage
+			parser.parse()
+		}
+		
+		var rv = storage.result
+		apk.resolveName(&rv.appName)
+		rv.icon = Apk_Icon(&apk, iconRef: storage.iconRef)
+		return rv
+	}
+}
+
+// keep in sync with `ApkXmlManifestParser` below
+private let ALLOWED_TAGS = [
+	"manifest",
+	"application",
+	"uses-feature",
+	"uses-permission",
+	"uses-permission-sdk-23",
+	"uses-sdk",
+]
+
+/// Wrapper to use same code for binary-xml and string-xml parsing
+private class ApkXmlManifestParser: NSObject, XMLParserDelegate {
+	private var _scope: [String] = []
+	var result = Apk_Manifest()
+	var iconRef: String? = nil
+	
+	func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attrs: [String : String] = [:]) {
+		// keep in sync with `ALLOWED_TAGS` above
+		switch elementName {
+		case "manifest":
+			if _scope == [] {
+				result.packageId = attrs["package"] // "org.bundle.id"
+				result.versionName = attrs["android:versionName"] // "7.62.3"
+				result.versionCode = attrs["android:versionCode"] // "160700"
+				// attrs["platformBuildVersionCode"] // "35"
+				// attrs["platformBuildVersionName"] // "15"
+			}
+		case "application":
+			if _scope == ["manifest"] {
+				result.appName = attrs["android:label"] // @resource-ref
+				iconRef = attrs["android:icon"] // @resource-ref
+			}
+		case "uses-permission", "uses-permission-sdk-23":
+			// no "permission" because that will produce duplicates with "uses-permission"
+			if _scope == ["manifest"], let name = attrs["android:name"] {
+				result.permissions.append(name)
+			}
+		case "uses-feature":
+			if _scope == ["manifest"], let name = attrs["android:name"] {
+				if attrs["android:required"] == "false" {
+					result.featuresOptional.append(name)
+				} else {
+					result.featuresRequired.append(name)
+				}
+			}
+		case "uses-sdk":
+			if _scope == ["manifest"] {
+				result.sdkVerMin = Int(attrs["android:minSdkVersion"] ?? "1") // "21"
+				result.sdkVerTarget = Int(attrs["android:targetSdkVersion"] ?? "-1") // "35"
+			}
+		default: break // ignore
+		}
+		_scope.append(elementName)
+	}
+	
+	func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
+		_scope.removeLast()
+	}
+}

src/Data - Android/Apk.swift

@@ -0,0 +1,130 @@
+import Foundation
+import AndroidXML
+
+/// Data structure for processing the content of `.apk` files.
+struct Apk {
+	let isApkm: Bool
+	let mainZip: ZipFile
+	
+	init(_ meta: MetaInfo) {
+		isApkm = meta.url.pathExtension.lowercased() == "apkm"
+		mainZip = meta.zipFile!
+	}
+	
+	/// Unzip `AndroidManifest.xml` (once). Data is cached until deconstructor.
+	lazy var manifest: Data? = { effectiveZip?.unzipFile("AndroidManifest.xml") }()
+	
+	/// Select zip-file depending on `.apk` or `.apkm` extension
+	private lazy var effectiveZip: ZipFile? = { isApkm ? nestedZip : mainZip }()
+	
+	/// `.apkm` may contain multiple `.apk` files. (plus "icon.png" and "info.json" files)
+	private lazy var nestedZip: ZipFile? = {
+		if isApkm, let pth = try? mainZip.unzipFileToTempDir("base.apk") {
+			return ZipFile(pth)
+		}
+		return nil
+	}()
+	
+	/// Shared instance for resolving resources
+	private lazy var resourceParser: Tbl_Parser? = {
+		guard let data = effectiveZip?.unzipFile("resources.arsc"),
+			  let xml = try? AndroidXML.init(data: data), xml.type == .Table else {
+			return nil
+		}
+		return xml.parseTable()
+	}()
+	
+	/// Lookup app bundle name / label
+	mutating func resolveName(_ name: inout String?) {
+		if let val = name, let ref = try? TblTableRef(val), let parser = resourceParser {
+			name = parser.getName(ref)
+		}
+	}
+	
+	/// Lookup image path and image data
+	mutating func resolveIcon(_ iconRef: inout String?) -> Data? {
+		if let val = iconRef, let ref = try? TblTableRef(val), let parser = resourceParser {
+			if let iconPath = parser.getIconDirect(ref) ?? parser.getIconIndirect(ref) {
+				iconRef = iconPath
+				return effectiveZip?.unzipFile(iconPath)
+			}
+		}
+		return nil
+	}
+}
+
+
+private extension Tbl_Parser {
+	func getName(_ ref: TblTableRef) -> String? {
+		// why the heck are these even allowed?
+		// apparently there can be references onto references
+		var ref = ref
+		while let res = try? self.getResource(ref) {
+			guard let val = res.entries.first?.entry.value else {
+				return nil
+			}
+			switch val.dataType {
+			case .Reference: ref = val.asTableRef // and continue
+			case .String: return val.resolve(self.stringPool)
+			default: return nil
+			}
+		}
+		return nil
+	}
+	
+	/// Lookup resource with matching id. Choose the icon with the highest density.
+	func getIconDirect(_ ref: TblTableRef) -> String? {
+		guard let res = try? self.getResource(ref) else {
+			return nil
+		}
+		var best: ResValue? = nil
+		var bestScore: UInt16 = 0
+		for e in res.entries {
+			switch e.config.screenType.density {
+			case .Default, .any, .None: continue
+			case let density:
+				if density.rawValue > bestScore, let val = e.entry.value {
+					bestScore = density.rawValue
+					best = val
+				}
+			}
+		}
+		return best?.resolve(self.stringPool)
+	}
+	
+	/// Iterate over all entries and choose best-rated icon file.
+	/// Rating prefers files which have an attribute name `"app_icon"` or `"ic_launcher"`.
+	func getIconIndirect(_ ref: TblTableRef) -> String? {
+		// sadly we cannot just `getResource()` because that can point to an app banner
+		guard let pkg = try? self.getPackage(ref.package),
+			  var pool = pkg.stringPool(for: .Keys),
+			  let (_, types) = try? pkg.getType(ref.type) else {
+			return nil
+		}
+		// density is 120-640
+		let rates: [String: UInt16] = [
+			"app_icon": 1000,
+			"ic_launcher": 800,
+			"ic_launcher_foreground": 200,
+		]
+		var best: ResValue? = nil
+		var bestScore: UInt16 = 0
+		for typ in types {
+			switch typ.config.screenType.density {
+			case .any, .None: continue
+			case let density:
+				try? typ.iterValues {
+					if let val = $1.value {
+						let attrName = pool.getStringCached($1.key)
+						let score = density.rawValue + (rates[attrName] ?? 0)
+						if score > bestScore {
+							bestScore = score
+							best = val
+						}
+					}
+				}
+			}
+		}
+		return best?.resolve(self.stringPool)
+	}
+}

src/Data - Apple/AppCategories.swift

@@ -1,5 +1,3 @@
-import Foundation
-
 /*
  #!/usr/bin/env python3
  # download: https://itunes.apple.com/WebObjects/MZStoreServices.woa/ws/genres

src/Data - Apple/Plist+Icon.swift

@@ -0,0 +1,65 @@
+
+extension MetaInfo {
+	/// Read `Info.plist`. (used for `ThumbnailProvider`)
+	func readPlist_Icon() -> Plist_Icon? {
+		if let x = self.readPayloadFile("Info.plist", osxSubdir: nil)?.asPlistOrNil() {
+			return Plist_Icon(x)
+		}
+		return nil
+	}
+}
+
+
+// MARK: - Plist_Icon
+
+/// Representation of `Info.plist` (containing only the icon extractor).
+/// Seperate from main class because everything else is not needed for `ThumbnailProvider`
+struct Plist_Icon {
+	let filenames: [String]
+	
+	init(_ plist: PlistDict) {
+		filenames = parseIconNames(plist)
+	}
+}
+
+/// Find icon filenames.
+/// @return Filenames which do not necessarily exist on filesystem. This may include `@2x` and/or no file extension.
+private func parseIconNames(_ plist: PlistDict) -> [String] {
+	// Check for CFBundleIcons (since 5.0)
+	if let icons = unpackNameList(plist["CFBundleIcons"]) {
+		return icons
+	}
+	// iPad-only apps
+	if let icons = unpackNameList(plist["CFBundleIcons~ipad"]) {
+		return icons
+	}
+	// Check for CFBundleIconFiles (since 3.2)
+	if let icons = plist["CFBundleIconFiles"] as? [String], !icons.isEmpty {
+		return icons
+	}
+	// key found on iTunesU app
+	if let icons = plist["Icon files"] as? [String], !icons.isEmpty {
+		return icons
+	}
+	// Check for CFBundleIconFile (legacy, before 3.2)
+	if let icon = plist["CFBundleIconFile"] as? String { // may be nil
+		return [icon]
+	}
+	return []
+}
+
+/// Deep select icons from plist key `CFBundleIcons` and `CFBundleIcons~ipad`
+/// @return Guarantees a non-empty array (or `nil`)
+private func unpackNameList(_ bundleDict: Any?) -> [String]? {
+	if let bundleDict = bundleDict as? PlistDict {
+		if let primaryDict = bundleDict["CFBundlePrimaryIcon"] as? PlistDict {
+			if let icons = primaryDict["CFBundleIconFiles"] as? [String], !icons.isEmpty {
+				return icons
+			}
+			if let name = primaryDict["CFBundleIconName"] as? String { // key found on a .tipa file
+				return [name]
+			}
+		}
+	}
+	return nil
+}

src/Data - Apple/Plist+Info.swift

@@ -0,0 +1,70 @@
+import Foundation
+
+extension MetaInfo {
+	/// Read `Info.plist`. (used for `PreviewProvider`)
+	func readPlist_Info() -> Plist_Info? {
+		if let x = self.readPayloadFile("Info.plist", osxSubdir: nil)?.asPlistOrNil() {
+			return Plist_Info(x, isOSX: isOSX)
+		}
+		return nil
+	}
+}
+
+
+// MARK: - Plist_Info
+
+/// Representation of `Info.plist` of an `.ipa` bundle
+struct Plist_Info {
+	let bundleId: String?
+	let name: String?
+	let version: String?
+	let buildVersion: String?
+	
+	let exePath: String?
+	let sdkVersion: String?
+	let minOS: String?
+	let extensionType: String?
+	
+	let icons: [String]
+	let deviceFamily: [String]
+	let transportSecurity: PlistDict?
+	
+	init(_ plist: PlistDict, isOSX: Bool) {
+		bundleId = plist["CFBundleIdentifier"] as? String
+		name = plist["CFBundleDisplayName"] as? String ?? plist["CFBundleName"] as? String
+		version = plist["CFBundleShortVersionString"] as? String
+		buildVersion = plist["CFBundleVersion"] as? String
+		exePath = plist["CFBundleExecutable"] as? String
+		sdkVersion = plist["DTSDKName"] as? String
+		minOS = plist[isOSX ? "LSMinimumSystemVersion" : "MinimumOSVersion"] as? String
+		extensionType = (plist["NSExtension"] as? PlistDict)?["NSExtensionPointIdentifier"] as? String
+		icons = Plist_Icon(plist).filenames
+		deviceFamily = parseDeviceFamily(plist, isOSX: isOSX)
+		transportSecurity = plist["NSAppTransportSecurity"] as? PlistDict
+	}
+}
+
+private func parseDeviceFamily(_ plist: PlistDict, isOSX: Bool) -> [String] {
+	if isOSX {
+		return plist["CFBundleSupportedPlatforms"] as? [String] ?? ["macOS"]
+	}
+	
+	if let platforms = (plist["UIDeviceFamily"] as? [Int])?.compactMap({
+		switch $0 {
+		case 1: "iPhone"
+		case 2: "iPad"
+		case 3: "TV"
+		case 4: "Watch"
+		default: nil
+		}
+	}), platforms.count > 0 {
+		return platforms
+	}
+	
+	if let minVersion = plist["MinimumOSVersion"] as? String {
+		if minVersion.hasPrefix("1.") || minVersion.hasPrefix("2.") || minVersion.hasPrefix("3.") {
+			return ["iPhone"]
+		}
+	}
+	return []
+}

src/Data - Apple/Plist+MobileProvision.swift

@@ -0,0 +1,61 @@
+import Foundation
+
+extension MetaInfo {
+	/// Read `embedded.mobileprovision` (if available) and decode with CMS decoder.
+	func readPlist_MobileProvision() -> Plist_MobileProvision? {
+		guard let provisionData = self.readPayloadFile("embedded.mobileprovision", osxSubdir: nil),
+			  let plist = provisionData.decodeCMS().asPlistOrNil() else {
+			return nil
+		}
+		return Plist_MobileProvision(plist, isOSX: self.isOSX)
+	}
+}
+
+// MARK: - Plist_MobileProvision
+
+/// Representation of `embedded.mobileprovision`
+struct Plist_MobileProvision {
+	let creationDate: Date?
+	let expireDate: Date?
+	let profileId: String?
+	let profileName: String?
+	/// Something like "Development" or "Distribution (App Store)".
+	let profileType: String
+	/// Either "Mac" or "iOS"
+	let profilePlatform: String
+	let teamName: String?
+	let teamIds: [String]
+	let devices: [String]
+	let certificates: [ProvisioningCertificate]
+	let entitlements: PlistDict?
+	
+	init(_ plist: PlistDict, isOSX: Bool) {
+		creationDate = plist["CreationDate"] as? Date
+		expireDate = plist["ExpirationDate"] as? Date
+		profileId = plist["UUID"] as? String
+		profileName = plist["Name"] as? String
+		profileType = parseProfileType(plist, isOSX: isOSX)
+		profilePlatform = isOSX ? "Mac" : "iOS"
+		teamName = plist["TeamName"] as? String
+		teamIds = plist["TeamIdentifier"] as? [String] ?? []
+		devices = plist["ProvisionedDevices"] as? [String] ?? []
+		certificates = (plist["DeveloperCertificates"] as? [Data] ?? []).compactMap {
+			ProvisioningCertificate($0)
+		}
+		entitlements = plist["Entitlements"] as? PlistDict
+	}
+}
+
+/// Returns provision type string like "Development" or "Distribution (App Store)".
+private func parseProfileType(_ plist: PlistDict, isOSX: Bool) -> String {
+	let hasDevices = plist["ProvisionedDevices"] is [Any]
+	if isOSX {
+		return hasDevices ? "Development" : "Distribution (App Store)"
+	}
+	if hasDevices {
+		let getTaskAllow = (plist["Entitlements"] as? PlistDict)?["get-task-allow"] as? Bool ?? false
+		return getTaskAllow ? "Development" : "Distribution (Ad Hoc)"
+	}
+	let isEnterprise = plist["ProvisionsAllDevices"] as? Bool ?? false
+	return isEnterprise ? "Enterprise" : "Distribution (App Store)"
+}

src/Data - Apple/Plist+iTunesMetadata.swift

@@ -0,0 +1,77 @@
+import Foundation
+
+extension MetaInfo {
+	/// Read `iTunesMetadata.plist` (if available)
+	func readPlist_iTunesMetadata() -> Plist_iTunesMetadata? {
+		assert(type == .IPA)
+		// not `readPayloadFile` because plist is in root dir
+		guard let plist = self.zipFile!.unzipFile("iTunesMetadata.plist")?.asPlistOrNil() else {
+			return nil
+		}
+		return Plist_iTunesMetadata(plist)
+	}
+}
+
+
+// MARK: - Plist_iTunesMetadata
+
+/// Representation of `iTunesMetadata.plist`
+struct Plist_iTunesMetadata {
+	let appId: Int?
+	let appName: String?
+	let price: String?
+	let genres: [String]
+	// purchase info
+	let releaseDate: Date?
+	let purchaseDate: Date?
+	// account info
+	let appleId: String?
+	let firstName: String?
+	let lastName: String?
+	
+	init(_ plist: PlistDict) {
+		appId = plist["itemId"] as? Int
+		appName = plist["itemName"] as? String
+		price = plist["priceDisplay"] as? String
+		genres = formattedGenres(plist)
+		// download info
+		let downloadInfo = plist["com.apple.iTunesStore.downloadInfo"] as? PlistDict
+		purchaseDate = Date.parseAny(downloadInfo?["purchaseDate"] ?? plist["purchaseDate"])
+		releaseDate = Date.parseAny(downloadInfo?["releaseDate"] ?? plist["releaseDate"])
+		// AppleId & purchaser name
+		let accountInfo = downloadInfo?["accountInfo"] as? PlistDict ?? [:]
+		appleId = accountInfo["AppleID"] as? String ?? plist["appleId"] as? String
+		firstName = accountInfo["FirstName"] as? String
+		lastName = accountInfo["LastName"] as? String
+	}
+	
+	/// Returns `"<firstName> <lastName> (<appleId>)"` (with empty values omitted)
+	var purchaserName: String? {
+		let fn = firstName ?? ""
+		let ln = lastName ?? ""
+		let aid = appleId ?? ""
+		switch (fn.isEmpty, ln.isEmpty, aid.isEmpty) {
+		case (true, true, true): return nil
+		case (true, true, false): return "\(aid)"
+		case (_, _, false): return "\(fn) \(ln) (\(aid))"
+		case (_, _, true): return "\(fn) \(ln)"
+		}
+	}
+}
+
+/// Concatenate all (sub)genres into flat list.
+private func formattedGenres(_ plist: PlistDict) -> [String] {
+	var genres: [String] = []
+	let genreId = plist["genreId"] as? Int ?? 0
+	if let mainGenre = AppCategories[genreId] ?? plist["genre"] as? String {
+		genres.append(mainGenre)
+	}
+	
+	for subgenre in plist["subgenres"] as? [PlistDict] ?? [] {
+		let subgenreId = subgenre["genreId"] as? Int ?? 0
+		if let subgenreStr = AppCategories[subgenreId] ?? subgenre["genre"] as? String {
+			genres.append(subgenreStr)
+		}
+	}
+	return genres
+}

src/Data - Apple/Provisioning.swift

@@ -0,0 +1,58 @@
+import Foundation
+import os // OSLog
+
+private let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Provisioning")
+
+extension Data {
+	/// In-memory decode of `embedded.mobileprovision`
+	func decodeCMS() -> Data {
+		var decoder: CMSDecoder? = nil
+		CMSDecoderCreate(&decoder)
+		return self.withUnsafeBytes { ptr in
+			CMSDecoderUpdateMessage(decoder!, ptr.baseAddress!, self.count)
+			CMSDecoderFinalizeMessage(decoder!)
+			var dataRef: CFData?
+			CMSDecoderCopyContent(decoder!, &dataRef)
+			return Data(referencing: dataRef!)
+		}
+	}
+}
+
+struct ProvisioningCertificate {
+	let subject: String
+	let expiration: Date?
+	
+	/// Parse subject and expiration date from certificate.
+	init?(_ data: Data) {
+		guard let cert = SecCertificateCreateWithData(nil, data as CFData) else {
+			return nil
+		}
+		guard let subj = SecCertificateCopySubjectSummary(cert) as? String else {
+			os_log(.error, log: log, "Could not get subject from certificate")
+			return nil
+		}
+		subject = subj
+		expiration = parseInvalidityDate(cert, subject: subj)
+	}
+}
+
+/// Process a single certificate. Extract invalidity / expiration date.
+/// @param subject just used for printing error logs.
+private func parseInvalidityDate(_ certificate: SecCertificate, subject: String) -> Date? {
+	var error: Unmanaged<CFError>?
+	guard let outerDict = SecCertificateCopyValues(certificate, [kSecOIDInvalidityDate] as CFArray, &error) as? PlistDict else {
+		os_log(.error, log: log, "Could not get values in '%{public}@' certificate, error = %{public}@", subject, error?.takeUnretainedValue().localizedDescription ?? "unknown error")
+		return nil
+	}
+	guard let innerDict = outerDict[kSecOIDInvalidityDate as String] as? PlistDict else {
+		os_log(.error, log: log, "No invalidity values in '%{public}@' certificate, dictionary = %{public}@", subject, outerDict)
+		return nil
+	}
+	// NOTE: the invalidity date type of kSecPropertyTypeDate is documented as a CFStringRef in the "Certificate, Key, and Trust Services Reference".
+	// In reality, it's a __NSTaggedDate (presumably a tagged pointer representing an NSDate.) But to be sure, we'll check:
+	guard let dateString = innerDict[kSecPropertyKeyValue as String] else {
+		os_log(.error, log: log, "No invalidity date in '%{public}@' certificate, dictionary = %{public}@", subject, innerDict)
+		return nil
+	}
+	return Date.parseAny(dateString)
+}

src/MetaInfo+Apk.swift

@@ -1,287 +0,0 @@
-import Foundation
-import AndroidXML
-import os // OSLog
-
-private let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "MetaInfo+Apk")
-
-/// Representation of `AndroidManifest.xml`
-struct ApkManifest {
-	var packageId: String? = nil
-	var appName: String? = nil
-	var appIcon: String? = nil
-	/// Computed property
-	var appIconData: Data? = nil
-	var versionName: String? = nil
-	var versionCode: String? = nil
-	var sdkVerMin: String? = nil
-	var sdkVerTarget: String? = nil
-	
-	var featuresRequired: [String] = []
-	var featuresOptional: [String] = []
-	var permissions: [String] = []
-}
-
-
-// MARK: - Full Manifest
-
-extension MetaInfo {
-	/// `(true, <nested-apk>)` -- if extension is `.apkm`.
-	/// `(false, zipFile!)` -- if extension is `.apk`.
-	private func effectiveApk() -> (Bool, ZipFile) {
-		// .apkm may contain multiple .apk files. (plus "icon.png" and "info.json" files)
-		if self.url.pathExtension.lowercased() == "apkm" {
-			if let pth = try? zipFile!.unzipFileToTempDir("base.apk") {
-				return (true, ZipFile(pth))
-			}
-		}
-		// .apk (and derivatives) have their contents structured directly in zip
-		return (false, zipFile!)
-	}
-	
-	/// Extract `AndroidManifest.xml` and parse its content
-	func readApkManifest() -> ApkManifest? {
-		assert(type == .APK)
-		let (isApkm, nestedZip) = effectiveApk()
-		guard let data = nestedZip.unzipFile("AndroidManifest.xml") else {
-			return nil
-		}
-		let storage = ApkXmlManifestParser()
-		if let xml = try? AndroidXML.init(data: data) {
-			let ALLOWED_TAGS = [ // keep in sync with `ApkXmlManifestParser`
-				"manifest",
-				"application",
-				"uses-feature",
-				"uses-permission",
-				"uses-permission-sdk-23",
-				"uses-sdk",
-			]
-			let parser = xml.parseXml()
-			let ignore = XMLParser()
-			try? parser.iterElements({ startTag, attributes in
-				if ALLOWED_TAGS.contains(startTag) {
-					storage.parser(ignore, didStartElement: startTag, namespaceURI: nil, qualifiedName: nil, attributes: try attributes.asDictStr())
-				}
-			}) { endTag in
-				if ALLOWED_TAGS.contains(endTag) {
-					storage.parser(ignore, didEndElement: endTag, namespaceURI: nil, qualifiedName: nil)
-				}
-			}
-		} else {
-			// fallback to xml-string parser
-			let parser = XMLParser(data: data)
-			parser.delegate = storage
-			parser.parse()
-		}
-		
-		var rv = storage.result
-		// if apkm can load png, prefer that over xml-parsing
-		if isApkm, let iconData = zipFile!.unzipFile("icon.png") {
-			rv.appIcon = nil
-			rv.appIconData = iconData
-		}
-		os_log(.debug, log: log, "[apk] resolving %{public}@", String(describing: rv))
-		rv.resolve(nestedZip)
-		os_log(.debug, log: log, "[apk] resolved name: \"%{public}@\" icon: %{public}@", rv.appName ?? "", rv.appIcon ?? "-")
-		return rv
-	}
-}
-
-/// Wrapper to use same code for binary-xml and string-xml parsing
-private class ApkXmlManifestParser: NSObject, XMLParserDelegate {
-	private var _scope: [String] = []
-	var result = ApkManifest()
-	
-	func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attrs: [String : String] = [:]) {
-		// keep in sync with ALLOWED_TAGS above
-		switch elementName {
-		case "manifest":
-			if _scope == [] {
-				result.packageId = attrs["package"] // "org.bundle.id"
-				result.versionName = attrs["android:versionName"] // "7.62.3"
-				result.versionCode = attrs["android:versionCode"] // "160700"
-				// attrs["platformBuildVersionCode"] // "35"
-				// attrs["platformBuildVersionName"] // "15"
-			}
-		case "application":
-			if _scope == ["manifest"] {
-				result.appName = attrs["android:label"] // @resource-ref
-				result.appIcon = attrs["android:icon"] // @resource-ref
-			}
-		case "uses-permission", "uses-permission-sdk-23":
-			// no "permission" because that will produce duplicates with "uses-permission"
-			if _scope == ["manifest"], let name = attrs["android:name"] {
-				result.permissions.append(name)
-			}
-		case "uses-feature":
-			if _scope == ["manifest"], let name = attrs["android:name"] {
-				if attrs["android:required"] == "false" {
-					result.featuresOptional.append(name)
-				} else {
-					result.featuresRequired.append(name)
-				}
-			}
-		case "uses-sdk":
-			if _scope == ["manifest"] {
-				result.sdkVerMin = attrs["android:minSdkVersion"] ?? "1" // "21"
-				result.sdkVerTarget = attrs["android:targetSdkVersion"] // "35"
-			}
-		default: break // ignore
-		}
-		_scope.append(elementName)
-	}
-	
-	func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
-		_scope.removeLast()
-	}
-}
-
-
-// MARK: - Icon only
-
-extension MetaInfo {
-	/// Same as `readApkManifest()`  but only extract `appIcon`.
-	func readApkIconOnly() -> ApkManifest? {
-		assert(type == .APK)
-		var rv = ApkManifest()
-		let (isApkm, nestedZip) = effectiveApk()
-		if isApkm, let iconData = zipFile!.unzipFile("icon.png") {
-			rv.appIcon = "icon.png"
-			rv.appIconData = iconData
-			return rv
-		}
-		guard let data = nestedZip.unzipFile("AndroidManifest.xml") else {
-			return nil
-		}
-		if let xml = try? AndroidXML.init(data: data) {
-			let parser = xml.parseXml()
-			try? parser.iterElements({ startTag, attributes in
-				if startTag == "application" {
-					rv.appIcon = try? attributes.get("android:icon")?.resolve(parser.stringPool)
-				}
-			}) {_ in}
-		} else {
-			// fallback to xml-string parser
-			rv.appIcon = ApkXmlIconParser().run(data)
-		}
-		rv.resolve(nestedZip)
-		return rv
-	}
-}
-
-/// Shorter form of `ApkXmlManifestParser` to only exctract the icon reference (used for Thumbnail Provider)
-private class ApkXmlIconParser: NSObject, XMLParserDelegate {
-	var result: String? = nil
-	
-	func run(_ data: Data) -> String? {
-		let parser = XMLParser(data: data)
-		parser.delegate = self
-		parser.parse()
-		return result
-	}
-	
-	func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attrs: [String : String] = [:]) {
-		if elementName == "application" {
-			result = attrs["android:icon"]
-			parser.abortParsing()
-		}
-	}
-}
-
-
-// MARK: - Resolve resource
-
-private extension ApkManifest {
-	/// Reuse `ZipFile` from previous call because that may be an already unpacked `base.apk`
-	mutating func resolve(_ zip: ZipFile) {
-		guard let data = zip.unzipFile("resources.arsc"),
-			  let xml = try? AndroidXML.init(data: data), xml.type == .Table else {
-			return
-		}
-		
-		let parser = xml.parseTable()
-		if let val = appName, let ref = try? TblTableRef(val) {
-			appName = parser.getName(ref)
-		}
-		if let val = appIcon, let ref = try? TblTableRef(val) {
-			if let iconPath = parser.getIconDirect(ref) ?? parser.getIconIndirect(ref) {
-				appIcon = iconPath
-				appIconData = zip.unzipFile(iconPath)
-			}
-		}
-	}
-}
-
-private extension Tbl_Parser {
-	func getName(_ ref: TblTableRef) -> String? {
-		// why the heck are these even allowed?
-		// apparently there can be references onto references
-		var ref = ref
-		while let res = try? self.getResource(ref) {
-			guard let val = res.entries.first?.entry.value else {
-				return nil
-			}
-			switch val.dataType {
-			case .Reference: ref = val.asTableRef // and continue
-			case .String: return val.resolve(self.stringPool)
-			default: return nil
-			}
-		}
-		return nil
-	}
-	
-	/// Lookup resource with matching id. Choose the icon with the highest density.
-	func getIconDirect(_ ref: TblTableRef) -> String? {
-		guard let res = try? self.getResource(ref) else {
-			return nil
-		}
-		var best: ResValue? = nil
-		var bestScore: UInt16 = 0
-		for e in res.entries {
-			switch e.config.screenType.density {
-			case .Default, .any, .None: continue
-			case let density:
-				if density.rawValue > bestScore, let val = e.entry.value {
-					bestScore = density.rawValue
-					best = val
-				}
-			}
-		}
-		return best?.resolve(self.stringPool)
-	}
-	
-	/// Iterate over all entries and choose best-rated icon file.
-	/// Rating prefers files which have an attribute name `"app_icon"` or `"ic_launcher"`.
-	func getIconIndirect(_ ref: TblTableRef) -> String? {
-		// sadly we cannot just `getResource()` because that can point to an app banner
-		guard let pkg = try? self.getPackage(ref.package),
-			  var pool = pkg.stringPool(for: .Keys),
-			  let (_, types) = try? pkg.getType(ref.type) else {
-			return nil
-		}
-		// density is 120-640
-		let rates: [String: UInt16] = [
-			"app_icon": 1000,
-			"ic_launcher": 800,
-			"ic_launcher_foreground": 200,
-		]
-		var best: ResValue? = nil
-		var bestScore: UInt16 = 0
-		for typ in types {
-			switch typ.config.screenType.density {
-			case .any, .None: continue
-			case let density:
-				try? typ.iterValues {
-					if let val = $1.value {
-						let attrName = pool.getStringCached($1.key)
-						let score = density.rawValue + (rates[attrName] ?? 0)
-						if score > bestScore {
-							bestScore = score
-							best = val
-						}
-					}
-				}
-			}
-		}
-		return best?.resolve(self.stringPool)
-	}
-}

src/Preview+AppInfo.swift

@@ -1,122 +0,0 @@
-import Foundation
-
-extension PreviewGenerator {
-	private func deviceFamilyList(_ appPlist: PlistDict, isOSX: Bool) -> String {
-		if isOSX {
-			return (appPlist["CFBundleSupportedPlatforms"] as? [String])?.joined(separator: ", ") ?? "macOS"
-		}
-		let platforms = (appPlist["UIDeviceFamily"] as? [Int])?.compactMap({
-			switch $0 {
-			case 1: return "iPhone"
-			case 2: return "iPad"
-			case 3: return "TV"
-			case 4: return "Watch"
-			default: return nil
-			}
-		}).joined(separator: ", ")
-		
-		let minVersion = appPlist["MinimumOSVersion"] as? String ?? ""
-		if platforms?.isEmpty ?? true, minVersion.hasPrefix("1.") || minVersion.hasPrefix("2.") || minVersion.hasPrefix("3.") {
-			return "iPhone"
-		}
-		return platforms ?? ""
-	}
-	
-	/// Process info stored in `Info.plist`
-	mutating func procAppInfoApple(_ appPlist: PlistDict, isOSX: Bool) {
-		let minVersion = appPlist[isOSX ? "LSMinimumSystemVersion" : "MinimumOSVersion"] as? String ?? ""
-		
-		let extensionType = (appPlist["NSExtension"] as? PlistDict)?["NSExtensionPointIdentifier"] as? String
-		self.apply([
-			"AppInfoHidden": CLASS_VISIBLE,
-			"AppName": appPlist["CFBundleDisplayName"] as? String ?? appPlist["CFBundleName"] as? String ?? "",
-			"AppVersion": appPlist["CFBundleShortVersionString"] as? String ?? "",
-			"AppBuildVer": appPlist["CFBundleVersion"] as? String ?? "",
-			"AppId": appPlist["CFBundleIdentifier"] as? String ?? "",
-			
-			"AppExtensionTypeHidden": extensionType != nil ? CLASS_VISIBLE : CLASS_HIDDEN,
-			"AppExtensionType": extensionType ?? "",
-			
-			"AppDeviceFamily": deviceFamilyList(appPlist, isOSX: isOSX),
-			"AppSDK": appPlist["DTSDKName"] as? String ?? "",
-			"AppMinOS": minVersion,
-		])
-	}
-	
-	/// Process info stored in `Info.plist`
-	mutating func procAppInfoAndroid(_ manifest: ApkManifest) {
-		let featReq = manifest.featuresRequired
-		let featOpt = manifest.featuresOptional
-		let perms = manifest.permissions
-		
-		func asList(_ list: [String]) -> String {
-			"<pre>\(list.joined(separator: "\n"))</pre>"
-		}
-		
-		func resolveSDK(_ sdk: String?) -> String {
-			sdk == nil ? "" : "\(sdk!) (Android \(ANDROID_SDK_MAP[sdk!] ?? "?"))"
-		}
-		self.apply([
-			"AppInfoHidden": CLASS_VISIBLE,
-			"AppName": manifest.appName ?? "",
-			"AppVersion": manifest.versionName ?? "",
-			"AppBuildVer": manifest.versionCode ?? "",
-			"AppId": manifest.packageId ?? "",
-			
-			"ApkFeaturesRequiredHidden": featReq.isEmpty ? CLASS_HIDDEN : CLASS_VISIBLE,
-			"ApkFeaturesRequiredList": asList(featReq),
-			"ApkFeaturesOptionalHidden": featOpt.isEmpty ? CLASS_HIDDEN : CLASS_VISIBLE,
-			"ApkFeaturesOptionalList": asList(featOpt),
-			"ApkPermissionsHidden": perms.isEmpty ? CLASS_HIDDEN : CLASS_VISIBLE,
-			"ApkPermissionsList": asList(perms),
-			
-			"AppDeviceFamily": "Android",
-			"AppSDK": resolveSDK(manifest.sdkVerTarget),
-			"AppMinOS": resolveSDK(manifest.sdkVerMin),
-		])
-	}
-}
-
-private let ANDROID_SDK_MAP: [String: String] = [
-	"1": "1.0",
-	"2": "1.1",
-	"3": "1.5",
-	"4": "1.6",
-	"5": "2.0",
-	"6": "2.0.1",
-	"7": "2.1.x",
-	"8": "2.2.x",
-	"9": "2.3, 2.3.1, 2.3.2",
-	"10": "2.3.3, 2.3.4",
-	"11": "3.0.x",
-	"12": "3.1.x",
-	"13": "3.2",
-	"14": "4.0, 4.0.1, 4.0.2",
-	"15": "4.0.3, 4.0.4",
-	"16": "4.1, 4.1.1",
-	"17": "4.2, 4.2.2",
-	"18": "4.3",
-	"19": "4.4",
-	"20": "4.4W",
-	"21": "5.0",
-	"22": "5.1",
-	"23": "6.0",
-	"24": "7.0",
-	"25": "7.1, 7.1.1",
-	"26": "8.0",
-	"27": "8.1",
-	"28": "9",
-	"29": "10",
-	"30": "11",
-	"31": "12",
-	"32": "12",
-	"33": "13",
-	"34": "14",
-	"35": "15",
-	"36": "16",
-	// can we assume new versions will stick to this scheme?
-	"37": "17",
-	"38": "18",
-	"39": "19",
-	"40": "20",
-]

src/Preview+Provisioning.swift

@@ -1,159 +0,0 @@
-import Foundation
-import os // OSLog
-
-private let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Html+Certificates")
-
-
-extension MetaInfo {
-	/// Read `embedded.mobileprovision` file and decode with CMS decoder.
-	func readPlistProvision() -> PlistDict? {
-		guard let provisionData = self.readPayloadFile("embedded.mobileprovision", osxSubdir: nil) else {
-			os_log(.info, log: log, "No embedded.mobileprovision file for %{public}@", self.url.path)
-			return nil
-		}
-		
-		var decoder: CMSDecoder? = nil
-		CMSDecoderCreate(&decoder)
-		let data = provisionData.withUnsafeBytes { ptr in
-			CMSDecoderUpdateMessage(decoder!, ptr.baseAddress!, provisionData.count)
-			CMSDecoderFinalizeMessage(decoder!)
-			var dataRef: CFData?
-			CMSDecoderCopyContent(decoder!, &dataRef)
-			return Data(referencing: dataRef!)
-		}
-		return data.asPlistOrNil()
-	}
-}
-
-
-extension PreviewGenerator {
-	
-	// MARK: - Certificates
-	
-	/// Process a single certificate. Extract invalidity / expiration date.
-	/// @param subject just used for printing error logs.
-	private func getCertificateInvalidityDate(_ certificate: SecCertificate, subject: String) -> Date? {
-		var error: Unmanaged<CFError>?
-		guard let outerDict = SecCertificateCopyValues(certificate, [kSecOIDInvalidityDate] as CFArray, &error) as? PlistDict else {
-			os_log(.error, log: log, "Could not get values in '%{public}@' certificate, error = %{public}@", subject, error?.takeUnretainedValue().localizedDescription ?? "unknown error")
-			return nil
-		}
-		guard let innerDict = outerDict[kSecOIDInvalidityDate as String] as? PlistDict else {
-			os_log(.error, log: log, "No invalidity values in '%{public}@' certificate, dictionary = %{public}@", subject, outerDict)
-			return nil
-		}
-		// NOTE: the invalidity date type of kSecPropertyTypeDate is documented as a CFStringRef in the "Certificate, Key, and Trust Services Reference".
-		// In reality, it's a __NSTaggedDate (presumably a tagged pointer representing an NSDate.) But to be sure, we'll check:
-		guard let dateString = innerDict[kSecPropertyKeyValue as String] else {
-			os_log(.error, log: log, "No invalidity date in '%{public}@' certificate, dictionary = %{public}@", subject, innerDict)
-			return nil
-		}
-		return Date.parseAny(dateString)
-	}
-	
-	/// Process list of all certificates. Return a two column table with subject and expiration date.
-	private func getCertificateList(_ provisionPlist: PlistDict) -> [TableRow] {
-		guard let certs = provisionPlist["DeveloperCertificates"] as? [Data] else {
-			return []
-		}
-		return certs.compactMap {
-			guard let cert = SecCertificateCreateWithData(nil, $0 as CFData) else {
-				return nil
-			}
-			guard let subject = SecCertificateCopySubjectSummary(cert) as? String else {
-				os_log(.error, log: log, "Could not get subject from certificate")
-				return nil
-			}
-			let expiration: String
-			if let invalidityDate = getCertificateInvalidityDate(cert, subject: subject) {
-				expiration = invalidityDate.relativeExpirationDateString()
-			} else {
-				expiration = "<span class='warning'>No invalidity date in certificate</span>"
-			}
-			return TableRow([subject, expiration])
-		}.sorted { $0[0] < $1[0] }
-	}
-	
-	
-	// MARK: - Provisioning
-
-	/// Returns provision type string like "Development" or "Distribution (App Store)".
-	private func stringForProfileType(_ provisionPlist: PlistDict, isOSX: Bool) -> String {
-		let hasDevices = provisionPlist["ProvisionedDevices"] is [Any]
-		if isOSX {
-			return hasDevices ? "Development" : "Distribution (App Store)"
-		}
-		if hasDevices {
-			let getTaskAllow = (provisionPlist["Entitlements"] as? PlistDict)?["get-task-allow"] as? Bool ?? false
-			return getTaskAllow ? "Development" : "Distribution (Ad Hoc)"
-		}
-		let isEnterprise = provisionPlist["ProvisionsAllDevices"] as? Bool ?? false
-		return isEnterprise ? "Enterprise" : "Distribution (App Store)"
-	}
-	
-	/// Enumerate all entries from provison plist with key `ProvisionedDevices`
-	private func getDeviceList(_ provisionPlist: PlistDict) -> [TableRow] {
-		guard let devArr = provisionPlist["ProvisionedDevices"] as? [String] else {
-			return []
-		}
-		var currentPrefix: String? = nil
-		return devArr.sorted().map { device in
-			// compute the prefix for the first column of the table
-			let displayPrefix: String
-			let devicePrefix = String(device.prefix(1))
-			if currentPrefix != devicePrefix {
-				currentPrefix = devicePrefix
-				displayPrefix = "\(devicePrefix) ➞ "
-			} else {
-				displayPrefix = ""
-			}
-			return [displayPrefix, device]
-		}
-	}
-	
-	/// Process info stored in `embedded.mobileprovision`
-	mutating func procProvision(_ provisionPlist: PlistDict?, isOSX: Bool) {
-		guard let provisionPlist else {
-			return
-		}
-		
-		let creationDate = provisionPlist["CreationDate"] as? Date
-		let expireDate = provisionPlist["ExpirationDate"] as? Date
-		let devices = getDeviceList(provisionPlist)
-		let certs = getCertificateList(provisionPlist)
-		
-		self.apply([
-			"ProvisionHidden": CLASS_VISIBLE,
-			"ProvisionProfileName": provisionPlist["Name"] as? String ?? "",
-			"ProvisionProfileId": provisionPlist["UUID"] as? String ?? "",
-			"ProvisionTeamName": provisionPlist["TeamName"] as? String ?? "<em>Team name not available</em>",
-			"ProvisionTeamIds": (provisionPlist["TeamIdentifier"] as? [String])?.joined(separator: ", ") ?? "<em>Team ID not available</em>",
-			"ProvisionCreateDate": creationDate?.formattedCreationDate() ?? "",
-			"ProvisionExpireDate": expireDate?.formattedExpirationDate() ?? "",
-			"ProvisionExpireStatus": ExpirationStatus(expireDate).cssClass(),
-			
-			"ProvisionProfilePlatform": isOSX ? "Mac" : "iOS",
-			"ProvisionProfileType": stringForProfileType(provisionPlist, isOSX: isOSX),
-			
-			"ProvisionDeviceCount": devices.isEmpty ? "No Devices" : "\(devices.count) Device\(devices.count == 1 ? "" : "s")",
-			"ProvisionDeviceIds": devices.isEmpty ? "Distribution Profile" : formatAsTable(devices, header: ["", "UDID"]),
-			
-			"ProvisionDevelopCertificates": certs.isEmpty ? "No Developer Certificates" : formatAsTable(certs),
-		])
-	}
-}
-
-private typealias TableRow = [String]
-
-/// Print html table with arbitrary number of columns
-/// @param header If set, start the table with a `tr` column row.
-private func formatAsTable(_ data: [[String]], header: TableRow? = nil) -> String {
-	var table = "<table>\n"
-	if let header = header {
-		table += "<tr><th>\(header.joined(separator: "</th><th>"))</th></tr>\n"
-	}
-	for row in data {
-		table += "<tr><td>\(row.joined(separator: "</td><td>"))</td></tr>\n"
-	}
-	return table + "</table>\n"
-}

src/Preview+iTunesPurchase.swift

@@ -1,69 +0,0 @@
-import Foundation
-
-extension MetaInfo {	
-	/// Read `iTunesMetadata.plist` if available
-	func readPlistItunes() -> PlistDict? {
-		switch self.type {
-		case .IPA:
-			// not `readPayloadFile` because plist is in root dir
-			return self.zipFile!.unzipFile("iTunesMetadata.plist")?.asPlistOrNil()
-		case .Archive, .Extension, .APK:
-			return nil
-		}
-	}
-}
-
-
-extension PreviewGenerator {
-	/// Concatenate all (sub)genres into a comma separated list.
-	private func formattedGenres(_ itunesPlist: PlistDict) -> String {
-		var genres: [String] = []
-		let genreId = itunesPlist["genreId"] as? Int ?? 0
-		if let mainGenre = AppCategories[genreId] ?? itunesPlist["genre"] as? String {
-			genres.append(mainGenre)
-		}
-		
-		for subgenre in itunesPlist["subgenres"] as? [PlistDict] ?? [] {
-			let subgenreId = subgenre["genreId"] as? Int ?? 0
-			if let subgenreStr = AppCategories[subgenreId] ?? subgenre["genre"] as? String {
-				genres.append(subgenreStr)
-			}
-		}
-		return genres.joined(separator: ", ")
-	}
-	
-	/// Process info stored in `iTunesMetadata.plist`
-	mutating func procItunesMeta(_ itunesPlist: PlistDict?) {
-		guard let itunesPlist else {
-			return
-		}
-		
-		let downloadInfo = itunesPlist["com.apple.iTunesStore.downloadInfo"] as? PlistDict
-		let accountInfo = downloadInfo?["accountInfo"] as? PlistDict ?? [:]
-		
-		let purchaseDate = Date.parseAny(downloadInfo?["purchaseDate"] ?? itunesPlist["purchaseDate"])
-		let releaseDate = Date.parseAny(downloadInfo?["releaseDate"] ?? itunesPlist["releaseDate"])
-		// AppleId & purchaser name
-		let appleId = accountInfo["AppleID"] as? String ?? itunesPlist["appleId"] as? String ?? ""
-		let firstName = accountInfo["FirstName"] as? String ?? ""
-		let lastName = accountInfo["LastName"] as? String ?? ""
-		
-		let name: String
-		if !firstName.isEmpty || !lastName.isEmpty {
-			name = "\(firstName) \(lastName) (\(appleId))"
-		} else {
-			name = appleId
-		}
-		self.apply([
-			"iTunesHidden": CLASS_VISIBLE,
-			"iTunesId": (itunesPlist["itemId"] as? Int)?.description ?? "",
-			"iTunesName": itunesPlist["itemName"] as? String ?? "",
-			"iTunesGenres": formattedGenres(itunesPlist),
-			"iTunesReleaseDate": releaseDate?.mediumFormat() ?? "",
-			
-			"iTunesAppleId": name,
-			"iTunesPurchaseDate": purchaseDate?.mediumFormat() ?? "",
-			"iTunesPrice": itunesPlist["priceDisplay"] as? String ?? "",
-		])
-	}
-}

src/Preview/Preview+AppInfo.swift

@@ -0,0 +1,55 @@
+import Foundation
+
+extension PreviewGenerator {
+	/// Process info stored in `Info.plist`
+	mutating func procAppInfoApple(_ appPlist: Plist_Info) {
+		self.apply([
+			"AppInfoHidden": CLASS_VISIBLE,
+			"AppName": appPlist.name ?? "",
+			"AppVersion": appPlist.version ?? "",
+			"AppBuildVer": appPlist.buildVersion ?? "",
+			"AppId": appPlist.bundleId ?? "",
+			
+			"AppExtensionTypeHidden": appPlist.extensionType != nil ? CLASS_VISIBLE : CLASS_HIDDEN,
+			"AppExtensionType": appPlist.extensionType ?? "",
+			
+			"AppDeviceFamily": appPlist.deviceFamily.joined(separator: ", "),
+			"AppSDK": appPlist.sdkVersion ?? "",
+			"AppMinOS": appPlist.minOS ?? "",
+		])
+	}
+	
+	/// Process info stored in `AndroidManifest.xml`
+	mutating func procAppInfoAndroid(_ manifest: Apk_Manifest) {
+		let featReq = manifest.featuresRequired
+		let featOpt = manifest.featuresOptional
+		let perms = manifest.permissions
+		
+		func asList(_ list: [String]) -> String {
+			"<pre>\(list.joined(separator: "\n"))</pre>"
+		}
+		
+		func resolveSDK(_ sdk: Int?) -> String {
+			sdk == nil ? "" : "\(sdk!) (Android \(AndroidSdkMap[sdk!] ?? "?"))"
+		}
+		self.apply([
+			"AppInfoHidden": CLASS_VISIBLE,
+			"AppName": manifest.appName ?? "",
+			"AppVersion": manifest.versionName ?? "",
+			"AppBuildVer": manifest.versionCode ?? "",
+			"AppId": manifest.packageId ?? "",
+			
+			"ApkFeaturesRequiredHidden": featReq.isEmpty ? CLASS_HIDDEN : CLASS_VISIBLE,
+			"ApkFeaturesRequiredList": asList(featReq),
+			"ApkFeaturesOptionalHidden": featOpt.isEmpty ? CLASS_HIDDEN : CLASS_VISIBLE,
+			"ApkFeaturesOptionalList": asList(featOpt),
+			"ApkPermissionsHidden": perms.isEmpty ? CLASS_HIDDEN : CLASS_VISIBLE,
+			"ApkPermissionsList": asList(perms),
+			
+			"AppDeviceFamily": "Android",
+			"AppSDK": resolveSDK(manifest.sdkVerTarget),
+			"AppMinOS": resolveSDK(manifest.sdkVerMin),
+		])
+	}
+}
+

src/Preview/Preview+Entitlements.swift

@@ -22,9 +22,9 @@ extension PreviewGenerator {
 	}
 	
 	/// Process compiled binary and provision plist to extract `Entitlements`
-	mutating func procEntitlements(_ meta: MetaInfo, _ appPlist: PlistDict?, _ provisionPlist: PlistDict?) {
+	mutating func procEntitlements(_ meta: MetaInfo, _ appPlist: Plist_Info?, _ provisionPlist: Plist_MobileProvision?) {
-		var entitlements = readEntitlements(meta, appPlist?["CFBundleExecutable"] as? String)
+		var entitlements = readEntitlements(meta, appPlist?.exePath)
-		entitlements.applyFallbackIfNeeded(provisionPlist?["Entitlements"] as? PlistDict)
+		entitlements.applyFallbackIfNeeded(provisionPlist?.entitlements)
 		
 		if entitlements.html == nil && !entitlements.hasError {
 			return

src/Preview/Preview+Provisioning.swift

@@ -0,0 +1,68 @@
+import Foundation
+
+extension PreviewGenerator {
+	/// Process info stored in `embedded.mobileprovision`
+	mutating func procProvision(_ provisionPlist: Plist_MobileProvision?) {
+		guard let provisionPlist else {
+			return
+		}
+		
+		let deviceCount = provisionPlist.devices.count
+		self.apply([
+			"ProvisionHidden": CLASS_VISIBLE,
+			"ProvisionProfileName": provisionPlist.profileName ?? "",
+			"ProvisionProfileId": provisionPlist.profileId ?? "",
+			"ProvisionTeamName": provisionPlist.teamName ?? "<em>Team name not available</em>",
+			"ProvisionTeamIds": provisionPlist.teamIds.isEmpty ? "<em>Team ID not available</em>" : provisionPlist.teamIds.joined(separator: ", "),
+			"ProvisionCreateDate": provisionPlist.creationDate?.formattedCreationDate() ?? "",
+			"ProvisionExpireDate": provisionPlist.expireDate?.formattedExpirationDate() ?? "",
+			"ProvisionExpireStatus": ExpirationStatus(provisionPlist.expireDate).cssClass(),
+			
+			"ProvisionProfilePlatform": provisionPlist.profilePlatform,
+			"ProvisionProfileType": provisionPlist.profileType,
+			
+			"ProvisionDeviceCount": deviceCount == 0 ? "No Devices" : "\(deviceCount) Device\(deviceCount == 1 ? "" : "s")",
+			"ProvisionDeviceIds": deviceCount == 0 ? "Distribution Profile" : formatAsTable(groupDevices(provisionPlist.devices), header: ["", "UDID"]),
+			
+			"ProvisionDevelopCertificates": provisionPlist.certificates.isEmpty ? "No Developer Certificates"
+			: formatAsTable(
+				provisionPlist.certificates
+					.sorted { $0.subject < $1.subject }
+					.map {TableRow([$0.subject, $0.expiration?.relativeExpirationDateString() ?? "<span class='warning'>No invalidity date in certificate</span>"])}
+			),
+		])
+	}
+}
+
+/// Group device ids by first letter (`d -> device02`)
+private func groupDevices(_ devices: [String]) -> [TableRow] {
+	var currentPrefix: String? = nil
+	return devices.sorted().map { device in
+		// compute the prefix for the first column of the table
+		let displayPrefix: String
+		let devicePrefix = String(device.prefix(1))
+		if currentPrefix != devicePrefix {
+			currentPrefix = devicePrefix
+			displayPrefix = "\(devicePrefix) ➞ "
+		} else {
+			displayPrefix = ""
+		}
+		return [displayPrefix, device]
+	}
+}
+
+
+private typealias TableRow = [String]
+
+/// Print html table with arbitrary number of columns
+/// @param header If set, start the table with a `tr` column row.
+private func formatAsTable(_ data: [[String]], header: TableRow? = nil) -> String {
+	var table = "<table>\n"
+	if let header = header {
+		table += "<tr><th>\(header.joined(separator: "</th><th>"))</th></tr>\n"
+	}
+	for row in data {
+		table += "<tr><td>\(row.joined(separator: "</td><td>"))</td></tr>\n"
+	}
+	return table + "</table>\n"
+}

src/Preview/Preview+TransportSecurity.swift

@@ -43,8 +43,8 @@ private func recursiveTransportSecurity(_ dictionary: PlistDict, _ level: Int =
 
 extension PreviewGenerator {
 	/// Process ATS info in `Info.plist`
-	mutating func procTransportSecurity(_ appPlist: PlistDict?) {
+	mutating func procTransportSecurity(_ appPlist: Plist_Info?) {
-		guard let value = appPlist?["NSAppTransportSecurity"] as? PlistDict else {
+		guard let value = appPlist?.transportSecurity else {
 			return
 		}
 		

src/Preview/Preview+iTunesPurchase.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+extension PreviewGenerator {
+	/// Process info stored in `iTunesMetadata.plist`
+	mutating func procItunesMeta(_ itunesPlist: Plist_iTunesMetadata?) {
+		guard let itunesPlist else {
+			return
+		}
+		self.apply([
+			"iTunesHidden": CLASS_VISIBLE,
+			"iTunesId": itunesPlist.appId?.description ?? "",
+			"iTunesName": itunesPlist.appName ?? "",
+			"iTunesGenres": itunesPlist.genres.joined(separator: ", "),
+			"iTunesReleaseDate": itunesPlist.releaseDate?.mediumFormat() ?? "",
+			
+			"iTunesAppleId": itunesPlist.purchaserName ?? "",
+			"iTunesPurchaseDate": itunesPlist.purchaseDate?.mediumFormat() ?? "",
+			"iTunesPrice": itunesPlist.price ?? "",
+		])
+	}
+}

src/Preview/PreviewGenerator.swift

@@ -26,30 +26,30 @@ struct PreviewGenerator {
 		
 		switch meta.type {
 		case .IPA, .Archive, .Extension:
-			guard let plistApp = meta.readPlistApp() else {
+			guard let plistApp = meta.readPlist_Info() else {
 				throw RuntimeError("Info.plist not found")
 			}
-			procAppInfoApple(plistApp, isOSX: meta.isOSX)
+			procAppInfoApple(plistApp)
 			if meta.type == .IPA {
-				procItunesMeta(meta.readPlistItunes())
+				procItunesMeta(meta.readPlist_iTunesMetadata())
 			} else if meta.type == .Archive {
 				procArchiveInfo(meta.readPlistXCArchive())
 			}
 			procTransportSecurity(plistApp)
 			
-			let plistProvision = meta.readPlistProvision()
+			let plistProvision = meta.readPlist_MobileProvision()
 			procEntitlements(meta, plistApp, plistProvision)
-			procProvision(plistProvision, isOSX: meta.isOSX)
+			procProvision(plistProvision)
 			// App Icon (last, because the image uses a lot of memory)
-			data["AppIcon"] = AppIcon(meta).extractImage(from: plistApp).withRoundCorners().asBase64()
+			data["AppIcon"] = AppIcon(meta).extractImage(from: plistApp.icons).withRoundCorners().asBase64()
 			
 		case .APK:
-			guard let manifest = meta.readApkManifest() else {
+			guard let manifest = meta.readApk_Manifest() else {
 				throw RuntimeError("AndroidManifest.xml not found")
 			}
 			procAppInfoAndroid(manifest)
 			// App Icon (last, because the image uses a lot of memory)
-			data["AppIcon"] = AppIcon(meta).extractImage(from: manifest).withRoundCorners().asBase64()
+			data["AppIcon"] = AppIcon(meta).extractImage(from: manifest.icon).withRoundCorners().asBase64()
 		}
 		
 		data["QuickLookTitle"] = stringForFileType(meta)
@@ -73,7 +73,7 @@ struct PreviewGenerator {
 	/// prepare html, replace values
 	func generate(template html: String, css: String) -> String {
 		let templateValues = data.merging(["CSS": css]) { (_, new) in new }
-		return html.regexReplace("__([^ _]{1,40}?)__") { templateValues[$0] }
+		return html.regexReplace("\\{\\{([^ }]{1,40}?)\\}\\}") { templateValues[$0] }
 	}
 }
 
@@ -94,6 +94,7 @@ extension String {
 			if let value = fn(key) {
 				rv.append(value)
 			} else {
+				// do not append anything -> removes all template keys from template
 				// os_log(.debug, log: log, "unknown template key: %{public}@", key)
 			}
 		})