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 long version of --silent flag & improve code formatting #849

Merged
merged 4 commits into from
May 29, 2015
Merged

Fix long version of --silent flag & improve code formatting #849

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cfab60
Fix: Also detect the long version of the -s|--silent flag.
cr7pt0gr4ph7 May 29, 2015
90efb26
Remove unused variable "silent" from findPackages.
cr7pt0gr4ph7 May 29, 2015
f90b985
Improve the formatting of showInstalledPackages.
cr7pt0gr4ph7 May 29, 2015
192919b
Improve the formatting of filterGlobalArgs.
cr7pt0gr4ph7 May 29, 2015
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
25 changes: 10 additions & 15 deletions src/Paket/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,17 @@ let filterGlobalArgs args =

let rest =
match logFile with
| Some file ->
args |> Array.filter (fun a -> a <> "--log-file" && a <> file)
| Some file -> args |> Array.filter (fun a -> a <> "--log-file" && a <> file)
| None -> args

let rest =
if verbose then
rest |> Array.filter (fun a -> a <> "-v" && a <> "--verbose")
if verbose then rest |> Array.filter (fun a -> a <> "-v" && a <> "--verbose")
else rest

verbose, logFile, rest

let v, logFile, args = filterGlobalArgs (Environment.GetCommandLineArgs().[1..])
let silent = args |> Array.exists ((=) "-s")
let silent = args |> Array.exists (fun a -> a = "-s" || a = "--silent")

if not silent then
let assembly = Assembly.GetExecutingAssembly()
Expand Down Expand Up @@ -184,7 +182,6 @@ let pack (results : ArgParseResults<_>) =

let findPackages (results : ArgParseResults<_>) =
let maxResults = defaultArg (results.TryGetResult <@ FindPackagesArgs.MaxResults @>) 10000
let silent = results.Contains <@ FindPackagesArgs.Silent @>
let sources =
match results.TryGetResult <@ FindPackagesArgs.Source @> with
| Some source -> [PackageSource.NugetSource source]
Expand Down Expand Up @@ -216,23 +213,21 @@ let findPackages (results : ArgParseResults<_>) =
| Some searchText -> searchAndPrint searchText

let showInstalledPackages (results : ArgParseResults<_>) =
let project = results.TryGetResult <@ ShowInstalledPackagesArgs.Project @>
let showAll = results.Contains <@ ShowInstalledPackagesArgs.All @>
let dependenciesFile = Dependencies.Locate()
let packages =
match results.TryGetResult <@ ShowInstalledPackagesArgs.Project @> with
match project with
| None ->
if results.Contains <@ ShowInstalledPackagesArgs.All @> then
dependenciesFile.GetInstalledPackages()
else
dependenciesFile.GetDirectDependencies()
if showAll then dependenciesFile.GetInstalledPackages()
else dependenciesFile.GetDirectDependencies()
| Some project ->
match ProjectFile.FindReferencesFile(FileInfo project) with
| None -> []
| Some referencesFile ->
let referencesFile = ReferencesFile.FromFile referencesFile
if results.Contains <@ ShowInstalledPackagesArgs.All @> then
dependenciesFile.GetInstalledPackages(referencesFile)
else
dependenciesFile.GetDirectDependencies(referencesFile)
if showAll then dependenciesFile.GetInstalledPackages(referencesFile)
else dependenciesFile.GetDirectDependencies(referencesFile)

for name,version in packages do
tracefn "%s - %s" name version
Expand Down