Skip to content

Commit 2626dfd

Browse files
authored
Merge pull request #93 from ropensci-review-tools/quiet
only use pbapply bar and issue msgs in explicit verbose mode
2 parents 4b18e02 + ac70d3e commit 2626dfd

File tree

2 files changed

+31
-9
lines changed

2 files changed

+31
-9
lines changed

R/data-pkgstats.R

+18-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,17 @@ extract_pkgstats_data_single <- function (log, path) {
8080
clean_after <- TRUE
8181
}
8282

83-
res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
84-
flist <- reset_repo (path_cp, log$hash [i]) # nolint
85-
run_one_pkgstats (path = path_cp, pkg_date = log$timestamp [i])
86-
})
83+
if (is_verbose ()) {
84+
res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
85+
flist <- reset_repo (path_cp, log$hash [i]) # nolint
86+
run_one_pkgstats (path = path_cp, pkg_date = log$timestamp [i])
87+
})
88+
} else {
89+
res <- lapply (seq_len (nrow (log)), function (i) {
90+
flist <- reset_repo (path_cp, log$hash [i]) # nolint
91+
run_one_pkgstats (path = path_cp, pkg_date = log$timestamp [i])
92+
})
93+
}
8794

8895
if (clean_after) {
8996
fs::dir_delete (path_cp)
@@ -100,6 +107,9 @@ extract_pkgstats_data_multi <- function (log, path, num_cores) {
100107
c ("log", "path", "run_one_pkgstats"),
101108
envir = environment ()
102109
)
110+
if (!is_verbose ()) {
111+
opb <- pbapply::pboptions (type = "none")
112+
}
103113
res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
104114
path_cp <- fs::dir_copy (path, fs::path_temp ())
105115
flist <- reset_repo (path_cp, log$hash [i]) # nolint
@@ -109,6 +119,10 @@ extract_pkgstats_data_multi <- function (log, path, num_cores) {
109119
}, cl = cl)
110120
parallel::stopCluster (cl)
111121

122+
if (!is_verbose ()) {
123+
pbapply::pboptions (opb)
124+
}
125+
112126
return (res)
113127

114128
return (res)

R/data-repo.R

+13-5
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,27 @@
1212
#' @export
1313
repometrics_data_repo <- function (path, step_days = 1L, num_cores = -1L) {
1414

15-
cli::cli_alert_info ("Extracting package statistics ...")
15+
if (is_verbose ()) {
16+
cli::cli_alert_info ("Extracting package statistics ...")
17+
}
1618
pkgstats <- repo_pkgstats_history (
1719
path,
1820
step_days = step_days,
1921
num_cores = num_cores
2022
)
21-
cli::cli_alert_success ("Done!")
23+
if (is_verbose ()) {
24+
cli::cli_alert_success ("Done!")
25+
}
2226

23-
cli::cli_alert_info ("Extracting GitHub data ...")
27+
if (is_verbose ()) {
28+
cli::cli_alert_info ("Extracting GitHub data ...")
29+
}
2430
rm <- rm_data_repo (path)
2531
rm$contributors <-
2632
get_all_contribs (rm$contribs_from_log, rm$contribs_from_gh_api)
27-
cli::cli_alert_success ("Done!")
33+
if (is_verbose ()) {
34+
cli::cli_alert_success ("Done!")
35+
}
2836

2937
list (pkgstats = pkgstats, rm = rm)
3038
}
@@ -64,7 +72,7 @@ rm_data_repo <- function (path) {
6472

6573
data_fns <- get_rm_data_fns ()
6674

67-
if (all_rm_data_fns_memoised (data_fns, path)) {
75+
if (all_rm_data_fns_memoised (data_fns, path) || !is_verbose ()) {
6876
res <- lapply (data_fns, function (i) {
6977
do.call (i, list (path = path))
7078
})

0 commit comments

Comments
 (0)