merge: Easier debugging for filehandlers

Author: Wuestengecko

capellambse/filehandler/__init__.py

@@ -42,13 +42,14 @@ def split_protocol(uri: str | os.PathLike) -> tuple[str, str | os.PathLike]:
     if isinstance(uri, str) and _looks_like_scp(uri):
         return "git", uri
 
+    uri = os.fspath(uri)
     pattern = r"^(\w+)([+:])"
-    prefix_match = re.search(pattern, str(uri))
+    prefix_match = re.search(pattern, uri)
 
     if prefix_match:
         handler_name = prefix_match.group(1)
         if prefix_match.group(2) == "+":
-            uri = os.fspath(uri)[len(prefix_match.group(0)) :]
+            uri = uri[len(prefix_match.group(0)) :]
     else:
         handler_name = "file"
     return (handler_name, uri)

capellambse/filehandler/git.py

@@ -748,7 +748,6 @@ def __init_worktree(self) -> None:
                 "--no-checkout",
                 worktree,
                 self.__hash,
-                silent=True,
             )
         except:
             os.rmdir(worktree)
@@ -847,18 +846,15 @@ def _git(
             stderr = err.stderr
             raise
         finally:
-            if silent:
-                err_level = ret_level = logging.DEBUG
-            elif returncode != 0:
-                err_level = ret_level = logging.ERROR
+            if returncode != 0 and not silent:
+                level = logging.ERROR
             else:
-                err_level = logging.INFO
-                ret_level = logging.DEBUG
+                level = logging.DEBUG
 
             if stderr:
                 if isinstance(stderr, bytes):
                     stderr = stderr.decode("utf-8")
 
                 for line in stderr.splitlines():
-                    LOGGER.getChild("git").log(err_level, "%s", line)
-            LOGGER.log(ret_level, "Exit status: %d", returncode)
+                    LOGGER.getChild("git").log(level, "%s", line)
+            LOGGER.log(level, "Exit status: %d", returncode)

capellambse/repl.py

@@ -99,6 +99,10 @@ def __exit__(self, *_):
 
 def _load_model_info(datapath: str | importlib.abc.Traversable) -> _ModelInfo:
     if isinstance(datapath, str):
+        try:
+            return json.loads(datapath)
+        except json.JSONDecodeError:
+            pass
         datapath = imr.files(capellambse) / "known_models" / f"{datapath}.json"
     with datapath.open("r", encoding="utf-8") as file:
         return json.load(file)
@@ -113,12 +117,12 @@ def _parse_args(args: list[str] | None = None) -> dict[str, t.Any]:
     parser = argparse.ArgumentParser("capellambse/repl.py")
     parser.add_argument(
         "model",
-        default="5.0",
+        default="test-5.0",
         nargs=1,
         help=(
-            "A model name from repl_models, an AIRD file, or a JSON file"
-            " describing the model. The following repl_models are known: "
-            + ", ".join(f"``{i}``" for i in known_models)
+            "A model name from known_models, an AIRD file, or the path to or"
+            " contents of a JSON file describing the model. The following"
+            " models are known: " + ", ".join(f"``{i}``" for i in known_models)
         ),
     )
     parser.add_argument(