Merge pull request #401 from massimoaria/develop

Workaround for webshot2 bug on Windows machines

Author: massimoaria

inst/biblioshiny/libraries.R

@@ -20,7 +20,16 @@ libraries <- function(){
     if (!require(RCurl, quietly=TRUE)){install.packages("RCurl")}
     if (!require(openxlsx, quietly=TRUE)){install.packages("openxlsx"); require(openxlsx, quietly=TRUE)}
     if (!require(shinyWidgets, quietly=TRUE)){install.packages("shinyWidgets"); require(shinyWidgets, quietly=TRUE)}
-    if (!require(webshot2,quietly=TRUE)){install.packages("webshot2")}
+    if (!require(webshot2,quietly=TRUE)){
+      install.packages("https://cran.r-project.org/src/contrib/Archive/webshot2/webshot2_0.1.0.tar.gz", repos = NULL, type = "source")
+    }else{
+      pkgs <- installed.packages()[, "Version"]
+      vers <- pkgs["webshot2"]
+      if (vers!="0.1.0"){
+        detach("package:webshot2", unload = TRUE, force=TRUE)
+        install.packages("https://cran.r-project.org/src/contrib/Archive/webshot2/webshot2_0.1.0.tar.gz", repos = NULL, type = "source")
+      }
+    }
     if (!(require(chromote, quietly=TRUE))){install.packages("chromote"); require(chromote, quietly=TRUE)}
 
     ### workaround for webshot2 on shinyapps.io

inst/biblioshiny/server.R

@@ -3372,7 +3372,7 @@ To ensure the functionality of Biblioshiny,
   output$wordTable <- DT::renderDT({
     WordCloud()
 
-    DT::datatable(values$Words, rownames = FALSE,
+    DT::datatable(values$Words, rownames = FALSE, extensions = c("Buttons"),
                   options = list(pageLength = 10, dom = 'Bfrtip',
                                  buttons = list('pageLength',
                                                 list(extend = 'copy'),
@@ -3398,7 +3398,7 @@ To ensure the functionality of Biblioshiny,
   output$treeTable <- DT::renderDT({
     WordsT <- TreeMap()
 
-    DT::datatable(values$WordsT, rownames = FALSE,
+    DT::datatable(values$WordsT, rownames = FALSE, extensions = c("Buttons"),
                   options = list(pageLength = 10, dom = 'Bfrtip',
                                  buttons = list('pageLength',
                                                 list(extend = 'copy'),

inst/biblioshiny/utils.R

@@ -1915,13 +1915,15 @@ screenSh <- function(p, zoom = 2, type="vis"){
 
 screenShot <- function(p, filename, type){
   switch(Sys.info()[['sysname']],
-         Windows= {home <- Sys.getenv('R_USER')},
+         Windows= {home <- Sys.getenv('R_USER')
+         home <- gsub("/Documents","",home)
+         },
          Linux  = {home <- Sys.getenv('HOME')},
          Darwin = {home <- Sys.getenv('HOME')})
 
   # setting up the main directory
-  filename <- paste0(file.path(home,"downloads/"),filename)
-  
+  #filename <- paste0(file.path(home,"downloads/"),filename)
+  filename <- paste0(file.path(home,"downloads"),"/",filename)
   plot2png(p, filename, zoom = 2, type=type, tmpdir = tempdir())
 
 }