From 1b43c89becc7e9f45e241a7d03c534a01caac38c Mon Sep 17 00:00:00 2001 From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com> Date: Tue, 29 Oct 2024 04:56:37 -0400 Subject: [PATCH] Single source for Unknown app ID message. Resolve #533 Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com> --- Sources/mas/Commands/Upgrade.swift | 2 +- Sources/mas/Errors/MASError.swift | 2 +- Sources/mas/Models/AppID.swift | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Sources/mas/Commands/Upgrade.swift b/Sources/mas/Commands/Upgrade.swift index 012cb50..3f1d3f4 100644 --- a/Sources/mas/Commands/Upgrade.swift +++ b/Sources/mas/Commands/Upgrade.swift @@ -63,7 +63,7 @@ extension MAS { // argument is an AppID, lookup apps by id using argument let installedApps = appLibrary.installedApps(withAppID: appID) if installedApps.isEmpty { - printError("Unknown app ID \(appID)") + printError(appID.unknownMessage) } return installedApps } diff --git a/Sources/mas/Errors/MASError.swift b/Sources/mas/Errors/MASError.swift index f247fe3..3c6ebfc 100644 --- a/Sources/mas/Errors/MASError.swift +++ b/Sources/mas/Errors/MASError.swift @@ -87,7 +87,7 @@ extension MASError: CustomStringConvertible { case .noSearchResultsFound: return "No apps found" case .unknownAppID(let appID): - return "Unknown app ID \(appID)" + return appID.unknownMessage case .noVendorWebsite: return "App does not have a vendor website" case .notInstalled(let appID): diff --git a/Sources/mas/Models/AppID.swift b/Sources/mas/Models/AppID.swift index 0b8689f..d7d1788 100644 --- a/Sources/mas/Models/AppID.swift +++ b/Sources/mas/Models/AppID.swift @@ -10,6 +10,12 @@ import Foundation typealias AppID = UInt64 +extension AppID { + var unknownMessage: String { + "Unknown app ID \(self)" + } +} + extension NSNumber { var appIDValue: AppID { uint64Value