learn_bash_from_session_data 1.0.3 → 1.0.5

package/scripts/quiz_generator.py

@@ -397,37 +397,98 @@ def _generate_bash_description(cmd_string: str) -> str:
     Generate an educational description focusing on bash concepts.
 
     Explains what each part of the command does from a bash perspective.
+    Handles: &&, ||, |, 2>&1, 2>/dev/null, and combinations.
     """
     if not cmd_string:
         return "Runs a command"
 
+    # Clean up redirections for description (note them but don't clutter)
+    has_stderr_to_stdout = '2>&1' in cmd_string
+    has_stderr_to_null = '2>/dev/null' in cmd_string
+    has_stdout_redirect = re.search(r'>\s*\S+', cmd_string) and '2>' not in cmd_string
+
+    # Remove redirections for parsing (we'll note them separately)
+    clean_cmd = re.sub(r'\s*2>&1\s*', ' ', cmd_string)
+    clean_cmd = re.sub(r'\s*2>/dev/null\s*', ' ', clean_cmd)
+    clean_cmd = re.sub(r'\s*>\s*\S+\s*', ' ', clean_cmd)
+    clean_cmd = ' '.join(clean_cmd.split())  # normalize whitespace
+
     parts = []
 
-    # Check for command chaining
-    if ' && ' in cmd_string:
-        commands = cmd_string.split(' && ')
+    # Handle && (run if previous succeeds)
+    if ' && ' in clean_cmd:
+        commands = clean_cmd.split(' && ')
         for i, cmd in enumerate(commands):
-            base = cmd.strip().split()[0] if cmd.strip() else ''
-            if i == 0:
-                parts.append(_describe_single_command(cmd.strip()))
+            cmd = cmd.strip()
+            if not cmd:
+                continue
+            # Handle nested || or | within && segments
+            if ' || ' in cmd:
+                parts.append(_describe_or_chain(cmd))
+            elif ' | ' in cmd:
+                parts.append(_describe_pipe_chain(cmd))
+            elif i == 0:
+                parts.append(_describe_single_command(cmd))
             else:
-                parts.append(f"then {_describe_single_command(cmd.strip())}")
-        return ', '.join(parts)
-
-    if ' || ' in cmd_string:
-        commands = cmd_string.split(' || ')
-        parts.append(_describe_single_command(commands[0].strip()))
-        parts.append(f"or if that fails, {_describe_single_command(commands[1].strip())}")
-        return ', '.join(parts)
-
-    if ' | ' in cmd_string:
-        commands = cmd_string.split(' | ')
-        parts.append(_describe_single_command(commands[0].strip()))
-        for cmd in commands[1:]:
-            parts.append(f"pipes output to {_describe_single_command(cmd.strip())}")
-        return ', '.join(parts)
-
-    return _describe_single_command(cmd_string)
+                parts.append(f"then {_describe_single_command(cmd)}")
+
+    # Handle || (run if previous fails)
+    elif ' || ' in clean_cmd:
+        parts.append(_describe_or_chain(clean_cmd))
+
+    # Handle | (pipe)
+    elif ' | ' in clean_cmd:
+        parts.append(_describe_pipe_chain(clean_cmd))
+
+    else:
+        parts.append(_describe_single_command(clean_cmd))
+
+    result = ', '.join(parts)
+
+    # Add redirection notes
+    if has_stderr_to_null:
+        result += " (suppressing errors)"
+    elif has_stderr_to_stdout:
+        result += " (capturing all output)"
+
+    return result
+
+
+def _describe_or_chain(cmd_string: str) -> str:
+    """Describe an || chain (fallback pattern)."""
+    commands = cmd_string.split(' || ')
+    parts = []
+    for i, cmd in enumerate(commands):
+        cmd = cmd.strip()
+        if not cmd:
+            continue
+        # Handle pipes within || segments
+        if ' | ' in cmd:
+            desc = _describe_pipe_chain(cmd)
+        else:
+            desc = _describe_single_command(cmd)
+
+        if i == 0:
+            parts.append(desc)
+        else:
+            parts.append(f"or if that fails, {desc}")
+    return ', '.join(parts)
+
+
+def _describe_pipe_chain(cmd_string: str) -> str:
+    """Describe a pipe chain."""
+    commands = cmd_string.split(' | ')
+    parts = []
+    for i, cmd in enumerate(commands):
+        cmd = cmd.strip()
+        if not cmd:
+            continue
+        desc = _describe_single_command(cmd)
+        if i == 0:
+            parts.append(desc)
+        else:
+            parts.append(f"pipes to {desc}")
+    return ', '.join(parts)
 
 
 def _describe_single_command(cmd: str) -> str: