Merge pull request #1014 from rgoldberg/1013-remove-formatters

Inline code from formatter enums & remove them

Author: rgoldberg

Sources/mas/Commands/Info.swift

@@ -33,9 +33,34 @@ extension MAS {
 		private func run(printer: Printer, searcher: some AppStoreSearcher) async {
 			var spacing = ""
 			await requiredAppIDsOptionGroup.forEachAppID(printer: printer) { appID in
-				printer.info("", AppInfoFormatter.format(app: try await searcher.lookup(appID: appID)), separator: spacing)
+				let result = try await searcher.lookup(appID: appID)
+				printer.info(
+					"",
+					"""
+					\(result.name) \(result.version) [\(result.formattedPrice)]
+					By: \(result.vendorName)
+					Released: \(result.releaseDate.humanReadableDate)
+					Minimum OS: \(result.minimumOSVersion)
+					Size: \(result.fileSizeBytes.humanReadableSize)
+					From: \(result.appStoreURL)
+					""",
+					separator: spacing
+				)
 				spacing = "\n"
 			}
 		}
 	}
 }
+
+private extension String {
+	var humanReadableSize: String {
+		ByteCountFormatter.string(fromByteCount: Int64(self) ?? 0, countStyle: .file)
+	}
+
+	var humanReadableDate: String {
+		ISO8601DateFormatter().date(from: self).map { date in
+			ISO8601DateFormatter.string(from: date, timeZone: .current, formatOptions: [.withFullDate])
+		}
+		?? "" // swiftformat:disable:this indent
+	}
+}

Sources/mas/Commands/List.swift

@@ -6,6 +6,7 @@
 //
 
 internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Lists all apps installed from the Mac App Store.
@@ -39,7 +40,25 @@ extension MAS {
 					"""
 				)
 			} else {
-				printer.info(AppListFormatter.format(installedApps))
+				guard let maxADAMIDLength = installedApps.map({ String(describing: $0.adamID).count }).max() else {
+					return
+				}
+				guard let maxAppNameLength = installedApps.map(\.name.count).max() else {
+					return
+				}
+
+				let format = "%\(maxADAMIDLength)lu  %@  (%@)"
+				printer.info(
+					installedApps.map { installedApp in
+						String(
+							format: format,
+							installedApp.adamID,
+							installedApp.name.padding(toLength: maxAppNameLength, withPad: " ", startingAt: 0),
+							installedApp.version
+						)
+					}
+					.joined(separator: "\n")
+				)
 			}
 		}
 	}

Sources/mas/Commands/Search.swift

@@ -6,6 +6,7 @@
 //
 
 internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Searches for apps in the Mac App Store.
@@ -37,8 +38,26 @@ extension MAS {
 			guard !results.isEmpty else {
 				throw MASError.noSearchResultsFound(for: searchTerm)
 			}
+			guard let maxADAMIDLength = results.map({ String(describing: $0.adamID).count }).max() else {
+				return
+			}
+			guard let maxAppNameLength = results.map(\.name.count).max() else {
+				return
+			}
 
-			printer.info(SearchResultFormatter.format(results, includePrice: price))
+			let format = "%\(maxADAMIDLength)lu  %@  (%@)\(price ? "  %@" : "")"
+			printer.info(
+				results.map { result in
+					String(
+						format: format,
+						result.adamID,
+						result.name.padding(toLength: maxAppNameLength, withPad: " ", startingAt: 0),
+						result.version,
+						result.formattedPrice
+					)
+				}
+				.joined(separator: "\n")
+			)
 		}
 	}
 }