Manged removing the tempdir() from the file names (so that the files …

…are relative to root) so that it also works under Windows, other smaller corrections
sjentsch · Aug 4, 2023 · e5554bf · e5554bf
1 parent 7a4728d
commit e5554bf
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -4,9 +4,9 @@
 * added `describe_omv` (put a title and a description at the top of a data
   set), `search_omv` (finding values in a data set) and `replace_omv`
   (replacing values in a data set with other values)
-* improved handling in jamovi (if jvmReadWrite is run in jamovi modules, e.g.,
-  Rj, a new jamovi session is opened with the data set that was modified by one
-  of the helper functions)
+* improved handling in jamovi (if jmvReadWrite is run in jamovi modules, e.g.,
+  `Rj`, a new jamovi session is opened with the data set that was modified by
+  one of the helper functions)
 * improved handling of the jamovi protocol buffers (currently used for
   extracting `jmv`-syntax in the data sets, but with the perspective of
   creating analyses from `jmv`-syntax)

diff --git a/R/write_omv.R b/R/write_omv.R
@@ -414,12 +414,12 @@ add2ZIP <- function(fleZIP = "", crrHdl = NULL, crrFle = c(), txtOut = "", ptbOu
             clsRmv()
             stop(sprintf("Parameter isn\'t a file handle pointing to a file to be zipped:\n%s", trimws(utils::capture.output(utils::str(crrHdl)))))
         }
-        crrFle <- gsub(file.path(tempdir(), ""), "", summary(crrHdl)[["description"]])
+        crrFle <- rmvTmp(summary(crrHdl)[["description"]])
         close(crrHdl)
         rm(list = deparse(substitute(crrHdl)), envir = sys.frame(-1))
     # if a file name is given, open a connection, write whatever is required
     } else if (is.character(crrFle)) {
-        crrFle[1] <- gsub(file.path(tempdir(), ""), "", crrFle[1])
+        crrFle[1] <- rmvTmp(crrFle[1])
         if (dirname(crrFle[1]) != "." && !dir.exists(file.path(tempdir(), dirname(crrFle[1])))) dir.create(file.path(tempdir(), dirname(crrFle[1])))
         crrHdl <- file(file.path(tempdir(), crrFle[1]), open = ifelse(length(crrFle) > 1, crrFle[2], "w"))
         if        (all(nzchar(txtOut))) {
@@ -442,3 +442,7 @@ add2ZIP <- function(fleZIP = "", crrHdl = NULL, crrFle = c(), txtOut = "", ptbOu
 
     return(TRUE)
 }
+
+rmvTmp <- function(fleNme = "") {
+    return(sub("^/|^\\\\", "", sub(tempdir(), "", fleNme, fixed = TRUE)))
+}
diff --git a/README.md b/README.md
@@ -202,9 +202,9 @@ list.files(".", "Trial.omv")
 #> [1] "Trial.omv"
 file.info("Trial.omv")
 #>           size isdir mode               mtime               ctime
-#> Trial.omv 1723 FALSE  664 2023-08-04 14:59:50 2023-08-04 14:59:50
+#> Trial.omv 1723 FALSE  664 2023-08-04 23:07:05 2023-08-04 23:07:05
 #>                         atime  uid  gid    uname   grname
-#> Trial.omv 2023-08-04 14:59:50 1000 1000 sjentsch sjentsch
+#> Trial.omv 2023-08-04 23:07:05 1000 1000 sjentsch sjentsch
 unlink("Trial.omv")
 ```
 

diff --git a/man/search_omv.Rd b/man/search_omv.Rd
diff --git a/tests/testthat/test-describe_omv.R b/tests/testthat/test-describe_omv.R
@@ -133,7 +133,7 @@ test_that("describe_omv works", {
         expect_warning(expect_null(describe_omv(dtaInp = jmvReadWrite::ToothGrowth[, c("len", "supp", "dose")], fleOut = nmeOut, dtaTtl = "ToothGrowth", dtaDsc = chrDsc)))
         expect_false(file.exists(nmeOut))
     }
-        
+
     # code coverage
     expect_error(describe_omv(dtaInp = jmvReadWrite::ToothGrowth[, c("len", "supp", "dose")], fleOut = nmeOut),
       regexp = "^Calling describe_omv requires either the parameter dtaTtl \\(character vector\\) or the parameter dtaDsc \\(character vector or named list\\)\\.")