Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix JSON parsing error by making formattedPrice & price optional for SearchResult #643

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix JSON parsing error by making formattedPrice & price optional for SearchResult #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/mas/Formatters/AppInfoFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ enum AppInfoFormatter {
let headline = [
"\(app.trackName)",
"\(app.version)",
"[\(app.formattedPrice)]",
"[\(app.displayPrice)]",
]
.joined(separator: " ")

Expand Down
2 changes: 1 addition & 1 deletion Sources/mas/Formatters/SearchResultFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
8 changes: 6 additions & 2 deletions Sources/mas/Models/SearchResult.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@ 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
var trackName: String
var trackViewUrl: String
var version: String

var displayPrice: String {
formattedPrice ?? "Unknown"
}

init(
bundleId: String = "",
currentVersionReleaseDate: String = "",
Expand Down
Loading