From e46428c3a455262d85bdce6744a89117d93d2ddf Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Sun, 26 May 2024 18:34:42 +0200 Subject: [PATCH] ScriptImportExportError -> PicardScriptImportExportError --- picard/script/serializer.py | 10 +++++----- picard/ui/options/scripting.py | 10 +++++----- picard/ui/scripteditor.py | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/picard/script/serializer.py b/picard/script/serializer.py index 99e5c3a19..16ae20d27 100644 --- a/picard/script/serializer.py +++ b/picard/script/serializer.py @@ -57,7 +57,7 @@ class PicardScriptType(IntEnum): FILENAMING = 2 -class ScriptImportExportError(Exception): +class PicardScriptImportExportError(Exception): def __init__(self, *args, format=None, filename=None, error_msg=None): self.format = format self.filename = filename @@ -226,7 +226,7 @@ class PicardScript(): with open(filename, 'w', encoding='utf-8') as o_file: o_file.write(script_text) except OSError as error: - raise ScriptImportExportError(format=FILE_ERROR_EXPORT, filename=filename, error_msg=error.strerror) + raise PicardScriptImportExportError(format=FILE_ERROR_EXPORT, filename=filename, error_msg=error.strerror) dialog = QtWidgets.QMessageBox( QtWidgets.QMessageBox.Icon.Information, _("Export Script"), @@ -255,14 +255,14 @@ class PicardScript(): with open(filename, 'r', encoding='utf-8') as i_file: file_content = i_file.read() except OSError as error: - raise ScriptImportExportError(format=FILE_ERROR_IMPORT, filename=filename, error_msg=error.strerror) + raise PicardScriptImportExportError(format=FILE_ERROR_IMPORT, filename=filename, error_msg=error.strerror) if not file_content.strip(): - raise ScriptImportExportError(format=FILE_ERROR_IMPORT, filename=filename, error_msg=N_("The file was empty")) + raise PicardScriptImportExportError(format=FILE_ERROR_IMPORT, filename=filename, error_msg=N_("The file was empty")) if file_type == cls._file_types()['package']: try: return cls().create_from_yaml(file_content) except PicardScriptFromFileError as error: - raise ScriptImportExportError(format=FILE_ERROR_DECODE, filename=filename, error_msg=error) + raise PicardScriptImportExportError(format=FILE_ERROR_DECODE, filename=filename, error_msg=error) else: return cls( title=_("Imported from %s") % filename, diff --git a/picard/ui/options/scripting.py b/picard/ui/options/scripting.py index 83f84c89e..714f74bfb 100644 --- a/picard/ui/options/scripting.py +++ b/picard/ui/options/scripting.py @@ -47,8 +47,8 @@ from picard.script import ( save_tagging_scripts_to_config, ) from picard.script.serializer import ( + PicardScriptImportExportError, PicardTaggingScript, - ScriptImportExportError, ) from picard.ui import ( @@ -151,12 +151,12 @@ class ScriptingOptionsPage(OptionsPage): error_message = _(fmt) % params self.display_error(ScriptFileError(_(title), error_message)) - def output_file_error(self, error: ScriptImportExportError): + def output_file_error(self, error: PicardScriptImportExportError): """Log file error and display error message dialog. Args: fmt (str): Format for the error type being displayed - error (ScriptImportExportError): The error as a ScriptImportExportError instance + error (PicardScriptImportExportError): The error as a PicardScriptImportExportError instance """ params = { 'filename': error.filename, @@ -170,7 +170,7 @@ class ScriptingOptionsPage(OptionsPage): """ try: tagging_script = PicardTaggingScript().import_script(self) - except ScriptImportExportError as error: + except PicardScriptImportExportError as error: self.output_file_error(error) return if tagging_script: @@ -196,7 +196,7 @@ class ScriptingOptionsPage(OptionsPage): tagging_script = PicardTaggingScript(title=title, script=content) try: tagging_script.export_script(parent=self) - except ScriptImportExportError as error: + except PicardScriptImportExportError as error: self.output_file_error(error) def enable_tagger_scripts_toggled(self, on): diff --git a/picard/ui/scripteditor.py b/picard/ui/scripteditor.py index ae9fb43fe..cefa33375 100644 --- a/picard/ui/scripteditor.py +++ b/picard/ui/scripteditor.py @@ -61,7 +61,7 @@ from picard.script import ( ) from picard.script.serializer import ( FileNamingScript, - ScriptImportExportError, + PicardScriptImportExportError, ) from picard.util import ( get_base_title, @@ -1234,7 +1234,7 @@ class ScriptEditorDialog(PicardDialog, SingletonDialog): """ try: script_item = FileNamingScript().import_script(self) - except ScriptImportExportError as error: + except PicardScriptImportExportError as error: self.output_file_error(error.format, error.filename, error.error_msg) return if script_item: @@ -1281,7 +1281,7 @@ class ScriptEditorDialog(PicardDialog, SingletonDialog): script_item.title = get_base_title(script_item.title) try: script_item.export_script(parent=self) - except ScriptImportExportError as error: + except PicardScriptImportExportError as error: self.output_file_error(error.format, error.filename, error.error_msg) def check_formats(self):