Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2024-11-22 19:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into test-target

Browse source
This commit is contained in:
Ben Chatelain 2018-02-07 21:08:00 -07:00
commit 38efd3d8d6
3 changed files with 80 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
App/Commands/Upgrade.swift
View file

@ -15,9 +15,29 @@ struct UpgradeCommand: CommandProtocol {
let updateController = CKUpdateController.shared()
let updates: [CKUpdate]
let appIds = options.appIds
if appIds.count > 0 {
updates = appIds.flatMap { updateController?.availableUpdate(withItemIdentifier: $0) }
let apps = options.apps
if apps.count > 0 {
let softwareMap = CKSoftwareMap.shared()
// convert input into a list of appId's
let appIds: [UInt64]
appIds = apps.flatMap {
if let appId = UInt64($0) {
return appId
}
if let appId = softwareMap.appIdWithProductName($0) {
return appId
}
return nil
}
// check each of those for updates
updates = appIds.flatMap {
updateController?.availableUpdate(withItemIdentifier: $0)
}
guard updates.count > 0 else {
printWarning("Nothing found to upgrade")
@ -52,14 +72,14 @@ struct UpgradeCommand: CommandProtocol {
}
struct UpgradeOptions: OptionsProtocol {
let appIds: [UInt64]
let apps: [String]
static func create(_ appIds: [Int]) -> UpgradeOptions {
return UpgradeOptions(appIds: appIds.map { UInt64($0) })
static func create(_ apps: [String]) -> UpgradeOptions {
return UpgradeOptions(apps: apps)
}
static func evaluate(_ m: CommandMode) -> Result<UpgradeOptions, CommandantError<MASError>> {
return create
<*> m <| Argument(defaultValue: [], usage: "app ID(s) to install")
<*> m <| Argument(defaultValue: [], usage: "app(s) to upgrade")
}
}

5
mas-cli.xcodeproj/project.pbxproj
View file

@ -19,6 +19,7 @@
3F177C62A7053BA3ED415E5E /* Argument.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36A4ABD8025E13060312925 /* Argument.swift */; };
49C2F3FDD805256BE934A70E /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1B6BEDF32AF3F8A575FB1F /* Switch.swift */; };
4C8321353B9AE40539A1AC8A /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F547B3DC473CFB1BE0AEB70A /* Errors.swift */; };
4913269B1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4913269A1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift */; };
693A98991CBFFA760004D3B4 /* Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693A98981CBFFA760004D3B4 /* Search.swift */; };
693A989B1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */; };
8078FAA81EC4F2FB004B5B3F /* Lucky.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8078FAA71EC4F2FB004B5B3F /* Lucky.swift */; };
@ -69,6 +70,7 @@
/* Begin PBXFileReference section */
2AD7FE171F643805F7BC38A7 /* Option.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Option.swift; path = Seeds/Commandant/Sources/Commandant/Option.swift; sourceTree = "<group>"; };
326E4D331CCD66ADFE19CE39 /* Command.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Command.swift; path = Seeds/Commandant/Sources/Commandant/Command.swift; sourceTree = "<group>"; };
4913269A1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CKSoftwareMap+AppLookup.swift"; sourceTree = "<group>"; };
5150F7FB7CF2A77F675D8E92 /* ResultProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResultProtocol.swift; path = Seeds/Result/Result/ResultProtocol.swift; sourceTree = "<group>"; };
693A98981CBFFA760004D3B4 /* Search.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = "<group>"; };
693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Synchronous.swift"; sourceTree = "<group>"; };
@ -248,6 +250,7 @@
ED0F238F1B87A56F00AE40CD /* ISStoreAccount.swift */,
ED0F23881B87543D00AE40CD /* PurchaseDownloadObserver.swift */,
EDA3BE511B8B84AF00C18D70 /* SSPurchase.swift */,
4913269A1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift */,
);
path = AppStore;
sourceTree = "<group>";
@ -428,6 +431,8 @@
900A1E811DBAC8CB0069B1A8 /* Info.swift in Sources */,
ED0F237F1B87522400AE40CD /* Install.swift in Sources */,
ED0F23901B87A56F00AE40CD /* ISStoreAccount.swift in Sources */,
4913269B1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift in Sources */,
25209791ED0F49CF5BAF7348 /* LinuxSupport.swift in Sources */,
ED0F23831B87533A00AE40CD /* List.swift in Sources */,
8078FAA81EC4F2FB004B5B3F /* Lucky.swift in Sources */,
ED031A7C1B5127C00097692E /* main.swift in Sources */,

48
mas-cli/AppStore/CKSoftwareMap+AppLookup.swift Normal file
View file

@ -0,0 +1,48 @@
//
// CKSoftwareMap+AppLookup.swift
// mas-cli
//
// Created by Andrew Griffiths on 20/8/17.
// Copyright © 2017 Andrew Griffiths.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
private var appIdsByName : [String:UInt64]?
extension CKSoftwareMap {
func appIdWithProductName(_ name: String) -> UInt64? {
if appIdsByName == nil {
let softwareMap = CKSoftwareMap.shared()
var destMap = [String:UInt64]()
guard let products = softwareMap.allProducts() else {
return nil
}
for product in products {
destMap[product.appName] = product.itemIdentifier.uint64Value
}
appIdsByName = destMap
}
return appIdsByName?[name]
}
}