From 7a1ec07bc1e386e636adeee9061715d4203ae79f Mon Sep 17 00:00:00 2001
From: TannazVhdBMWExt <tannaz.vahidi@partner.bmw.de>
Date: Mon, 5 Aug 2024 15:34:49 +0200
Subject: [PATCH] Apply review

---
 lobster/tools/core/online_report.py | 84 +++++++++++++++++++----------
 1 file changed, 57 insertions(+), 27 deletions(-)

diff --git a/lobster/tools/core/online_report.py b/lobster/tools/core/online_report.py
index 4c4fa1e2..cdc27683 100755
--- a/lobster/tools/core/online_report.py
+++ b/lobster/tools/core/online_report.py
@@ -36,36 +36,66 @@ def is_git_main_module(path):
     return os.path.isdir(os.path.join(path, ".git"))
 
 
+def is_dir_in_git_submodule(directory):
+    """
+    Checks if a given directory is nested inside a Git submodule.
+
+    Args:
+        directory (str): The path to the directory to check.
+
+    Returns:
+        bool: True if the directory is inside a Git submodule,
+        False otherwise.
+        str: The path to the superproject of submodule.
+    """
+    try:
+        # Check if the directory is part of a Git submodule
+        result = subprocess.run(['git', 'rev-parse', '--show-superproject-working-tree'], cwd=directory,
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+        if result.returncode == 0 and result.stdout.strip():
+            return True, result.stdout.strip()
+        else:
+            return False, ''
+    except (subprocess.CalledProcessError, OSError):
+        return False, ''
+
+
+def is_dir_in_git_main_module(directory):
+    """
+    Checks if a given directory is nested inside a Git main module.
+
+    Args:
+        directory (str): The path to the directory to check.
+
+    Returns:
+        bool: True if the directory is inside a Git mainmodule,
+        False otherwise.
+        str: The path to the mainmodule.
+    """
+    try:
+        # Check if the directory is part of a Git main module
+        result = subprocess.run(['git', 'rev-parse', '--show-toplevel'], cwd=directory,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE, universal_newlines=True)
+        if result.returncode == 0 and result.stdout.strip():
+            return True, result.stdout.strip()
+        else:
+            return False, ''
+    except (subprocess.CalledProcessError, OSError):
+        return False, ''
+
+
 def find_repo_main_root(file_path):
     file_path = os.path.abspath(file_path)
 
-    try:
-        # Get top-level directory
-        repo_root = subprocess.run(
-            ["git", "rev-parse", "--show-toplevel"],
-            check=True,
-            capture_output=True,
-            encoding="UTF-8",
-            cwd=os.path.dirname(file_path)
-        ).stdout.strip()
-
-        if is_git_main_module(repo_root):
-            return repo_root
-
-        # Get the root of superproject if the current
-        # repository is a Submodule
-        repo_root = subprocess.run(
-            ["git", "rev-parse", "--show-superproject-working-tree"],
-            check=True,
-            capture_output=True,
-            encoding="UTF-8",
-            cwd=os.path.dirname(file_path)
-        ).stdout.strip()
-
-        return repo_root if repo_root else os.getcwd()
-
-    except subprocess.CalledProcessError:
-        return os.getcwd()
+    is_submodule, submodule_superproject_path = is_dir_in_git_submodule(os.path.dirname(file_path))
+
+    if is_submodule:
+        return submodule_superproject_path
+
+    is_mainmodule, mainmodule_path = is_dir_in_git_main_module(os.path.dirname(file_path))
+
+    return mainmodule_path if is_mainmodule else os.getcwd()
 
 
 def path_starts_with_subpath(path, subpath):