Skip to content

Commit f281ff5

Browse files
committed
[Bugfix][Processing] Py and R scripts parsing file param
Need to be cherry-picked
1 parent 153835e commit f281ff5

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,12 @@ def processInputParameterToken(self, token, name):
241241
param = ParameterTableField(name, desc, field)
242242
elif token.lower().strip() == 'extent':
243243
param = ParameterExtent(name, desc)
244-
elif token.lower().strip() == 'file':
244+
elif token.lower().strip().startswith('file'):
245245
param = ParameterFile(name, desc, False)
246-
elif token.lower().strip() == 'folder':
246+
ext = token.strip()[len('file') + 1:]
247+
if ext:
248+
param.ext = ext
249+
elif token.lower().strip().startswith('folder'):
247250
param = ParameterFile(name, desc, True)
248251
elif token.lower().strip().startswith('string'):
249252
default = token.strip()[len('string') + 1:]
@@ -257,7 +260,7 @@ def processInputParameterToken(self, token, name):
257260
param = ParameterString(name, desc, default, multiline=True)
258261
else:
259262
param = ParameterString(name, desc, multiline=True)
260-
elif token.lower().strip() == 'crs':
263+
elif token.lower().strip().startswith('crs'):
261264
default = token.strip()[len('crs') + 1:]
262265
if default:
263266
param = ParameterCrs(name, desc, default)

python/plugins/processing/script/ScriptAlgorithm.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,12 @@ def processInputParameterToken(self, token, name):
225225
param = ParameterBoolean(name, descName)
226226
elif token.lower().strip() == 'extent':
227227
param = ParameterExtent(name, descName)
228-
elif token.lower().strip() == 'file':
228+
elif token.lower().strip().startswith('file'):
229229
param = ParameterFile(name, descName, False)
230-
elif token.lower().strip() == 'folder':
230+
ext = token.strip()[len('file') + 1:]
231+
if ext:
232+
param.ext = ext
233+
elif token.lower().strip().startswith('folder'):
231234
param = ParameterFile(name, descName, True)
232235
elif token.lower().strip().startswith('number'):
233236
default = token.strip()[len('number') + 1:]

0 commit comments

Comments
 (0)