Shell quote "variant" OptionList arguments opengeos#46

brownag · May 6, 2022 · ebfcf15 · ebfcf15
1 parent e582eb6
commit ebfcf15
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/PY2R/automation.py b/PY2R/automation.py
@@ -99,6 +99,28 @@ def function_block(line, ff):
                   + "\n"
               )
               ff.write("  }" + "\n")
+            elif '"' not in para and "wd" in para:
+              ff.write("  if (!missing(" + para + ")) {" + "\n")
+              ff.write(
+                  '    args <- paste(args, paste0("--'
+                  + para
+                  + '=", wbt_file_path('
+                  + para
+                  + ")))"
+                  + "\n"
+              )
+              ff.write("  }" + "\n")
+            elif "inputs" in para or "variant" in para:
+              ff.write("  if (!is.null(" + para + ")) {" + "\n")
+              ff.write(
+                  '    args <- paste(args, paste0("--'
+                  + para
+                  + '=", wbt_file_path('
+                  + para
+                  + ")))"
+                  + "\n"
+              )
+              ff.write("  }" + "\n")
             elif '"' not in para:
               ff.write("  if (!is.null(" + para + ")) {" + "\n")
               ff.write(

diff --git a/PY2R/scripts/image_analysis.R b/PY2R/scripts/image_analysis.R
@@ -708,7 +708,7 @@ wbt_tophat_transform <- function(input, output, filterx=11, filtery=11, variant=
     args <- paste(args, paste0("--filtery=", filtery))
   }
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (!missing(wd)) {
     args <- paste(args, paste0("--wd=", wd))
@@ -1513,7 +1513,7 @@ wbt_laplacian_filter <- function(input, output, variant="3x3(1)", clip=0.0, wd=N
   args <- paste(args, paste0("--input=", wbt_file_path(input)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (!is.null(clip)) {
     args <- paste(args, paste0("--clip=", clip))
@@ -1629,7 +1629,7 @@ wbt_line_detection_filter <- function(input, output, variant="vertical", absvals
   args <- paste(args, paste0("--input=", wbt_file_path(input)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (absvals) {
     args <- paste(args, "--absvals")
@@ -2072,7 +2072,7 @@ wbt_sobel_filter <- function(input, output, variant="3x3", clip=0.0, wd=NULL, ve
   args <- paste(args, paste0("--input=", wbt_file_path(input)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (!is.null(clip)) {
     args <- paste(args, paste0("--clip=", clip))

diff --git a/PY2R/scripts/stream_network_analysis.R b/PY2R/scripts/stream_network_analysis.R
@@ -94,7 +94,7 @@ wbt_extract_valleys <- function(dem, output, variant="LQ", line_thin=TRUE, filte
   args <- paste(args, paste0("--dem=", wbt_file_path(dem)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (line_thin) {
     args <- paste(args, "--line_thin")

diff --git a/R/image_analysis.R b/R/image_analysis.R
@@ -708,7 +708,7 @@ wbt_tophat_transform <- function(input, output, filterx=11, filtery=11, variant=
     args <- paste(args, paste0("--filtery=", filtery))
   }
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (!missing(wd)) {
     args <- paste(args, paste0("--wd=", wd))
@@ -1513,7 +1513,7 @@ wbt_laplacian_filter <- function(input, output, variant="3x3(1)", clip=0.0, wd=N
   args <- paste(args, paste0("--input=", wbt_file_path(input)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (!is.null(clip)) {
     args <- paste(args, paste0("--clip=", clip))
@@ -1629,7 +1629,7 @@ wbt_line_detection_filter <- function(input, output, variant="vertical", absvals
   args <- paste(args, paste0("--input=", wbt_file_path(input)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (absvals) {
     args <- paste(args, "--absvals")
@@ -2072,7 +2072,7 @@ wbt_sobel_filter <- function(input, output, variant="3x3", clip=0.0, wd=NULL, ve
   args <- paste(args, paste0("--input=", wbt_file_path(input)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (!is.null(clip)) {
     args <- paste(args, paste0("--clip=", clip))

diff --git a/R/stream_network_analysis.R b/R/stream_network_analysis.R
@@ -94,7 +94,7 @@ wbt_extract_valleys <- function(dem, output, variant="LQ", line_thin=TRUE, filte
   args <- paste(args, paste0("--dem=", wbt_file_path(dem)))
   args <- paste(args, paste0("--output=", wbt_file_path(output)))
   if (!is.null(variant)) {
-    args <- paste(args, paste0("--variant=", variant))
+    args <- paste(args, paste0("--variant=", wbt_file_path(variant)))
   }
   if (line_thin) {
     args <- paste(args, "--line_thin")