[Bugfix][Processing] Py and R scripts parsing file param

qgis · Mar 20, 2018 · 9cec6a7 · 9cec6a7
1 parent d38165d
commit 9cec6a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/r/RAlgorithm.py b/python/plugins/processing/algs/r/RAlgorithm.py
@@ -254,9 +254,12 @@ def processInputParameterToken(self, token, name):
             param = ParameterExtent(name, desc)
         elif token.lower().strip() == 'point':
             param = ParameterPoint(name, desc)
-        elif token.lower().strip() == 'file':
+        elif token.lower().strip().startswith('file'):
             param = ParameterFile(name, desc, False)
-        elif token.lower().strip() == 'folder':
+            ext = token.strip()[len('file') + 1:]
+            if ext:
+                param.ext = ext
+        elif token.lower().strip().startswith('folder'):
             param = ParameterFile(name, desc, True)
         elif token.lower().strip().startswith('string'):
             default = token.strip()[len('string') + 1:]
@@ -270,7 +273,7 @@ def processInputParameterToken(self, token, name):
                 param = ParameterString(name, desc, default, multiline=True)
             else:
                 param = ParameterString(name, desc, multiline=True)
-        elif token.lower().strip() == 'crs':
+        elif token.lower().strip().startswith('crs'):
             default = token.strip()[len('crs') + 1:]
             if default:
                 param = ParameterCrs(name, desc, default)

diff --git a/python/plugins/processing/script/ScriptAlgorithm.py b/python/plugins/processing/script/ScriptAlgorithm.py
@@ -233,9 +233,12 @@ def processInputParameterToken(self, token, name):
             param = ParameterExtent(name, descName)
         elif token.lower().strip() == 'point':
             param = ParameterPoint(name, descName)
-        elif token.lower().strip() == 'file':
+        elif token.lower().strip().startswith('file'):
             param = ParameterFile(name, descName, False)
-        elif token.lower().strip() == 'folder':
+            ext = token.strip()[len('file') + 1:]
+            if ext:
+                param.ext = ext
+        elif token.lower().strip().startswith('folder'):
             param = ParameterFile(name, descName, True)
         elif token.lower().strip().startswith('number'):
             default = token.strip()[len('number') + 1:]