Skip to content

Added quiet flag to hide progress animation during install #472

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

Open
artesmichael wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added quiet flag to hide progress animation during install #472

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
15 changes: 11 additions & 4 deletions Sources/Swiftly/Install.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ struct Install: SwiftlyCommand {
help: "Verify (or not) the toolchain's PGP signature before proceeding with installation."
)
var verify = true

@Flag(name: .shortAndLong, help: "Hides the install progress animation.")
var quiet = false

@Option(
help: ArgumentHelp(
Expand Down Expand Up @@ -87,7 +90,7 @@ struct Install: SwiftlyCommand {
@OptionGroup var root: GlobalOptions

private enum CodingKeys: String, CodingKey {
case version, use, verify, postInstallFile, root, progressFile, format
case version, use, verify, postInstallFile, root, progressFile, format, quiet
}

mutating func run() async throws {
Expand Down Expand Up @@ -118,7 +121,8 @@ struct Install: SwiftlyCommand {
verifySignature: self.verify,
verbose: self.root.verbose,
assumeYes: self.root.assumeYes,
progressFile: self.progressFile
progressFile: self.progressFile,
hideProgressAnimation: quiet
)

if pathChanged {
Expand Down Expand Up @@ -248,7 +252,8 @@ struct Install: SwiftlyCommand {
verifySignature: Bool,
verbose: Bool,
assumeYes: Bool,
progressFile: FilePath? = nil
progressFile: FilePath? = nil,
hideProgressAnimation: Bool = false
) async throws -> (postInstall: String?, pathChanged: Bool) {
guard !config.installedToolchains.contains(version) else {
let installInfo = InstallInfo(
Expand Down Expand Up @@ -309,8 +314,10 @@ struct Install: SwiftlyCommand {
}

let animation: ProgressReporterProtocol? =
if let progressFile
if hideProgressAnimation
{
nil
} else if let progressFile {
try JsonFileProgressReporter(ctx, filePath: progressFile)
} else if ctx.format == .json {
ConsoleProgressReporter(stream: stderrStream, header: "Downloading \(version)")
Expand Down