Merge pull request #18 from RhoInc/updates_v1_1_1

Updates v1 1 1

Author: Becca Krouse

R/CRANsearcher.R

@@ -148,13 +148,16 @@ CRANsearcher <- function(){
       if(identical(search_d(), character(0)) || nchar(search_d())<2){
         s <- 0
       } else{
+
         s <- a %>%
           mutate(term = tolower(paste(name, Title, Description, sep=","))) %>%
           rowwise %>%
           mutate(match = all(stringr::str_detect(term, search2))) %>%
           filter(match==TRUE) %>%
           select(-c(term, match)) %>%
           data.frame
+
+        if (nrow(s) == 0) s <- 0
       }
       return(s)
     })
@@ -189,6 +192,9 @@ CRANsearcher <- function(){
           return()
         }
       } else{
+        validate(
+          need(a_sub2() != 0, "Your search returned no results. Please try again.")
+        )
         DT::datatable(a_sub2()[,c(1:6)],
                        rownames = FALSE,
                        escape = FALSE,
@@ -205,6 +211,12 @@ CRANsearcher <- function(){
 
       note <- ifelse(!is.null(crandb$snapshot_date), paste0(" (as of ", crandb$snapshot_date,")", ""))
 
+      if (length(search_d())<=1){
+        pkg <- search_d()
+      } else {
+        pkg <- paste(search_d(), collapse= ", ")
+      }
+
       if(identical(search_d(), character(0)) || nchar(search_d())<2){
         if (!is.null(crandb$a)){
 
@@ -217,19 +229,20 @@ CRANsearcher <- function(){
           paste("")
         }
       } else{
+        req(a_sub2() != 0)
         n <- dim(a_sub2())[1]
 
         if (!n==1){
           if (input$dates=="All time"){
-            paste0("There are ",n," packages related to '",search_d(),"' on CRAN", note,".")
+            paste0("There are ",n," packages related to '",pkg,"' on CRAN", note,".")
           } else {
-            paste0("There are ",n," packages related to '",search_d(),"' on CRAN released within the past ",input$dates,note,".")
+            paste0("There are ",n," packages related to '",pkg,"' on CRAN released within the past ",input$dates,note,".")
           }
         } else {
           if (input$dates=="All time"){
-            paste0("There is ",n," package related to '",search_d(),"' on CRAN", note, ".")
+            paste0("There is ",n," package related to '",pkg,"' on CRAN", note, ".")
           } else {
-            paste0("There is ",n," package related to '",search_d(),"' on CRAN released within the past ",input$dates,note,".")
+            paste0("There is ",n," package related to '",pkg,"' on CRAN released within the past ",input$dates,note,".")
           }
         }
       }