feat: support for apkm

App/Info.plist

@@ -43,6 +43,7 @@
 				<key>public.filename-extension</key>
 				<array>
 					<string>apk</string>
+					<string>apkm</string>
 				</array>
 			</dict>
 		</dict>

QLPreview/Info.plist

@@ -18,6 +18,7 @@
 				<string>com.google.android.apk</string>
 				<string>dyn.ah62d4rv4ge80c6dp</string>
 				<string>public.archive.apk</string>
+				<string>dyn.ah62d4rv4ge80c6dpry</string>
 			</array>
 			<key>QLSupportsSearchableItems</key>
 			<false/>

QLThumbnail/Info.plist

@@ -16,6 +16,7 @@
 				<string>com.google.android.apk</string>
 				<string>dyn.ah62d4rv4ge80c6dp</string>
 				<string>public.archive.apk</string>
+				<string>dyn.ah62d4rv4ge80c6dpry</string>
 			</array>
 			<key>QLThumbnailMinimumDimension</key>
 			<integer>16</integer>

src/MetaInfo+Apk.swift

@@ -25,10 +25,24 @@ struct ApkManifest {
 // 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)
-		guard let data = self.readPayloadFile("AndroidManifest.xml", osxSubdir: nil) else {
+		let (isApkm, nestedZip) = effectiveApk()
+		guard let data = nestedZip.unzipFile("AndroidManifest.xml") else {
 			return nil
 		}
 		let storage = ApkXmlManifestParser()
@@ -60,8 +74,13 @@ extension MetaInfo {
 		}
 		
 		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(zipFile!)
+		rv.resolve(nestedZip)
 		os_log(.debug, log: log, "[apk] resolved name: \"%{public}@\" icon: %{public}@", rv.appName ?? "", rv.appIcon ?? "-")
 		return rv
 	}
@@ -124,7 +143,13 @@ extension MetaInfo {
 	func readApkIconOnly() -> ApkManifest? {
 		assert(type == .APK)
 		var rv = ApkManifest()
-		guard let data = self.readPayloadFile("AndroidManifest.xml", osxSubdir: nil) else {
+		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) {
@@ -138,7 +163,7 @@ extension MetaInfo {
 			// fallback to xml-string parser
 			rv.appIcon = ApkXmlIconParser().run(data)
 		}
-		rv.resolve(zipFile!)
+		rv.resolve(nestedZip)
 		return rv
 	}
 }
@@ -166,6 +191,7 @@ private class ApkXmlIconParser: NSObject, XMLParserDelegate {
 // 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 {

src/MetaInfo.swift

@@ -33,7 +33,7 @@ struct MetaInfo {
 		var zipFile: ZipFile? = nil
 		
 		switch self.UTI {
-		case "com.apple.itunes.ipa", "com.opa334.trollstore.tipa", "dyn.ah62d4rv4ge81k4puqe":
+		case "com.apple.itunes.ipa", "com.opa334.trollstore.tipa", "dyn.ah62d4rv4ge81k4puqe" /* tipa */:
 			self.type = FileType.IPA
 			zipFile = ZipFile(self.url.path)
 		case "com.apple.xcode.archive":
@@ -47,10 +47,9 @@ struct MetaInfo {
 			}
 		case "com.apple.application-and-system-extension":
 			self.type = FileType.Extension
-		case "com.google.android.apk", "dyn.ah62d4rv4ge80c6dp", "public.archive.apk":
+		case "com.google.android.apk", "dyn.ah62d4rv4ge80c6dp" /* apk */, "public.archive.apk", "dyn.ah62d4rv4ge80c6dpry" /* apkm */:
 			self.type = FileType.APK
 			zipFile = ZipFile(self.url.path)
-//		case "com.google.android.apkm", "dyn.ah62d4rv4ge80c6dpry":
 		default:
 			os_log(.error, log: log, "Unsupported file type: %{public}@", self.UTI)
 			fatalError()
@@ -81,7 +80,7 @@ struct MetaInfo {
 		case .IPA:
 			return zipFile!.unzipFile("Payload/*.app/".appending(filename))
 		case .APK:
-			return zipFile!.unzipFile(filename)
+			return nil // not applicable for .apk
 		case .Archive, .Extension:
 			return try? Data(contentsOf: self.effectiveUrl(osxSubdir, filename))
 		}