Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion Sources/mas/Commands/Info.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
21 changes: 20 additions & 1 deletion Sources/mas/Commands/List.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

internal import ArgumentParser
private import Foundation

extension MAS {
/// Lists all apps installed from the Mac App Store.
Expand Down Expand Up @@ -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")
)
}
}
}
Expand Down
21 changes: 20 additions & 1 deletion Sources/mas/Commands/Search.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

internal import ArgumentParser
private import Foundation

extension MAS {
/// Searches for apps in the Mac App Store.
Expand Down Expand Up @@ -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")
)
}
}
}
45 changes: 0 additions & 45 deletions Sources/mas/Formatters/AppInfoFormatter.swift

This file was deleted.

36 changes: 0 additions & 36 deletions Sources/mas/Formatters/AppListFormatter.swift

This file was deleted.

39 changes: 0 additions & 39 deletions Sources/mas/Formatters/SearchResultFormatter.swift

This file was deleted.

43 changes: 0 additions & 43 deletions Tests/MASTests/Formatters/MASTests+AppListFormatter.swift

This file was deleted.

70 changes: 0 additions & 70 deletions Tests/MASTests/Formatters/MASTests+SearchResultFormatter.swift

This file was deleted.