Skip to content

Commit 13873f2

Browse files
committed
refactor: use cli for print
1 parent 1ca789b commit 13873f2

File tree

2 files changed

+19
-42
lines changed

2 files changed

+19
-42
lines changed

NAMESPACE

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export(slice)
6161
export(ungroup)
6262
export(unnest)
6363
importFrom(R6,R6Class)
64+
importFrom(cli,cli_inform)
6465
importFrom(data.table,":=")
6566
importFrom(data.table,address)
6667
importFrom(data.table,as.data.table)

R/archive.R

+18-42
Original file line numberDiff line numberDiff line change
@@ -443,49 +443,25 @@ epi_archive <-
443443
#' @param class Boolean; whether to print the class label header
444444
#' @param methods Boolean; whether to print all available methods of
445445
#' the archive
446+
#' @importFrom cli cli_inform
446447
print = function(class = TRUE, methods = TRUE) {
447-
if (class) cat("An `epi_archive` object, with metadata:\n")
448-
cat(sprintf("* %-14s = %s\n", "non-standard DT keys", paste(
449-
setdiff(key(self$DT), c("geo_value", "time_value", "version")),
450-
collapse = ", "
451-
)))
452-
cat("----------\n")
453-
if (length(self$DT$time_value) == 0 || all(is.na(self$DT$time_value))) {
454-
min_time <- max_time <- NA
455-
} else {
456-
min_time <- Min(self$DT$time_value)
457-
max_time <- Max(self$DT$time_value)
458-
}
459-
cat(sprintf("* %-14s = %s\n", "min/max time values", paste(
460-
c(min_time, max_time),
461-
collapse = " / "
462-
)))
463-
cat(sprintf(
464-
"* %-14s = %s\n", "first/last version with update", paste(
465-
c(min(self$DT$version), max(self$DT$version)),
466-
collapse = " / "
467-
)))
468-
if (!is.na(self$clobberable_versions_start)) {
469-
cat(sprintf(
470-
"* %-14s = %s\n", "clobberable versions start",
471-
self$clobberable_versions_start
472-
))
473-
}
474-
cat(sprintf(
475-
"* %-14s = %s\n", "versions end",
476-
self$versions_end
477-
))
478-
if (methods) {
479-
cat("----------\n")
480-
writeLines(wrap_varnames(
481-
initial = "Public R6 methods: ",
482-
names(epi_archive$public_methods)
483-
))
484-
}
485-
cat("----------\n")
486-
cat(sprintf(
487-
"A preview of the table: %s rows x %s columns\n",
488-
nrow(self$DT), ncol(self$DT)))
448+
cli_inform(
449+
c(
450+
">" = if (class) {"An `epi_archive` object, with metadata:"},
451+
"i" = if (length(setdiff(key(self$DT), c('geo_value', 'time_value', 'version'))) > 0) {
452+
"Non-standard DT keys: {setdiff(key(self$DT), c('geo_value', 'time_value', 'version'))}"
453+
},
454+
"i" = "Min/max time values: {min(self$DT$time_value)} / {max(self$DT$time_value)}",
455+
"i" = "First/last version with update: {min(self$DT$version)} / {max(self$DT$version)}",
456+
"i" = if (!is.na(self$clobberable_versions_start)) {
457+
"Clobberable versions start: {self$clobberable_versions_start}"
458+
},
459+
"i" = "Versions end: {self$versions_end}",
460+
"i" = if (methods) {"Public R6 methods: {names(epi_archive$public_methods)}"},
461+
"i" = "A preview of the table ({nrow(self$DT)} rows x {ncol(self$DT)} columns):"
462+
)
463+
)
464+
489465
return(invisible(self$DT %>% print))
490466
},
491467
#####

0 commit comments

Comments
 (0)