feat: Added table output to blame mode along with some UI tweaks (#16)

Author: matsjfunke

.github/workflows/format.yml

@@ -1,10 +1,8 @@
 name: Format and Lint
 
 on:
-  push:
-    branches: [main, master]
   pull_request:
-    branches: [main, master]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always

CONTRIBUTING.md

@@ -97,11 +97,8 @@ cargo fmt --all -- --check
 # Run Clippy linter
 cargo clippy --all-targets --all-features -- -D warnings
 
-# Run tests
-cargo test
-
 # Build the project
-cargo build --release
+cargo build
 ```
 
 #### Automated Checks

README.md

@@ -1,4 +1,4 @@
-# wer ⁉️
+# ⁉️ wer ⁉️
 
 `wer` (German "who") is a command-line tool for answering that everyday question:
 
@@ -7,7 +7,9 @@
 No more complex `git log` commands, no more hunting for exact file paths. `wer` gives you context aware file / directory search.
 `wer` offers both file-level recency and line-specific history through its `blame mode`, bridging the gap between `git blame` and `git-who` plus offering features like smart file finding and syntax highlighting.
 
-## Quick Start
+![Normal Mode](./screenshots/normal-mode.png)
+
+## 🚀 Quick Start
 
 ```bash
 # install wer
@@ -20,25 +22,45 @@ wer main.rs
 wer -l 3 src/
 ```
 
-## Installation
+## 📚 Table of Contents
+
+- [📦 Installation](#-installation)
+- [🎮 Usage](#usage)
+  - [🏁 All Flags](#-all-flags)
+  - [✨ Smart Path Resolution](#-smart-path-resolution)
+  - [🎮 Basic Usage](#-basic-usage)
+  - [👥 Last Contributors](#-last-contributors)
+  - [🫵 Blame Mode](#-blame-mode)
+  - [🎨 Display Options](#-display-options)
+- [👨‍💻 Contributing](#-contributing)
+- [📑 License](#-license)
+
+## 📦 Installation
 
 **From crates.io (Recommended)**
 
 ```bash
+#install cargo
+curl https://sh.rustup.rs -sSf | sh
+# install wer crate
 cargo install wer
 ```
 
 **From Source**
 
 ```bash
+#install cargo
+curl https://sh.rustup.rs -sSf | sh
+# clone repository
 git clone https://github.com/matsjfunke/wer
+# install wer
 cd wer
 cargo install --path .
 ```
 
 ## Usage
 
-### All Flags
+### 🏁 All Flags
 
 | Flag                   | Description                                       |
 | ---------------------- | ------------------------------------------------- |
@@ -50,9 +72,7 @@ cargo install --path .
 | `-v, --version`        | Print version information                         |
 | `-h, --help`           | Show help information                             |
 
-### Examples
-
-#### Smart Path Resolution ✨
+### ✨ Smart Path Resolution
 
 `wer` automatically finds files and directories by name - no need to remember exact paths!
 
@@ -68,7 +88,7 @@ wer src/                   # Works from anywhere in the repository
 wer ~/Documents/file.txt   # Uses absolute path directly
 wer /full/path/to/file     # No search, direct access
 
-# shows multiples matches in normal mode
+# Shows multiples matches in normal mode
 wer config.toml
 # → src/config.toml:
 # → 61fcdda Mats Julius Funke - 07 Jun 2025: Update config
@@ -77,7 +97,7 @@ wer config.toml
 # → a1b2c3d Jane Doe - 05 Jun 2025: Add test config
 ```
 
-#### Basic Usage
+### 🎮 Basic Usage
 
 ```bash
 # Check who last edited a file
@@ -93,7 +113,9 @@ wer
 # → 61fcdda Mats Julius Funke - 07 Jun 2025: Latest changes
 ```
 
-#### Last Contributors
+### 👥 Last Contributors
+
+![Last Mode](./screenshots/last-mode.png)
 
 Find the last N unique people who touched a file or directory:
 
@@ -107,7 +129,9 @@ wer -l 5 src/
 # Searched for 5 but only 4 contributed  # (if fewer found)
 ```
 
-#### Blame Mode
+### 🫵 Blame Mode
+
+![Blame Mode](./screenshots/blame-mode.png)
 
 Show git blame with syntax highlighting for any file:
 
@@ -118,7 +142,9 @@ wer -b main.rs              # Automatically finds src/main.rs
 # → 6b70ffb (Mats Julius Fun - 07 Jun) |  2 | use clap::Parser;
 ```
 
-#### Display Options
+### 🎨 Display Options
+
+![Blame Mode date-only](./screenshots/blame-mode-date-only.png)
 
 ```bash
 # Show only dates
@@ -141,10 +167,10 @@ wer -b -m main.rs          # Blame with commit messages
 wer --no-color -b main.rs
 ```
 
-## Contributing
+## 👨‍💻 Contributing
 
 Contributions welcome! Please read [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 
-## License
+## 📑 License
 
 This project is licensed under the MIT License - see [LICENSE.md](LICENSE.md) for details.

screenshots/blame-mode-date-only.png

@@ -74,7 +74,7 @@ impl CommitInfo {
     fn format_regular(&self, colors: &ColorScheme, commit_message_separate: bool) -> String {
         if commit_message_separate {
             format!(
-                "{}{}{} {} - {}{}{}\n    {}",
+                "{}{}{} {} - {}{}{}\n└─ {}",
                 colors.commit,
                 self.hash,
                 colors.reset,
@@ -104,13 +104,12 @@ impl CommitInfo {
         &self,
         colors: &ColorScheme,
         line_num: usize,
-        line_width: usize,
         highlighted_line: &str,
         commit_message_separate: bool,
     ) -> String {
         if commit_message_separate {
             format!(
-                "| {}{:>7}{} | {:>15} - {}{:>6}{} | {:>width$} | {}\n    {}|\n",
+                "│ {}{:<7}{} │ {:<15} │ {}{:<6}{} │ {:>4} │ {}\n│ {:<7} │ {:<15} │ {:<6} │ {:<4} │ └─ {}\n",
                 colors.commit,
                 self.hash,
                 colors.reset,
@@ -120,12 +119,15 @@ impl CommitInfo {
                 colors.reset,
                 line_num,
                 highlighted_line,
+                "",
+                "",
+                "",
+                "",
                 self.message,
-                width = line_width
             )
         } else {
             format!(
-                "{}{:>7}{} ({:>15} - {}{:>6}{}) | {:>width$} | {}\n",
+                "│ {}{:<7}{} │ {:<15} │ {}{:<6}{} │ {:>4} │ {}\n",
                 colors.commit,
                 self.hash,
                 colors.reset,
@@ -135,7 +137,6 @@ impl CommitInfo {
                 colors.reset,
                 line_num,
                 highlighted_line,
-                width = line_width
             )
         }
     }
@@ -145,17 +146,11 @@ impl CommitInfo {
         &self,
         colors: &ColorScheme,
         line_num: usize,
-        line_width: usize,
         highlighted_line: &str,
     ) -> String {
         format!(
-            "{}{:>6}{} | {:>width$} | {}\n",
-            colors.date,
-            self.date,
-            colors.reset,
-            line_num,
-            highlighted_line,
-            width = line_width
+            "│ {}{:<6}{} │ {:>4} │ {}\n",
+            colors.date, self.date, colors.reset, line_num, highlighted_line,
         )
     }
 }
@@ -231,8 +226,6 @@ pub fn get_blame(
         std::fs::read_to_string(&full_path).map_err(|e| anyhow!("Failed to read file: {}", e))?;
 
     let lines: Vec<&str> = file_content.lines().collect();
-    let line_count = lines.len();
-    let line_width = line_count.to_string().len();
 
     // Initialize syntax highlighter if colors are enabled
     let highlighter = if !no_color {
@@ -244,6 +237,39 @@ pub fn get_blame(
     let colors = ColorScheme::new(no_color);
     let mut result = String::new();
 
+    if date_only {
+        // Add header for date-only mode (Date, Line, Code only)
+        let header_line = format!("┌{:─<8}┬{:─<6}┬{:─<100}┐", "", "", "");
+        result.push_str(&header_line);
+        result.push('\n');
+
+        result.push_str(&format!("│ {:<6} │ {:<4} │ {}\n", "Date", "Line", "Code"));
+
+        let separator_line = format!("├{:─<8}┼{:─<6}┼{:─<100}┤", "", "", "");
+        result.push_str(&separator_line);
+        result.push('\n');
+    } else {
+        // Add header for the full blame table
+        let header_line = format!(
+            "┌{:─<9}┬{:─<17}┬{:─<8}┬{:─<6}┬{:─<100}┐",
+            "", "", "", "", ""
+        );
+        result.push_str(&header_line);
+        result.push('\n');
+
+        result.push_str(&format!(
+            "│ {:<7} │ {:<15} │ {:<6} │ {:<4} │ {}\n",
+            "Commit", "Name", "Date", "Line", "Code"
+        ));
+
+        let separator_line = format!(
+            "├{:─<9}┼{:─<17}┼{:─<8}┼{:─<6}┼{:─<100}┤",
+            "", "", "", "", ""
+        );
+        result.push_str(&separator_line);
+        result.push('\n');
+    }
+
     for (line_num, line_content) in lines.iter().enumerate() {
         let hunk_result = blame.get_line(line_num + 1);
 
@@ -260,35 +286,36 @@ pub fn get_blame(
             let commit_info = CommitInfo::from_hunk(&repo, hunk, false)?;
 
             if date_only {
-                commit_info.format_date_only(&colors, line_num + 1, line_width, &highlighted_line)
+                commit_info.format_date_only(&colors, line_num + 1, &highlighted_line)
             } else {
-                commit_info.format_blame(
-                    &colors,
-                    line_num + 1,
-                    line_width,
-                    &highlighted_line,
-                    commit_message,
-                )
+                commit_info.format_blame(&colors, line_num + 1, &highlighted_line, commit_message)
             }
         } else {
             let commit_info = CommitInfo::unknown(false);
 
             if date_only {
-                commit_info.format_date_only(&colors, line_num + 1, line_width, &highlighted_line)
+                commit_info.format_date_only(&colors, line_num + 1, &highlighted_line)
             } else {
-                commit_info.format_blame(
-                    &colors,
-                    line_num + 1,
-                    line_width,
-                    &highlighted_line,
-                    commit_message,
-                )
+                commit_info.format_blame(&colors, line_num + 1, &highlighted_line, commit_message)
             }
         };
 
         result.push_str(&line_output);
     }
 
+    // Add bottom border to complete the table
+    if date_only {
+        let bottom_line = format!("└{:─<8}┴{:─<6}┴{:─<100}┘", "", "", "");
+        result.push_str(&bottom_line);
+    } else {
+        let bottom_line = format!(
+            "└{:─<9}┴{:─<17}┴{:─<8}┴{:─<6}┴{:─<100}┘",
+            "", "", "", "", ""
+        );
+        result.push_str(&bottom_line);
+    }
+    result.push('\n');
+
     Ok(result)
 }