Skip to content

PICARD-2989: fix settings override recursion #2544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2024
Merged

PICARD-2989: fix settings override recursion #2544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4caebec
PICARD-2989: fix SettingsOverride recursion
phw Oct 9, 2024
6fb3012
Update script editor examples only if script editor is visible
phw Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions picard/ui/mainwindow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ def __init__(self, parent=None, disable_player=False):
self.player.error.connect(self._on_player_error)

self.script_editor_dialog = None
self.examples = None

self.tagger.pluginmanager.updates_available.connect(self.show_plugin_update_dialog)

Expand Down Expand Up @@ -1485,8 +1484,8 @@ def _select_new_naming_script(self, id):
def open_file_naming_script_editor(self):
"""Open the file naming script editor / manager in a new window.
"""
self.examples = ScriptEditorExamples(tagger=self.tagger)
self.script_editor_dialog = ScriptEditorDialog.show_instance(parent=self, examples=self.examples)
examples = ScriptEditorExamples(tagger=self.tagger)
self.script_editor_dialog = ScriptEditorDialog.show_instance(parent=self, examples=examples)
self.script_editor_dialog.signal_save.connect(self._script_editor_save)
self.script_editor_dialog.signal_selection_changed.connect(self._update_selector_from_script_editor)
self.script_editor_dialog.signal_index_changed.connect(self._script_editor_index_changed)
Expand Down Expand Up @@ -1516,22 +1515,23 @@ def _script_editor_closed(self):
def _update_script_editor_example_files(self):
"""Update the list of example files for the file naming script editor.
"""
if self.examples:
self.examples.update_sample_example_files()
script_editor_dialog = self.script_editor_dialog
if script_editor_dialog and script_editor_dialog.isVisible():
script_editor_dialog.examples.update_sample_example_files()
self._update_script_editor_examples()

def _update_script_editor_examples(self):
"""Update the examples for the file naming script editor, using current settings.
"""
if self.examples:
script_editor_dialog = self.script_editor_dialog
if script_editor_dialog and script_editor_dialog.isVisible():
config = get_config()
override = {
"rename_files": config.setting["rename_files"],
"move_files": config.setting["move_files"],
}
self.examples.update_examples(override=override)
if self.script_editor_dialog:
self.script_editor_dialog.display_examples()
script_editor_dialog.examples.update_examples(override=override)
script_editor_dialog.display_examples()

def _script_editor_index_changed(self):
"""Process "signal_index_changed" signal from the script editor.
Expand Down
3 changes: 2 additions & 1 deletion picard/ui/scripteditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ def update_examples(self, override=None, script_text=None):
script_text (str, optional): Text of the file naming script to use. Defaults to None.
"""
if override and isinstance(override, dict):
self.settings = SettingsOverride(self.settings, override)
config = get_config()
self.settings = SettingsOverride(config.setting, override)
if script_text and isinstance(script_text, str):
self.script_text = script_text

Expand Down
Loading