sergeant 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8e44aa17efd4cddd56d88d910edc0082e94488cd3d25cf6def3b832a579c3d
-  data.tar.gz: c66899a4748192ded5481c0497a81ebb81edad956a932d6253beab34ab834a67
+  metadata.gz: 9a87751fe5e98dee814b470aa90818bd0f798cbdb4143f55522ffcf610d8de0c
+  data.tar.gz: d1c47033ac959cc1bbd50af0fe96e526df4d2f72077efc914d0570b8df6e0e7b
 SHA512:
-  metadata.gz: 1590f36daa589471edc9f65f150b24b9764ef192b77d46cc51ffc1884e01dafa2fd9a4832a5fef635dfef8bca12f3d16f49b305a295a4fd8e6159e50529d9127
-  data.tar.gz: 8ee3a3f6eacd45f3a91c42b7a96e94ccc0961c12cbd3b363ee8a92553efe4db4db73be8499d5304d54702b82333c50fa29b27ad0f87a6f2e141a0a9ca4dad3f2
+  metadata.gz: 77dac789c948ee83d3bfeda13cdda4fa0c3f03779d2e6cfc3ec85126dd97465c309d55cfa2500008656be3b65367e961c7af8b639c4d237a0716572d2cfa82be
+  data.tar.gz: e0e1222dba1be26d9a3da7611aa8c5289ea422f58f9c1f5d3813d7f7581c05f860e61144e7623c1f66ccbb127ba37d27eaded1b9c5633f6e9e5cfa7422df8c0b

data/CHANGELOG.md

@@ -5,6 +5,56 @@ All notable changes to Sergeant will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2024-12-26
+
+### Added
+- **Total size display for marked items**
+  - Status bar now shows total size of all marked files
+  - Helps users understand the size of operations before copying/cutting
+  - Automatically formatted with appropriate units (B, K, M, G)
+- **Quick filter feature** (f key)
+  - Filter current directory view without changing directories
+  - Case-insensitive real-time filtering as you type
+  - Status bar shows active filter and filtered item count
+  - Press ESC to clear filter, Enter to apply
+- **Archive peek support** (v key on archives)
+  - Preview contents of archive files without extracting
+  - Supports: .zip, .tar, .tar.gz/.tgz, .tar.bz2/.tbz, .tar.xz/.txz, .7z, .rar
+  - Uses native tools (unzip, tar, 7z, unrar) for listing contents
+  - Falls back gracefully if archive tools not installed
+
+### Changed
+- Updated help modal to reflect new features
+- Reorganized help modal with "View & Search" section for better clarity
+
+### Performance
+- **Optimized directory refresh**
+  - Only fetch owner info and permissions when ownership display is enabled
+  - Use `stat.directory?` instead of `File.directory?()` to avoid duplicate syscalls
+  - Track ownership toggle changes to refresh only when needed
+- **Added comprehensive test coverage** for performance optimizations (14 test cases)
+
+## [1.0.2] - 2024-12-26
+
+### Fixed
+- **Display issue on Arch Linux**: Added terminal color support checking
+  - Prevents crashes on terminals without color support
+  - Gracefully degrades when `start_color` is unavailable
+  - Fixes blank screen issue with Ruby version managers (mise, rbenv, asdf)
+
+### Added
+- **Installation troubleshooting**
+  - Comprehensive troubleshooting documentation in README
+  - Simple alias solution for Arch Linux display issues: `alias sgt='ruby "$(which sgt)"'`
+- **Better error handling**
+  - Terminal initialization now shows helpful error messages on failure
+  - Displays environment information (TERM, TTY status) to aid debugging
+
+### Technical
+- Improved terminal initialization with `has_colors?` checks before calling `start_color`
+- Added error recovery for curses screen initialization failures
+- Better compatibility with different ncurses implementations
+
 ## [1.0.1] - 2024-12-24
 
 ### Fixed

data/README.md

@@ -1,6 +1,7 @@
 # 🎖️ Sergeant (sgt)
 
 ![Sergeant Logo](./logo.svg)
+![highlight](./highlight.gif)
 
 **Interactive TUI Directory Navigator for Terminal - "Leave it to the Sarge!"**
 
@@ -19,14 +20,17 @@ Simple, fast, and elegant.
 - 🔍 **Git Branch Display** - Shows current git branch in header
 - 👤 **Ownership Toggle** - View file permissions and ownership (press 'o')
 - 📑 **Bookmarks** - Save and quickly navigate to favorite directories
+- 🔎 **Quick Filter** - Filter current directory view in real-time (press 'f')
 
 ### File Operations
 - 📋 **Copy/Cut/Paste** - Mark files with spacebar, copy (c), cut (x), and paste (p)
 - ✂️  **Multi-file Selection** - Mark multiple files/folders for batch operations
+- 📏 **Size Display** - See total size of marked items in status bar
 - 🗑️  **Delete with Confirmation** - Safe deletion with confirmation dialog
 - ✏️  **Rename** - Rename files and folders with pre-filled input
 - 🔄 **Conflict Resolution** - Smart handling of file conflicts (skip/overwrite/rename)
-- 📄 **File Preview** - View markdown files with glow, code files with vim/nano
+- 📄 **File Preview** - View markdown with glow, code with vim/nano, peek inside archives
+- 📦 **Archive Peek** - Preview contents of .zip, .tar.gz, .7z, .rar files without extracting
 
 ### Search & Productivity
 - 🔎 **Fuzzy Search** - Integrate with fzf for fast file finding
@@ -65,6 +69,7 @@ sudo dnf install ncurses-devel ruby-devel
 ### Optional Tools
 - **glow** - For beautiful markdown preview (`brew install glow` or `go install github.com/charmbracelet/glow@latest`)
 - **fzf** - For fuzzy file search (`brew install fzf` or `sudo apt-get install fzf`)
+- **Archive tools** - For archive preview: `unzip`, `tar`, `7z`, `unrar` (usually pre-installed on most systems)
 
 ## 🚀 Installation
 
@@ -113,16 +118,6 @@ sgt
 # Run with explicit ruby (temporary fix)
 ruby $(which sgt)
 ```
-
-**Alternative - Automated fix script:**
-```bash
-# Creates a wrapper script (requires cloning repo)
-cd Sergeant
-bash arch_fix.sh
-```
-
-**For detailed troubleshooting**, see [INSTALL_TROUBLESHOOTING.md](./INSTALL_TROUBLESHOOTING.md)
-
 ### Development Installation
 
 If you want to work on the gem:
@@ -165,7 +160,9 @@ sgt
 | `d` | Delete marked items (with confirmation) |
 | `r` | Rename current item |
 | `u` | Unmark all items |
-| `v` | Preview file (markdown/code) |
+| `n` | Create new file or directory |
+| `e` | Edit file with $EDITOR (or nano/nvim/vim) |
+| `v` | Preview file or archive contents |
 
 ### Other Commands
 
@@ -175,9 +172,11 @@ sgt
 | `↓/j` | Move down |
 | `Enter/→/l` | Open directory or preview file |
 | `←/h` | Go to parent directory |
+| `f` | Filter current directory view |
+| `/` | Search files (requires fzf) |
+| `:` | Execute terminal command in current directory |
 | `o` | Toggle ownership/permissions display |
 | `b` | Go to bookmark |
-| `/` | Search files (requires fzf) |
 | `m` | Show help modal with all key mappings |
 | `q/ESC` | Quit and cd to current directory |
 

data/lib/sergeant/modals/file_operations.rb

@@ -23,6 +23,9 @@ module Sergeant
           if editor
             # Use user's preferred editor
             system("#{editor} \"#{file_path}\"")
+          elsif Gem.win_platform?
+            # Windows: use notepad (always available)
+            system("notepad \"#{file_path}\"")
           elsif nvim_available?
             # Second fallback: nvim (modern vim)
             system("nvim \"#{file_path}\"")
@@ -65,6 +68,13 @@ module Sergeant
         return unless item && item[:type] == :file
 
         file_path = item[:path]
+        file_ext = File.extname(file_path).downcase
+
+        # Check if it's an archive file
+        if archive_file?(file_ext)
+          preview_archive(file_path, file_ext)
+          return
+        end
 
         # Check if it's a text file
         unless text_file?(file_path)
@@ -76,10 +86,11 @@ module Sergeant
         close_screen
 
         begin
-          file_ext = File.extname(file_path).downcase
-
+          if Gem.win_platform?
+            # Windows: use notepad for preview (simpler and always works)
+            system("notepad \"#{file_path}\"")
           # Use glow for markdown files if available, otherwise fall back to less
-          if file_ext == '.md' && glow_available?
+          elsif file_ext == '.md' && glow_available?
             system("glow -p \"#{file_path}\"")
           elsif file_ext == '.md'
             system("less -R -F -X \"#{file_path}\"")
@@ -651,6 +662,80 @@ module Sergeant
         # Force refresh to show any changes from the command
         force_refresh
       end
+
+      private
+
+      def archive_file?(ext)
+        %w[.zip .tar .gz .bz2 .xz .7z .rar .tar.gz .tar.bz2 .tar.xz .tgz .tbz .txz].include?(ext) ||
+          ext.end_with?('.tar.gz', '.tar.bz2', '.tar.xz')
+      end
+
+      def preview_archive(file_path, file_ext)
+        close_screen
+
+        puts "Archive Preview: #{File.basename(file_path)}"
+        puts '─' * 80
+        puts
+
+        begin
+          # Detect archive type and use appropriate command
+          case file_ext
+          when '.zip'
+            system("unzip -l \"#{file_path}\" | less -R -F -X")
+          when '.tar'
+            system("tar -tvf \"#{file_path}\" | less -R -F -X")
+          when '.tar.gz', '.tgz', '.gz'
+            if file_path.end_with?('.tar.gz') || file_path.end_with?('.tgz')
+              system("tar -tzf \"#{file_path}\" | less -R -F -X")
+            else
+              system("gzip -l \"#{file_path}\"")
+              puts
+              puts 'Press Enter to continue...'
+              gets
+            end
+          when '.tar.bz2', '.tbz', '.bz2'
+            if file_path.end_with?('.tar.bz2') || file_path.end_with?('.tbz')
+              system("tar -tjf \"#{file_path}\" | less -R -F -X")
+            else
+              system("bzip2 -l \"#{file_path}\" 2>/dev/null || echo 'bzip2 does not support -l flag'")
+              puts
+              puts 'Press Enter to continue...'
+              gets
+            end
+          when '.tar.xz', '.txz', '.xz'
+            if file_path.end_with?('.tar.xz') || file_path.end_with?('.txz')
+              system("tar -tJf \"#{file_path}\" | less -R -F -X")
+            else
+              system("xz -l \"#{file_path}\"")
+              puts
+              puts 'Press Enter to continue...'
+              gets
+            end
+          when '.7z'
+            system("7z l \"#{file_path}\" | less -R -F -X")
+          when '.rar'
+            system("unrar l \"#{file_path}\" | less -R -F -X")
+          else
+            puts 'Archive type detected but no preview command available'
+            puts 'Press Enter to continue...'
+            gets
+          end
+        rescue StandardError => e
+          puts "Error previewing archive: #{e.message}"
+          puts 'Press Enter to continue...'
+          gets
+        end
+
+        # Restore curses screen
+        init_screen
+        if has_colors?
+          start_color
+          apply_color_theme
+        end
+        curs_set(0)
+        noecho
+        stdscr.keypad(true)
+      end
     end
   end
 end

data/lib/sergeant/modals/help.rb

@@ -59,13 +59,16 @@ module Sergeant
           '  u                 - Unmark all items',
           '  n                 - Create new file or directory',
           '',
+          'View & Search:',
+          '  e                 - Edit file ($EDITOR, nano, nvim, vim)',
+          '  v                 - Preview file or archive contents',
+          '  f                 - Filter current directory view',
+          '  /                 - Search files (with fzf if available)',
+          '',
           'Other:',
           '  :                 - Execute terminal command',
-          '  e                 - Edit file ($EDITOR, nano, nvim, vim)',
-          '  v                 - Preview file (read-only)',
           '  o                 - Toggle ownership display',
           '  b                 - Go to bookmark',
-          '  /                 - Search files (with fzf if available)',
           '  q / ESC           - Quit and cd to current directory'
         ]
 

data/lib/sergeant/modals/navigation.rb

@@ -240,6 +240,130 @@ module Sergeant
         getch
         true
       end
+
+      def filter_current_view
+        max_y = lines
+        max_x = cols
+
+        modal_height = 8
+        modal_width = [70, max_x - 4].min
+        modal_y = (max_y - modal_height) / 2
+        modal_x = (max_x - modal_width) / 2
+
+        # Draw modal
+        (modal_y..(modal_y + modal_height)).each do |y|
+          setpos(y, modal_x)
+          attron(color_pair(3)) do
+            addstr(' ' * modal_width)
+          end
+        end
+
+        setpos(modal_y, modal_x)
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr("\u250C#{'─' * (modal_width - 2)}\u2510")
+        end
+
+        setpos(modal_y + 1, modal_x)
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr('│')
+        end
+        attron(color_pair(5) | Curses::A_BOLD) do
+          addstr(' Filter Current View '.center(modal_width - 2))
+        end
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr('│')
+        end
+
+        setpos(modal_y + 2, modal_x)
+        attron(color_pair(4)) do
+          addstr("\u251C#{'─' * (modal_width - 2)}\u2524")
+        end
+
+        setpos(modal_y + 3, modal_x)
+        attron(color_pair(4)) do
+          addstr('│ ')
+        end
+        addstr('Enter text to filter files/folders (ESC to clear):'.ljust(modal_width - 4))
+        attron(color_pair(4)) do
+          addstr(' │')
+        end
+
+        setpos(modal_y + 4, modal_x)
+        attron(color_pair(4)) do
+          addstr('│ ')
+        end
+        prompt = 'Filter: '
+        attron(color_pair(5)) do
+          addstr(prompt)
+        end
+        addstr(' ' * (modal_width - 4 - prompt.length))
+        attron(color_pair(4)) do
+          addstr(' │')
+        end
+
+        setpos(modal_y + 6, modal_x)
+        attron(color_pair(4)) do
+          addstr('│')
+        end
+        attron(color_pair(4) | Curses::A_DIM) do
+          count = @all_items.length - (@all_items.any? { |i| i[:name] == '..' } ? 1 : 0)
+          addstr(" #{count} items in current directory ".center(modal_width - 2))
+        end
+        attron(color_pair(4)) do
+          addstr('│')
+        end
+
+        setpos(modal_y + modal_height - 1, modal_x)
+        attron(color_pair(4) | Curses::A_BOLD) do
+          addstr("\u2514#{'─' * (modal_width - 2)}\u2518")
+        end
+
+        # Input handling
+        curs_set(1)
+        echo
+        input_width = modal_width - 6 - prompt.length
+        filter_input = @filter_text.dup
+
+        setpos(modal_y + 4, modal_x + 2 + prompt.length)
+        addstr(filter_input.ljust(input_width))
+        setpos(modal_y + 4, modal_x + 2 + prompt.length + filter_input.length)
+
+        loop do
+          refresh
+          ch = getch
+
+          case ch
+          when 10, 13  # Enter
+            break
+          when 27  # ESC - clear filter
+            filter_input = ''
+            break
+          when 127, Curses::Key::BACKSPACE
+            if filter_input.length.positive?
+              filter_input = filter_input[0...-1]
+              setpos(modal_y + 4, modal_x + 2 + prompt.length)
+              addstr(filter_input.ljust(input_width))
+              setpos(modal_y + 4, modal_x + 2 + prompt.length + filter_input.length)
+            end
+          else
+            if ch.is_a?(String) && filter_input.length < input_width
+              filter_input += ch
+              setpos(modal_y + 4, modal_x + 2 + prompt.length)
+              addstr(filter_input.ljust(input_width))
+              setpos(modal_y + 4, modal_x + 2 + prompt.length + filter_input.length)
+            end
+          end
+        end
+
+        noecho
+        curs_set(0)
+
+        # Apply filter
+        @filter_text = filter_input.strip
+        @selected_index = 0
+        @scroll_offset = 0
+        force_refresh  # Force refresh to apply filter
+      end
     end
   end
 end

data/lib/sergeant/rendering.rb

@@ -4,6 +4,13 @@
 
 module Sergeant
   module Rendering
+    # Use ASCII icons on Windows for better terminal compatibility
+    WINDOWS = Gem.win_platform?
+    ICON_DIR = WINDOWS ? '[D] ' : '📁 '
+    ICON_FILE = WINDOWS ? '[F] ' : '📄 '
+    ICON_MARK = WINDOWS ? '* ' : '✓ '
+    ICON_SELECT = WINDOWS ? '> ' : '▶ '
+
     def draw_screen
       clear
 
@@ -20,11 +27,19 @@ module Sergeant
 
       # Build status info
       status_parts = []
-      status_parts << "Marked: #{@marked_items.length}" unless @marked_items.empty?
+      unless @marked_items.empty?
+        total_size = @marked_items.sum { |path| File.size(path) rescue 0 }
+        size_str = format_size(total_size)
+        status_parts << "Marked: #{@marked_items.length} (#{size_str.strip})"
+      end
       unless @copied_items.empty?
         mode_text = @cut_mode ? 'Cut' : 'Copied'
         status_parts << "#{mode_text}: #{@copied_items.length}"
       end
+      unless @filter_text.empty?
+        filtered_count = @items.length - (@items.any? { |i| i[:name] == '..' } ? 1 : 0)
+        status_parts << "Filter: '#{@filter_text}' (#{filtered_count})"
+      end
       status_text = status_parts.empty? ? '' : " | #{status_parts.join(' | ')}"
 
       if branch
@@ -119,13 +134,13 @@ module Sergeant
     end
 
     def draw_item(item, max_x, is_selected)
-      icon = item[:type] == :directory ? '📁 ' : '📄 '
+      icon = item[:type] == :directory ? ICON_DIR : ICON_FILE
 
       # Check if item is marked
       is_marked = @marked_items.include?(item[:path])
-      mark_indicator = is_marked ? '✓ ' : '  '
+      mark_indicator = is_marked ? ICON_MARK : '  '
 
-      prefix = is_selected ? '▶ ' : '  '
+      prefix = is_selected ? ICON_SELECT : '  '
 
       size_str = format_size(item[:size])
       date_str = format_date(item[:mtime])

data/lib/sergeant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sergeant
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/lib/sergeant.rb

@@ -26,6 +26,7 @@ class SergeantApp
     @selected_index = 0
     @scroll_offset = 0
     @show_ownership = false
+    @last_show_ownership = false
     @config = Sergeant::Config.load_config
     @bookmarks = Sergeant::Config.load_bookmarks
     @marked_items = []
@@ -33,6 +34,8 @@ class SergeantApp
     @cut_mode = false
     @last_refreshed_dir = nil
     @items = []
+    @filter_text = ''
+    @all_items = []
   end
 
   def run
@@ -99,6 +102,8 @@ class SergeantApp
           execute_terminal_command
         when '/'
           search_files
+        when 'f'
+          filter_current_view
         when 'q', 27
           close_screen
           puts @current_dir
@@ -194,9 +199,10 @@ class SergeantApp
   def refresh_items_if_needed
     # Only refresh if directory has changed, or if showing ownership toggle changed
     # This prevents expensive file system operations on every keystroke
-    if @current_dir != @last_refreshed_dir
+    if @current_dir != @last_refreshed_dir || @show_ownership != @last_show_ownership
       refresh_items
       @last_refreshed_dir = @current_dir
+      @last_show_ownership = @show_ownership
     end
   end
 
@@ -206,8 +212,7 @@ class SergeantApp
   end
 
   def refresh_items
-    entries = Dir.entries(@current_dir).reject { |e| e == '.' }
-
+    entries = Dir.entries(@current_dir).reject { |e| e == '.' || e == '..' }
     @items = []
 
     unless @current_dir == '/'
@@ -229,9 +234,9 @@ class SergeantApp
       full_path = File.join(@current_dir, entry)
       begin
         stat = File.stat(full_path)
-        owner_info = get_owner_info(stat)
-        is_dir = File.directory?(full_path)
-        perms = format_permissions(stat.mode, is_dir)
+        is_dir = stat.directory?  # Use stat instead of File.directory? (saves syscall)
+        owner_info = @show_ownership ? get_owner_info(stat) : nil  # Only fetch if needed
+        perms = @show_ownership ? format_permissions(stat.mode, is_dir) : nil
 
         if is_dir
           directories << {
@@ -262,15 +267,32 @@ class SergeantApp
     files.sort_by! { |f| f[:name].downcase }
 
     @items += directories + files
+    @all_items = @items.dup  # Store all items for filtering
+
+    # Apply filter if active
+    apply_filter if @filter_text && !@filter_text.empty?
 
     @selected_index = [@selected_index, @items.length - 1].min
     @selected_index = 0 if @selected_index.negative?
   end
 
+  def apply_filter
+    return if @filter_text.empty?
+
+    # Filter items by name (case-insensitive), keep '..' entry
+    @items = @all_items.select do |item|
+      item[:name] == '..' || item[:name].downcase.include?(@filter_text.downcase)
+    end
+  end
+
   def move_selection(delta)
     return if @items.empty?
 
     @selected_index = (@selected_index + delta).clamp(0, @items.length - 1)
+
+    # Flush input buffer to prevent lag on Windows when holding arrow keys
+    # This clears any queued key-repeat events that accumulated during processing
+    Curses.flushinp
   end
 
   def toggle_mark

data/sergeant.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject do |f|
       f.match(%r{\A(?:test|spec|features)/}) ||
         f.match(%r{\A\.}) ||
+        f.match(%r{\.DS_Store$}) ||
+        f.match(%r{\.(gif|png|jpg|jpeg|mp4|webm)$}) ||  # Exclude media files
         f == 'build.rb' ||
         f == 'install.sh' ||
         f == 'sgt.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sergeant
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Mateusz Grotha
@@ -66,12 +66,9 @@ files:
 - LICENSE
 - README.md
 - bin/sgt
-- lib/.DS_Store
 - lib/sergeant.rb
-- lib/sergeant/.DS_Store
 - lib/sergeant/config.rb
 - lib/sergeant/modals.rb
-- lib/sergeant/modals/.DS_Store
 - lib/sergeant/modals/dialogs.rb
 - lib/sergeant/modals/file_operations.rb
 - lib/sergeant/modals/help.rb