watcher() now accepts a vector of paths

Author: shikokuchuo

R/watch.R

@@ -16,8 +16,8 @@
 #' It is possible to set a watch on a path that does not currently exist, and it
 #' will be monitored once created.
 #'
-#' @param path Character path to a file, or directory to watch recursively.
-#'   Defaults to the current working directory.
+#' @param path Character path to a file, or directory to watch recursively, or a
+#'   vector of paths. Defaults to the current working directory.
 #' @param callback A function or formula (see [rlang::as_function]), which takes
 #'   at least one argument. It will be called back with a character vector
 #'   comprising the paths of all files that have changed. The default, `NULL`,

man/watcher.Rd

@@ -112,6 +112,13 @@ SEXP watcher_create(SEXP path, SEXP callback, SEXP latency) {
   if (fsw_add_path(handle, watch_path) != FSW_OK)
     watcher_error(handle, "Watcher path invalid.");
 
+  if (XLENGTH(path) > 1) {
+    for (R_xlen_t i = 1; i < XLENGTH(path); i++) {
+      if (fsw_add_path(handle, Rf_translateChar(STRING_ELT(path, i))) != FSW_OK)
+        watcher_error(handle, "Watcher path invalid.");
+    }
+  }
+
   if (fsw_set_latency(handle, lat) != FSW_OK)
     watcher_error(handle, "Watcher latency cannot be negative.");
 

src/watcher.c

@@ -1,6 +1,8 @@
 dir <- file.path(tempdir(), "watcher-test")
+dir2 <- file.path(tempdir(), "watcher-test2")
 subdir <- file.path(dir, "文件subdir")
 dir.create(dir)
+dir.create(dir2)
 dir.create(subdir)
 
 test_that("watcher() logs", {
@@ -24,13 +26,14 @@ test_that("watcher() logs", {
 
 test_that("watcher() callbacks", {
   x <- 0L
-  w <- watcher(dir, callback = ~{is.character(.x) || stop(); x <<- x + 1L}, latency = 0.2)
+  w <- watcher(c(dir, dir2), callback = ~{is.character(.x) || stop(); x <<- x + 1L}, latency = 0.2)
   expect_output(print(w))
   expect_s3_class(w, "Watcher")
   expect_false(w$is_running())
   expect_true(w$start())
   expect_true(w$is_running())
   expect_type(w$get_path(), "character")
+  expect_length(w$get_path(), 2L)
   Sys.sleep(1)
   file.create(file.path(subdir, "testfile"))
   later::run_now(1)
@@ -48,15 +51,25 @@ test_that("watcher() callbacks", {
   later::run_now(1)
   expect_gte(x, 1L)
   x <- 0L
+  file.create(file.path(dir2, "français"))
+  later::run_now(1)
+  expect_gte(x, 1L)
+  x <- 0L
   file.remove(file.path(dir, "みらいヘ"))
   later::run_now(1)
   expect_gte(x, 1L)
+  x <- 0L
+  file.remove(file.path(dir2, "français"))
+  later::run_now(1)
+  expect_gte(x, 1L)
+  x <- 0L
   expect_true(w$stop())
   expect_false(w$is_running())
   rm(w)
 })
 
 unlink(dir, recursive = TRUE, force = TRUE)
+unlink(dir2, recursive = TRUE, force = TRUE)
 
 test_that("watcher() error handling", {
   expect_error(watcher(latency = -1), "Watcher latency cannot be negative.")