diff-tui 0.1.1

A terminal-based Git diff viewer with fuzzy search
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121

use std::io::Write;
use std::process::{Command, Stdio};

use crate::config::DiffConfig;

pub fn get_diff(file_path: &str, width: u16, config: &DiffConfig) -> Vec<u8> {
    match config.tool.as_str() {
        "auto" => {
            // Try delta first, then fallback to git diff
            if let Ok(output) = try_tool("delta", file_path, width, &["--width"]) {
                return output;
            }
            try_git_diff(file_path).unwrap_or_else(|_| b"Failed to get diff".to_vec())
        }
        "git" => try_git_diff(file_path).unwrap_or_else(|_| b"Failed to get diff".to_vec()),
        tool => {
            // Try the specified tool
            if let Ok(output) = try_tool(tool, file_path, width, &config.args) {
                return output;
            }
            // Fallback to git diff
            try_git_diff(file_path).unwrap_or_else(|_| b"Failed to get diff".to_vec())
        }
    }
}

fn try_tool(
    tool_name: &str,
    file_path: &str,
    width: u16,
    extra_args: &[impl AsRef<str>],
) -> Result<Vec<u8>, ()> {
    // Check if the tool is available
    if which::which(tool_name).is_err() {
        return Err(());
    }

    // Get git diff first
    let diff_input = get_git_diff_output(file_path)?;

    if diff_input.is_empty() {
        return Err(());
    }

    // Build command with arguments
    let mut cmd = Command::new(tool_name);

    // Add width argument for delta
    if tool_name == "delta" {
        cmd.args(["--width", &width.to_string()]);
    }

    // Add extra arguments from config
    for arg in extra_args {
        let arg_str = arg.as_ref();
        // Skip --width for delta as we already added it
        if tool_name == "delta" && arg_str == "--width" {
            continue;
        }
        cmd.arg(arg_str);
    }

    // Pipe diff through the tool
    let mut process = cmd
        .stdin(Stdio::piped())
        .stdout(Stdio::piped())
        .spawn()
        .map_err(|_| ())?;

    if let Some(ref mut stdin) = process.stdin {
        let _ = stdin.write_all(&diff_input);
    }
    process.stdin.take();

    let output = process.wait_with_output().map_err(|_| ())?;
    Ok(output.stdout)
}

fn get_git_diff_output(file_path: &str) -> Result<Vec<u8>, ()> {
    let output = Command::new("git")
        .args(["diff", file_path])
        .output()
        .map_err(|_| ())?;

    if !output.stdout.is_empty() {
        return Ok(output.stdout);
    }

    // Try for untracked/new files
    let output = Command::new("git")
        .args(["diff", "--no-index", "/dev/null", file_path])
        .output()
        .map_err(|_| ())?;

    Ok(output.stdout)
}

fn try_git_diff(file_path: &str) -> Result<Vec<u8>, ()> {
    let output = Command::new("git")
        .args(["diff", "--color=always", file_path])
        .output()
        .map_err(|_| ())?;

    if !output.stdout.is_empty() {
        return Ok(output.stdout);
    }

    // Try for untracked/new files
    let output = Command::new("git")
        .args([
            "diff",
            "--color=always",
            "--no-index",
            "/dev/null",
            file_path,
        ])
        .output()
        .map_err(|_| ())?;

    Ok(output.stdout)
}