1j01/textual-paint
1
1
Fork 0
mirror of https://github.com/1j01/textual-paint.git synced 2025-01-05 13:43:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move callback outside try block

Browse Source
This commit is contained in:
Isaiah Odhner 2023-07-13 23:39:29 -04:00
parent f6607195e8
commit 1b8b07def9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/textual_paint/paint.py
View File

@ -3205,13 +3205,13 @@ class PaintApp(App[None]):
# then it should show an error message (although it would anyways when trying to read the file). # then it should show an error message (although it would anyways when trying to read the file).
if self.file_path: if self.file_path:
current_file_stat = None current_file_stat = None
opened = False
try: try:
current_file_stat = os.stat(self.file_path) current_file_stat = os.stat(self.file_path)
try: try:
file_to_be_opened_stat = os.stat(file_path) file_to_be_opened_stat = os.stat(file_path)
if os.path.samestat(current_file_stat, file_to_be_opened_stat): if os.path.samestat(current_file_stat, file_to_be_opened_stat):
# TODO: this callback shouldn't be in the try block opened = True
opened_callback()
return return
except FileNotFoundError: except FileNotFoundError:
self.message_box(_("Open"), file_path + "\n" + _("File not found.") + "\n" + _("Please verify that the correct path and file name are given."), "ok") self.message_box(_("Open"), file_path + "\n" + _("File not found.") + "\n" + _("Please verify that the correct path and file name are given."), "ok")
@ -3224,7 +3224,11 @@ class PaintApp(App[None]):
except Exception as e: except Exception as e:
self.message_box(_("Open"), _("An unknown error occurred while accessing %1.", self.file_path), "ok", error=e) self.message_box(_("Open"), _("An unknown error occurred while accessing %1.", self.file_path), "ok", error=e)
return return
# It's generally bad practice to invoke a callback within a try block,
# because it can lead to unexpected behavior if the callback throws an exception,
# such as the exception being silently swallowed, especially if some cases `pass`.
if opened:
opened_callback()
try: try:
if os.path.getsize(file_path) > MAX_FILE_SIZE: if os.path.getsize(file_path) > MAX_FILE_SIZE:
self.message_box(_("Open"), _("The file is too large to open."), "ok") self.message_box(_("Open"), _("The file is too large to open."), "ok")