diff --git a/Sources/mas/Formatters/AppInfoFormatter.swift b/Sources/mas/Formatters/AppInfoFormatter.swift index 710a7b5..0482fb7 100644 --- a/Sources/mas/Formatters/AppInfoFormatter.swift +++ b/Sources/mas/Formatters/AppInfoFormatter.swift @@ -18,7 +18,7 @@ enum AppInfoFormatter { let headline = [ "\(app.trackName)", "\(app.version)", - "[\(app.formattedPrice)]", + "[\(app.displayPrice)]", ] .joined(separator: " ") diff --git a/Sources/mas/Formatters/SearchResultFormatter.swift b/Sources/mas/Formatters/SearchResultFormatter.swift index c0bb513..7e919fc 100644 --- a/Sources/mas/Formatters/SearchResultFormatter.swift +++ b/Sources/mas/Formatters/SearchResultFormatter.swift @@ -29,7 +29,7 @@ enum SearchResultFormatter { let version = result.version if includePrice { - output += String(format: "%12lu %@ (%@) %@\n", appID, appName, version, result.formattedPrice) + output += String(format: "%12lu %@ (%@) %@\n", appID, appName, version, result.displayPrice) } else { output += String(format: "%12lu %@ (%@)\n", appID, appName, version) } diff --git a/Sources/mas/Models/SearchResult.swift b/Sources/mas/Models/SearchResult.swift index 0f67287..6c479c3 100644 --- a/Sources/mas/Models/SearchResult.swift +++ b/Sources/mas/Models/SearchResult.swift @@ -10,9 +10,9 @@ struct SearchResult: Decodable { var bundleId: String var currentVersionReleaseDate: String var fileSizeBytes: String - var formattedPrice: String + var formattedPrice: String? var minimumOsVersion: String - var price: Double + var price: Double? var sellerName: String var sellerUrl: String? var trackId: AppID @@ -20,6 +20,10 @@ struct SearchResult: Decodable { var trackViewUrl: String var version: String + var displayPrice: String { + formattedPrice ?? "Unknown" + } + init( bundleId: String = "", currentVersionReleaseDate: String = "",