refactor(bukuserver.views): unify msg between log and flash

jarun · Jan 13, 2022 · 0903669 · 0903669
1 parent 4380537
commit 0903669
Showing 1 changed file with 15 additions and 25 deletions.
diff --git a/bukuserver/views.py b/bukuserver/views.py
@@ -192,11 +192,9 @@ def create_model(self, form):
             )
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                flash(
-                    gettext("Failed to create record. %(error)s", error=str(ex)),
-                    "error",
-                )
-                LOG.exception("Failed to create record.")
+                msg = "Failed to create record."
+                flash( gettext("%(msg)s %(error)s", msg=msg, error=str(ex)), "error", )
+                LOG.exception(msg)
             return False
         else:
             self.after_model_change(form, model, True)
@@ -208,11 +206,9 @@ def delete_model(self, model):
             res = self.bukudb.delete_rec(model.id)
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                flash(
-                    gettext("Failed to delete record. %(error)s", error=str(ex)),
-                    "error",
-                )
-                LOG.exception("Failed to delete record.")
+                msg = "Failed to delete record."
+                flash( gettext("%(msg)s %(error)s", msg=msg, error=str(ex)), "error", )
+                LOG.exception(msg)
             return False
         else:
             self.after_model_delete(model)
@@ -416,11 +412,9 @@ def update_model(self, form: forms.BookmarkForm, model: Namespace):
             )
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                flash(
-                    gettext("Failed to update record. %(error)s", error=str(ex)),
-                    "error",
-                )
-                LOG.exception("Failed to update record.")
+                msg = "Failed to update record."
+                flash( gettext("%(msg)s %(error)s", msg=msg, error=str(ex)), "error", )
+                LOG.exception(msg)
             return False
         else:
             self.after_model_change(form, model, False)
@@ -568,11 +562,9 @@ def delete_model(self, model):
             res = self.bukudb.delete_tag_at_index(0, model.name, chatty=False)
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                flash(
-                    gettext("Failed to delete record. %(error)s", error=str(ex)),
-                    "error",
-                )
-                LOG.exception("Failed to delete record.")
+                msg = "Failed to delete record."
+                flash( gettext("%(msg)s %(error)s", msg=msg, error=str(ex)), "error", )
+                LOG.exception(msg)
             return False
         else:
             self.after_model_delete(model)
@@ -587,11 +579,9 @@ def update_model(self, form, model):
             res = self.bukudb.replace_tag(original_name, [model.name])
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                flash(
-                    gettext("Failed to update record. %(error)s", error=str(ex)),
-                    "error",
-                )
-                LOG.exception("Failed to update record.")
+                msg = "Failed to update record."
+                flash( gettext("%(msg)s %(error)s", msg=msg, error=str(ex)), "error", )
+                LOG.exception(msg)
             return False
         else:
             self.after_model_change(form, model, False)