Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2025-02-16 12:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only install apps which are not yet installed

Browse source
This commit is contained in:
Andrew Naylor 2016-09-14 22:28:18 +01:00
parent ae520c1ec5
commit 1dd85d3e54
3 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@
EDB6CE8C1BAEC3D400648B4D /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDB6CE8B1BAEC3D400648B4D /* Version.swift */; };
EDC90B651C70045E0019E396 /* SignIn.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC90B641C70045E0019E396 /* SignIn.swift */; };
EDCBF9531D89AC6F000039C6 /* Reset.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDCBF9521D89AC6F000039C6 /* Reset.swift */; };
EDCBF9551D89CFC7000039C6 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDCBF9541D89CFC7000039C6 /* Utilities.swift */; };
EDD3B3631C34709400B56B88 /* Upgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD3B3621C34709400B56B88 /* Upgrade.swift */; };
EDE296531C700F4300554778 /* SignOut.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE296521C700F4300554778 /* SignOut.swift */; };
EDEAA0C01B51CE6200F2FC3F /* StoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEAA0BF1B51CE6200F2FC3F /* StoreFoundation.framework */; };
@ -93,6 +94,7 @@
EDC90B621C6FF50B0019E396 /* ISAccountService-Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ISAccountService-Protocol.h"; sourceTree = "<group>"; };
EDC90B641C70045E0019E396 /* SignIn.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignIn.swift; sourceTree = "<group>"; };
EDCBF9521D89AC6F000039C6 /* Reset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reset.swift; sourceTree = "<group>"; };
EDCBF9541D89CFC7000039C6 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
EDD3B3621C34709400B56B88 /* Upgrade.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Upgrade.swift; sourceTree = "<group>"; };
EDE2964F1C700B0300554778 /* ISAuthenticationContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISAuthenticationContext.h; sourceTree = "<group>"; };
EDE296501C700B0300554778 /* ISServiceRemoteObject-Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ISServiceRemoteObject-Protocol.h"; sourceTree = "<group>"; };
@ -197,6 +199,7 @@
EDEAA12C1B51CF8000F2FC3F /* mas-cli-Bridging-Header.h */,
EDB6CE8A1BAEB95100648B4D /* mas-cli-Info.plist */,
693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */,
EDCBF9541D89CFC7000039C6 /* Utilities.swift */,
);
path = "mas-cli";
sourceTree = "<group>";
@ -372,6 +375,7 @@
30EA893640B02CCF679F9C57 /* Option.swift in Sources */,
ED0F23851B87536A00AE40CD /* Outdated.swift in Sources */,
ED0F23891B87543D00AE40CD /* PurchaseDownloadObserver.swift in Sources */,
EDCBF9551D89CFC7000039C6 /* Utilities.swift in Sources */,
EDCBF9531D89AC6F000039C6 /* Reset.swift in Sources */,
0EBF5CDD379D7462C3389536 /* Result.swift in Sources */,
319FDBA6ED6443A912B9A65F /* ResultType.swift in Sources */,

29
mas-cli/Commands/Install.swift
View file

@ -13,13 +13,30 @@ struct InstallCommand: CommandType {
func run(options: Options) -> Result<(), MASError> {
// Try to download applications with given identifiers and collect results
let downloadResults = options.appIds.flatMap(download)
if downloadResults.count > 0 {
return .Failure(downloadResults[0])
let downloadResults = options.appIds.flatMap { (appId) -> MASError? in
if let product = installedApp(appId) {
warn("\(product.appName) is already installed")
return nil
}
return download(appId)
}
switch downloadResults.count {
case 0:
return .Success()
case 1:
return .Failure(downloadResults[0])
default:
return .Failure(MASError(code: .DownloadFailed))
}
}
private func installedApp(appId: UInt64) -> CKSoftwareProduct? {
let appId = NSNumber(unsignedLongLong: appId)
return .Success()
let softwareMap = CKSoftwareMap.sharedSoftwareMap()
return softwareMap.allProducts()?.filter { $0.itemIdentifier == appId }.first
}
}
@ -34,4 +51,4 @@ struct InstallOptions: OptionsType {
return create
<*> m <| Argument(usage: "app ID(s) to install")
}
}
}

27
mas-cli/Utilities.swift Normal file
View file

@ -0,0 +1,27 @@
//
// Utilities.swift
// mas-cli
//
// Created by Andrew Naylor on 14/09/2016.
// Copyright © 2016 Andrew Naylor. All rights reserved.
//
func warn(message: String) {
guard isatty(fileno(stdout)) != 0 else {
print("Warning: \(message)")
return
}
// Yellow, underlined "Warning:" prefix
print("\(csi)4m\(csi)33mWarning:\(csi)0m \(message)")
}
func error(message: String) {
guard isatty(fileno(stdout)) != 0 else {
print("Warning: \(message)")
return
}
// Red, underlined "Error:" prefix
print("\(csi)4m\(csi)31mError:\(csi)0m \(message)")
}