[processing][gdal] Fix escaping of delimiter parameter in retile

algorithm (cherry picked from commit 33b0dbe)
qgis · Feb 27, 2021 · 4274a7e · 4274a7e
1 parent 3bf2591
commit 4274a7e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/python/plugins/processing/algs/gdal/retile.py b/python/plugins/processing/algs/gdal/retile.py
@@ -206,7 +206,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             delimiter = self.parameterAsString(parameters, self.DELIMITER, context)
             if delimiter:
                 arguments.append('-csvDelim')
-                arguments.append('"{}"'.format(delimiter))
+                arguments.append(delimiter)
 
         arguments.append('-targetDir')
         arguments.append(self.parameterAsString(parameters, self.OUTPUT, context))

diff --git a/python/plugins/processing/tests/GdalAlgorithmsRasterTest.py b/python/plugins/processing/tests/GdalAlgorithmsRasterTest.py
@@ -1718,6 +1718,24 @@ def testRetile(self):
                  '-ps 256 256 -overlap 0 -levels 1 -s_srs EPSG:3111 -r near -ot Float32 -targetDir {} {}'.format(outdir, source)
                  ])
 
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': [source],
+                                        'OUTPUT_CSV': 'out.csv',
+                                        'DELIMITER': '',
+                                        'OUTPUT': outdir}, context, feedback),
+                ['gdal_retile.py',
+                 '-ps 256 256 -overlap 0 -levels 1 -r near -ot Float32 -csv out.csv -targetDir {} '.format(outdir) +
+                 source])
+
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': [source],
+                                        'OUTPUT_CSV': 'out.csv',
+                                        'DELIMITER': ';',
+                                        'OUTPUT': outdir}, context, feedback),
+                ['gdal_retile.py',
+                 '-ps 256 256 -overlap 0 -levels 1 -r near -ot Float32 -csv out.csv -csvDelim ";" -targetDir {} '.format(outdir) +
+                 source])
+
             # additional parameters
             self.assertEqual(
                 alg.getConsoleCommands({'INPUT': [source],