Skip to content

Commit 9cec6a7

Browse files
committed
[Bugfix][Processing] Py and R scripts parsing file param
1 parent d38165d commit 9cec6a7

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

python/plugins/processing/algs/r/RAlgorithm.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,12 @@ def processInputParameterToken(self, token, name):
254254
param = ParameterExtent(name, desc)
255255
elif token.lower().strip() == 'point':
256256
param = ParameterPoint(name, desc)
257-
elif token.lower().strip() == 'file':
257+
elif token.lower().strip().startswith('file'):
258258
param = ParameterFile(name, desc, False)
259-
elif token.lower().strip() == 'folder':
259+
ext = token.strip()[len('file') + 1:]
260+
if ext:
261+
param.ext = ext
262+
elif token.lower().strip().startswith('folder'):
260263
param = ParameterFile(name, desc, True)
261264
elif token.lower().strip().startswith('string'):
262265
default = token.strip()[len('string') + 1:]
@@ -270,7 +273,7 @@ def processInputParameterToken(self, token, name):
270273
param = ParameterString(name, desc, default, multiline=True)
271274
else:
272275
param = ParameterString(name, desc, multiline=True)
273-
elif token.lower().strip() == 'crs':
276+
elif token.lower().strip().startswith('crs'):
274277
default = token.strip()[len('crs') + 1:]
275278
if default:
276279
param = ParameterCrs(name, desc, default)

python/plugins/processing/script/ScriptAlgorithm.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,12 @@ def processInputParameterToken(self, token, name):
233233
param = ParameterExtent(name, descName)
234234
elif token.lower().strip() == 'point':
235235
param = ParameterPoint(name, descName)
236-
elif token.lower().strip() == 'file':
236+
elif token.lower().strip().startswith('file'):
237237
param = ParameterFile(name, descName, False)
238-
elif token.lower().strip() == 'folder':
238+
ext = token.strip()[len('file') + 1:]
239+
if ext:
240+
param.ext = ext
241+
elif token.lower().strip().startswith('folder'):
239242
param = ParameterFile(name, descName, True)
240243
elif token.lower().strip().startswith('number'):
241244
default = token.strip()[len('number') + 1:]

0 commit comments

Comments
 (0)