diff --git a/VERSION b/VERSION index f66ee6d..0365f38 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.1-beta.9 \ No newline at end of file +0.3.1-beta.10 \ No newline at end of file diff --git a/process/process_series.py b/process/process_series.py index b1f6f3e..56f8044 100755 --- a/process/process_series.py +++ b/process/process_series.py @@ -417,9 +417,7 @@ async def process_series(folder: Path) -> None: # As far as the processing step is concerned, theres' only one processing step and it's this one, # so we copy this one's information into a copy of the task file and hand that to the container. copied_task.process = task_processing - # The settings currently only exist in the first list entry of the processing modules. Therefore, - # take the settings from there. - copied_task.process.settings = task.process[0].settings + with open(folder / "in" / mercure_names.TASKFILE,"w") as task_file: json.dump(copied_task.dict(), task_file) diff --git a/routing/generate_taskfile.py b/routing/generate_taskfile.py index 88ee0a9..3c248db 100755 --- a/routing/generate_taskfile.py +++ b/routing/generate_taskfile.py @@ -103,14 +103,11 @@ def add_processing(uid: str, applied_rule: str, tags_list: Dict[str, str]) -> Op if module_config is not None: settings.update(module_config.settings) - rule_settings: List[Dict[str,Any]] = [] if isinstance(applied_rule_info.processing_settings,list): - rule_settings = applied_rule_info.processing_settings + if i < len(applied_rule_info.processing_settings): + settings.update(applied_rule_info.processing_settings[i]) else: - rule_settings = [applied_rule_info.processing_settings] - - if i < len(rule_settings): - settings.update(rule_settings[i]) + settings.update(applied_rule_info.processing_settings) # Store in the target structure process_info: TaskProcessing = TaskProcessing( diff --git a/tests/test_notifications.py b/tests/test_notifications.py index 36c717e..d141f2c 100644 --- a/tests/test_notifications.py +++ b/tests/test_notifications.py @@ -45,7 +45,7 @@ def make_config(action, trigger_reception, trigger_completion, trigger_completio notification_webhook="", notification_email="test@localhost, test2@localhost", processing_module=["test_module_1", "test_module_2"], - processing_settings=[{"foo":"bar"},{"bar":"baz"}], + processing_settings={"foo":"bar", "bar":"baz"}, processing_retain_images=True, notification_trigger_completion=trigger_completion, notification_trigger_reception=trigger_reception,