factor out some code from #1918

yihui · Jan 29, 2021 · 9973982 · 9973982 · yihui · Jan 29, 2021
1 parent 20f8571
commit 9973982
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/R/plot.R b/R/plot.R
@@ -520,18 +520,17 @@ runtime_shiny = function() {
 
 webshot_available = local({
   res = NULL  # cache the availability of webshot2/Chrome and webshot/PhantomJS
+  test = function(pkg, fun) {
+    tryCatch(
+      file.exists(getFromNamespace(fun, pkg)()),
+      error = function(e) FALSE
+    )
+  }
   function() {
-    if (is.null(res))
-      res <<- c(
-        webshot2 = (
-          loadable('webshot2') &&
-          tryCatch(
-            file.exists(getFromNamespace('find_chrome', 'chromote')()),
-            error = function(e) FALSE
-          )
-        ),
-        webshot = loadable('webshot') && !is.null(getFromNamespace('find_phantom', 'webshot')())
-      )
+    if (is.null(res)) res <<- c(
+      webshot2 = test('webshot2', 'find_chrome'),
+      webshot  = test('webshot',  'find_phantom')
+    )
     res
   }
 })