Use callWith() for simpler debugging with dots

Author: hsonne

DESCRIPTION

@@ -24,5 +24,5 @@ Suggests:
 Remotes: 
     github::kwb-r/kwb.utils
 Encoding: UTF-8
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Config/testthat/edition: 3

R/getObservationRecordsFromEuLines.R

@@ -13,13 +13,13 @@ getObservationRecordsFromEuLines <- function(
   )
 
   if (kwb.utils::isTryError(observations)) {
-    headerInfo <- getHeaderInfo(eu_lines)
-    observations <- extractObservationData(
-      eu_lines, 
-      headerInfo, 
-      header.info,
+    observations <- kwb.utils::callWith(
+      extractObservationData,
+      euLines = eu_lines, 
+      headerInfo = getHeaderInfo(eu_lines), 
+      header.info = header.info,
       file = file,
-      ...
+      if (interactive()) list() else list(...)
     )
   }
 

R/getObservationsFromEuLines.R

@@ -154,7 +154,8 @@ readObservationsFromCsvText <- function(text, sep, dec, quote, colClasses, ...)
     colClasses <- colClasses[colNames]
   }
 
-  utils::read.table(
+  kwb.utils::callWith(
+    utils::read.table,
     text = text, 
     sep = sep, 
     dec = dec, 
@@ -163,7 +164,7 @@ readObservationsFromCsvText <- function(text, sep, dec, quote, colClasses, ...)
     blank.lines.skip = FALSE, 
     stringsAsFactors = FALSE, 
     colClasses = colClasses,
-    ...
+    if (interactive()) list() else list(...)
   )
 }
 

R/readAndMergeEuCodedFiles.R

@@ -33,12 +33,13 @@ readAndMergeEuCodedFiles <- function(
 {
   # by setting simple.algorithm = FALSE we get unique column names, e.g. "ADE"
   # and "ADE.1"
-  inspection.data.list <- readEuCodedFiles(
+  inspection.data.list <- kwb.utils::callWith(
+    readEuCodedFiles,
     input.files = input.files, 
     dbg = dbg, 
     name.convention = name.convention,
     simple.algorithm = FALSE, 
-    ...
+    if (interactive()) list() else list(...)
   )
 
   result <- mergeInspectionData(inspection.data.list)

R/readEuCodedFile.R

@@ -104,12 +104,13 @@ readEuCodedFile <- function(
 
   observations <- run(
     "Extracting observation records",
-    getObservationRecordsFromEuLines(
+    kwb.utils::callWith(
+      getObservationRecordsFromEuLines, 
       eu_lines = eu_lines, 
       header.info = header.info, 
       dbg = dbg,
       file = input.file,
-      ...
+      if (interactive()) list() else list(...)
     )
   )
 

R/readEuCodedFiles.R

@@ -33,10 +33,12 @@ readEuCodedFiles <- function(
       "input file %d/%d: %s\n", i, length(input.files), input.file
     ))
 
-    inspectionData <- try(
-      readEuCodedFile(input.file, dbg = dbg, ...),
-      silent = TRUE
-    )
+    inspectionData <- try(silent = TRUE, kwb.utils::callWith(
+      readEuCodedFile,
+      input.file = input.file, 
+      dbg = dbg, 
+      if (interactive()) list() else list(...)
+    ))
 
     # Return the error object if an error occurred
     if (kwb.utils::isTryError(inspectionData)) {

R/writeEuCodedFiles.R

@@ -94,7 +94,7 @@ writeEuCodedFile <- function(
   output.lines <- kwb.utils::catAndRun(
     "Formatting lines",
     dbg = dbg, 
-    toEuFormat(inspection.data, version, dbg = dbg)
+    toEuFormat(inspection.data, version, dbg = dbg, ...)
   )
 
   if (is.null(output.file)) {