Avoid printing internet connection messages twice

Author: rafapereirabr

r-package/NEWS.md

@@ -2,7 +2,8 @@
 
 **Minor changes**
 
-- Error messages now use {cli}
+- Messages and errors now use {cli}
+- Avoid printing internet connection messages twice
 
 **Bug fixes**
 

r-package/R/download_metadata.R

@@ -55,7 +55,8 @@ download_metadata <- function(){ # nocov start
 
   # check if data was read Ok
   if (nrow(metadata)==0) {
-    message("A file must have been corrupted during download. Please restart your R session and download the data again.")
+    msg <- "A file must have been corrupted during download. Please restart your R session and download the data again."
+    cli::cli_alert_danger(msg)
     return(invisible(NULL))
   }
 

r-package/R/read_access.R

@@ -225,20 +225,21 @@ read_access <- function(city = NULL,
   aop <- aop_merge(aop_landuse, aop_access)
 
   # with Vs without spatial data
-  if(geometry == FALSE){
-                        # return df
-                        return(aop)
-
-                        } else {
-
-                        # return sf
-                        aop_grid <- read_grid(city=city, showProgress=showProgress)
-
-                        # check if download failed
-                        check_downloaded_obj(aop_grid) # nocov
-                        if (is.null(aop_grid)) { return(invisible(NULL)) }
-
-                        aop_sf <- aop_spatial_join(aop, aop_grid)
-                        return(aop_sf)
-                        }
+  if (geometry == FALSE) {
+      # return df
+      return(aop)
+
+    } else {
+      # return sf
+      aop_grid <- suppressMessages(
+        read_grid(city = city, showProgress = showProgress)
+      )
+
+      # check if download failed
+      check_downloaded_obj(aop_grid) # nocov
+      if (is.null(aop_grid)) { return(invisible(NULL)) }
+
+      aop_sf <- aop_spatial_join(aop, aop_grid)
+      return(aop_sf)
+    }
   }

r-package/R/read_landuse.R

@@ -134,22 +134,22 @@ read_landuse <- function(city = NULL,
   aop <- data.table::merge.data.table(aop_population, aop_landuse, by = c('id_hex', 'abbrev_muni', 'name_muni', 'code_muni'), all = TRUE)
 
   # with Vs without spatial data
-  if(geometry == FALSE){
-                        # return df
-                        return(aop)
+  if (geometry == FALSE) {
+    # return df
+    return(aop)
 
-                        } else {
-
-                        # return sf
-                        aop_grid <- read_grid(city=city, showProgress=showProgress)
-
-                          # check if download failed
-                          check_downloaded_obj(aop_grid) # nocov
-                          if (is.null(aop_grid)) { return(invisible(NULL)) }
+  } else {
+    # return sf
+    aop_grid <- suppressMessages(
+      read_grid(city = city, showProgress = showProgress)
+    )
 
+    # check if download failed
+    check_downloaded_obj(aop_grid) # nocov
+    if (is.null(aop_grid)) { return(invisible(NULL)) }
 
-                        # create function aop_join to bring in land use info
-                        aop_sf <- aop_spatial_join(aop, aop_grid)
-                        return(aop_sf)
-                        }
+    # create function aop_join to bring in land use info
+    aop_sf <- aop_spatial_join(aop, aop_grid)
+    return(aop_sf)
+  }
   }

r-package/R/read_population.R

@@ -105,21 +105,22 @@ read_population <- function(city = NULL,
   if (is.null(aop_population)) { return(invisible(NULL)) }
 
   # with Vs without spatial data
-  if(geometry == FALSE){
-                        # return df
-                        return(aop_population)
+  if (geometry == FALSE) {
+      # return df
+      return(aop_population)
 
-                        } else {
+    } else {
+      # return sf
+      aop_grid <- suppressMessages(
+        read_grid(city = city, showProgress = showProgress)
+        )
 
-                        # return sf
-                        aop_grid <- read_grid(city=city, showProgress=showProgress)
+      # check if download failed
+      check_downloaded_obj(aop_grid) # nocov
+      if (is.null(aop_grid)) { return(invisible(NULL)) }
 
-                          # check if download failed
-                          check_downloaded_obj(aop_grid) # nocov
-                          if (is.null(aop_grid)) { return(invisible(NULL)) }
-
-                        # create function aop_join to bring in land use info
-                        aop_sf <- aop_spatial_join(aop_population, aop_grid)
-                        return(aop_sf)
-                        }
+      # create function aop_join to bring in land use info
+      aop_sf <- aop_spatial_join(aop_population, aop_grid)
+      return(aop_sf)
+    }
   }

r-package/R/utils.R

@@ -209,7 +209,7 @@ download_data <- function(url, progress_bar = showProgress){
   # if server1 fails, replace url and test connection with server2
   if (is.null(check_con) | isFALSE(check_con)) {
       url <- url2
-      try( silent = TRUE, check_con <- check_connection(url[1], silent = FALSE))
+      try( silent = TRUE, check_con <- check_connection(url[1], silent = TRUE))
       if (is.null(check_con) | isFALSE(check_con)) { return(invisible(NULL)) }
   }
 
@@ -228,8 +228,8 @@ download_data <- function(url, progress_bar = showProgress){
 
   # if anything fails, return NULL
   if (any(!downloaded_files$success | is.na(downloaded_files$success))) {
-    msg <- paste("File cached locally seems to be corrupted. Please download it again.")
-    message(msg)
+    msg <- "File cached locally seems to be corrupted. Please download it again."
+    cli::cli_alert_danger(msg)
     return(invisible(NULL))
   }
 
@@ -282,7 +282,8 @@ load_data <- function(temps=NULL){
 
   # check if data was read Ok
   if (nrow(temp)==0) {
-    message("A file must have been corrupted during download. Please restart your R session and download the data again.")
+    msg <- "A file must have been corrupted during download. Please restart your R session and download the data again."
+    cli::cli_alert_danger(msg)
     return(invisible(NULL))
   }
 

r-package/aopdata.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 621a5134-b223-44e6-b779-b10fcc883866
 
 RestoreWorkspace: No
 SaveWorkspace: No