[FIX] common.commands.odoobin: Escape markup in odoo-bin logs

Escape Rich's markup-like substrings in odoo-bin logs to avoid having information stripped from the logs when displayed in the console. For example, the following log line: ``` Element '<xpath expr="//field[@name='test']">' cannot be located in parent view ``` Was previously stripped down to: ``` Element '<xpath expr="//field">' cannot be located in parent view ``` Additionally, a new argument is passed to the odoo-bin command and children to allow disabling pretty-printing of the logs.
odoo-odev · Oct 17, 2024 · 8d4eecd · 8d4eecd
1 parent abfc3ef
commit 8d4eecd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/odev/_version.py b/odev/_version.py
@@ -22,4 +22,4 @@
 # or merged change.
 # ------------------------------------------------------------------------------
 
-__version__ = "4.8.3"
+__version__ = "4.8.4"
diff --git a/odev/common/commands/odoobin.py b/odev/common/commands/odoobin.py
@@ -5,6 +5,8 @@
 from pathlib import Path
 from typing import Mapping, Optional, Union
 
+from rich import markup
+
 from odev.common import args, string
 from odev.common.commands import LocalDatabaseCommand
 from odev.common.databases import LocalDatabase
@@ -68,6 +70,11 @@ class OdoobinCommand(LocalDatabaseCommand, ABC):
         If not specified, defaults to the common worktree for the current Odoo version.
         """,
     )
+    pretty = args.Flag(
+        aliases=["--no-pretty"],
+        description="Do not pretty print the output of odoo-bin but rather display logs as output by the subprocess.",
+        default=True,
+    )
 
     # --------------------------------------------------------------------------
     # Properties
@@ -186,8 +193,8 @@ def odoobin_progress(self, line: str):
         """Beautify odoo logs on the fly."""
         match = self._parse_progress_log_line(line)
 
-        if match is None:
-            return self.print(line, highlight=False, soft_wrap=False)
+        if match is None or not self.args.pretty:
+            return self.print(markup.escape(line), highlight=False, soft_wrap=False)
 
         self.last_level = match.group("level").lower()
         self._print_progress_log_line(match)