correct some typos and improved status messages

JBGruber · Nov 2, 2023 · e933273 · e933273
1 parent 1984544
commit e933273
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: paperboy
 Title: Comprehensive Collection of News Media Scrapers
 Version: 0.0.5.9000
-Date: 2023-10-26
+Date: 2023-11-02
 Authors@R:
     person(given = "Johannes B.",
            family = "Gruber",

diff --git a/R/deliver.R b/R/deliver.R
@@ -106,7 +106,7 @@ pb_deliver.data.frame <- function(x, try_default = TRUE, verbose = NULL, ...) {
   ws <- mget(ls(inform_now_env), envir = inform_now_env)
   if (length(ws) > 0) {
     names(ws) <- rep("i", length(ws))
-    cli::cli_warn(ws)
+    cli::cli_alert_warning(ws)
     rm(list = ls(inform_now_env), envir = inform_now_env)
   }
 

diff --git a/R/deliver_ad_nl.R b/R/deliver_ad_nl.R
@@ -51,7 +51,7 @@ pb_deliver_paper.ad_nl <- function(x, verbose = NULL, pb, ...) {
     )
 
   } else {
-    warn_once(x$domain)
+
     if (is.null(inform_now_env$block)) {
       cli::cli_alert_warning("Some articles are not present as they were blocked by a privacy gate")
     }

diff --git a/R/rss.r b/R/rss.r
@@ -14,7 +14,7 @@
 #' }
 pb_collect_rss <- function(x, ...) {
   if (!methods::is(x, "html_content")) {
-    df <- pb_collect(x, pb_collect_rss = FALSE, ...)
+    df <- pb_collect(x, collect_rss = FALSE, ...)
     x <- unlist(df[df$status < 400L, "content_raw"])
   }
 

diff --git a/R/utils.R b/R/utils.R
@@ -140,7 +140,7 @@ pb_tick <- function(x, verbose, pb) {
 #' @noRd
 warn_once <- function(id) {
   if (is.null(inform_env[[id]])) {
-    inform_now_env[[id]] <- cli::format_warning("No parser for domain {.strong {id}} yet, attempting generic approach.")
+    inform_now_env[[id]] <- cli::format_message("No parser for domain {.strong {id}} yet, attempting generic approach.")
     inform_env[[id]] <- TRUE
   }
 }

diff --git a/R/utils_dev.R b/R/utils_dev.R
@@ -125,7 +125,7 @@ use_new_parser <- function(x,
   cli::cli_progress_step(
     "Checking parser {r_file} for consistency",
     msg_done = "{r_file} passed tests!",
-    msg_failed = "{r_file} did not passe tests."
+    msg_failed = "{r_file} did not pass tests."
   )
 
   if (is.null(test_data) && is.na(rss)) {
@@ -194,7 +194,7 @@ pb_new <- function(np, author = "", issue = "") {
     readLines() %>%
     gsub("{{newspaper}}", np_, x = ., fixed = TRUE)
 
-  p <- ifelse(is_pb(), "./R", "")
+  p <- ifelse(is_pb(), "./R", ".")
   f <- file.path(p, paste0("deliver_", np_, ".R"))
   if (!file.exists(f)) writeLines(template, f)
 

diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -5,8 +5,11 @@ Guide’s
 Lifecycle
 Nutzungsbedingungen
 POSIXct
+ac
+aktualne
 anotherangryvoice
 bbc
+blesk
 blogspot
 boston
 bostonglobe
@@ -15,13 +18,15 @@ buzzfeed
 cbsileads
 cbslnk
 cbsnews
+ceskatelevize
 cnet
 cnn
 com
 csv
 cz
 dailymail
 datetime
+denikn
 doctype
 eu
 evolvepolitics
@@ -32,11 +37,14 @@ foxbusiness
 foxnews
 ftw
 geenstijl
+hn
 huffingtonpost
 huffpost
 idnes
+irozhlas
 itemscope
 latimes
+lidovky
 lnk
 marketwatch
 mediacloud
@@ -46,12 +54,15 @@ msnbc
 newsweek
 nl
 nos
+novinky
 nrc
 nypost
 nytimes
 org
 pagesix
+parlamentnilisty
 pb
+seznamzpravy
 sfgate
 skwawkbox
 stri

diff --git a/tests/testthat/test-deliver.R b/tests/testthat/test-deliver.R
@@ -1,14 +1,14 @@
 test_that("Test infrascture", {
-  expect_warning(
+  expect_message(
     pb_deliver("google.com", verbose = TRUE),
     "No parser for domain"
   )
   # only warn first time
-  expect_no_warning(
+  expect_no_message(
     pb_deliver("google.com", verbose = TRUE)
   )
   # still warn with new site
-  expect_warning(
+  expect_message(
     pb_deliver("duckduckgo.com/", verbose = TRUE),
     "No parser for domain"
   )