rattail/rattail
2
0
Fork 0
Code Issues 7 Pull requests Actions Packages Projects Releases Wiki Activity

Fix another bug with import handler kwargs via command line

Browse source
This commit is contained in:
Lance Edgar 2024-05-16 09:36:38 -05:00
parent 3529f272f1
commit 0bc5f2aa21
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rattail/commands/importing.py
View file

@ -115,12 +115,6 @@ class ImportCommandHandler(GenericHandler):
handler = self.app.get_import_handler(self.import_handler_key, require=True) handler = self.app.get_import_handler(self.import_handler_key, require=True)
return type(handler) return type(handler)
def get_handler_kwargs(self, **kwargs):
"""
Return a dict of kwargs to be passed to the handler factory.
"""
return kwargs
def get_handler(self, params, **kwargs): def get_handler(self, params, **kwargs):
""" """
Returns a handler instance to be used by the command. Returns a handler instance to be used by the command.
@ -135,7 +129,6 @@ class ImportCommandHandler(GenericHandler):
kwargs.setdefault('batch_size', params['batch_size']) kwargs.setdefault('batch_size', params['batch_size'])
if params['max_diffs']: if params['max_diffs']:
kwargs.setdefault('diff_max_display', params['max_diffs']) kwargs.setdefault('diff_max_display', params['max_diffs'])
kwargs = self.get_handler_kwargs(**kwargs)
if params.get('handler_kwargs'): if params.get('handler_kwargs'):
kwargs.update(params['handler_kwargs']) kwargs.update(params['handler_kwargs'])
return factory(self.config, **kwargs) return factory(self.config, **kwargs)
@ -315,6 +308,12 @@ class ImportSubcommand(Subcommand):
params['handler_kwargs'] = self.get_handler_kwargs(args=args) params['handler_kwargs'] = self.get_handler_kwargs(args=args)
handler.run(params, progress=self.progress) handler.run(params, progress=self.progress)
def get_handler_kwargs(self, **kwargs):
"""
Return a dict of kwargs to be passed to the handler factory.
"""
return kwargs
# TODO: deprecate / remote this, use ImportFileSubcommand instead # TODO: deprecate / remote this, use ImportFileSubcommand instead
class ImportFromCSV(ImportSubcommand): class ImportFromCSV(ImportSubcommand):