rufio 1.1.0 → 1.3.0

data/lib/rufio/file_operation_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'dialog_support'
+
 require_relative 'file_operations'
 require_relative 'dialog_renderer'
 require_relative 'logger'
@@ -8,6 +10,8 @@ module Rufio
   # ファイル操作専用コントローラ
   # KeybindHandler からファイル作成・削除・リネーム・移動・コピー系メソッドを分離し、単一責任原則に準拠
   class FileOperationController
+    include DialogSupport
+
     # Dialog size constants
     CONFIRMATION_DIALOG_WIDTH = 45
     DIALOG_BORDER_HEIGHT = 4
@@ -35,51 +39,15 @@ module Rufio
     # ============================
 
     def create_file
-      current_path = @directory_listing&.current_path || Dir.pwd
-
-      filename = @dialog_renderer.show_input_dialog("Create File", "Enter file name:", {
-        border_color: "\e[32m",
-        title_color: "\e[1;32m",
-        content_color: "\e[37m"
-      })
-
-      return false if filename.nil? || filename.empty?
-
-      result = @file_operations.create_file(current_path, filename)
-
-      if result.success
-        @directory_listing.refresh
-        entries = @directory_listing.list_entries
-        new_file_index = entries.find_index { |entry| entry[:name] == filename }
-        @nav_controller.select_index(new_file_index) if new_file_index
+      prompt_and_select_entry("Create File", "Enter file name:", "\e[32m", "\e[1;32m") do |path, name|
+        @file_operations.create_file(path, name)
       end
-
-      @terminal_ui&.refresh_display
-      result.success
     end
 
     def create_directory
-      current_path = @directory_listing&.current_path || Dir.pwd
-
-      dirname = @dialog_renderer.show_input_dialog("Create Directory", "Enter directory name:", {
-        border_color: "\e[34m",
-        title_color: "\e[1;34m",
-        content_color: "\e[37m"
-      })
-
-      return false if dirname.nil? || dirname.empty?
-
-      result = @file_operations.create_directory(current_path, dirname)
-
-      if result.success
-        @directory_listing.refresh
-        entries = @directory_listing.list_entries
-        new_dir_index = entries.find_index { |entry| entry[:name] == dirname }
-        @nav_controller.select_index(new_dir_index) if new_dir_index
+      prompt_and_select_entry("Create Directory", "Enter directory name:", "\e[34m", "\e[1;34m") do |path, name|
+        @file_operations.create_directory(path, name)
       end
-
-      @terminal_ui&.refresh_display
-      result.success
     end
 
     # ============================
@@ -91,27 +59,9 @@ module Rufio
       return false unless entry
 
       current_name = entry[:name]
-      current_path = @directory_listing&.current_path || Dir.pwd
-
-      new_name = @dialog_renderer.show_input_dialog("Rename: #{current_name}", "Enter new name:", {
-        border_color: "\e[33m",
-        title_color: "\e[1;33m",
-        content_color: "\e[37m"
-      })
-
-      return false if new_name.nil? || new_name.empty?
-
-      result = @file_operations.rename(current_path, current_name, new_name)
-
-      if result.success
-        @directory_listing.refresh
-        entries = @directory_listing.list_entries
-        new_index = entries.find_index { |e| e[:name] == new_name }
-        @nav_controller.select_index(new_index) if new_index
+      prompt_and_select_entry("Rename: #{current_name}", "Enter new name:", "\e[33m", "\e[1;33m") do |path, new_name|
+        @file_operations.rename(path, current_name, new_name)
       end
-
-      @terminal_ui&.refresh_display
-      result.success
     end
 
     # ============================
@@ -154,31 +104,13 @@ module Rufio
         ''
       ]
 
-      title = 'Confirm Delete'
-      width = [50, current_name.length + 10].max
-      height = content_lines.length + 4
-
-      confirmed = false
-      show_overlay_dialog(title, content_lines, {
-        width: width,
-        height: height,
+      confirmed = confirm_dialog('Confirm Delete', content_lines, {
+        width: [50, current_name.length + 10].max,
+        height: content_lines.length + 4,
         border_color: "\e[31m",
         title_color: "\e[1;31m",
         content_color: "\e[37m"
-      }) do
-        loop do
-          input = STDIN.getch.downcase
-          case input
-          when 'y'
-            confirmed = true
-            break
-          when 'n', "\e"
-            confirmed = false
-            break
-          end
-        end
-        nil
-      end
+      })
 
       return false unless confirmed
 
@@ -260,69 +192,39 @@ module Rufio
         ''
       ]
 
-      confirmed = false
-      show_overlay_dialog('Exit Confirmation', content_lines, {
+      confirm_dialog('Exit Confirmation', content_lines, {
         width: CONFIRMATION_DIALOG_WIDTH,
         height: DIALOG_BORDER_HEIGHT + content_lines.length,
         border_color: "\e[33m",
         title_color: "\e[1;33m",
         content_color: "\e[37m"
-      }) do
-        loop do
-          input = STDIN.getch.downcase
-          case input
-          when 'y'
-            confirmed = true
-            break
-          when 'n', "\e", "\x03"
-            confirmed = false
-            break
-          end
-        end
-        nil
-      end
-
-      confirmed
+      }, cancel_on_quit: false)
     end
 
     private
 
-    def show_overlay_dialog(title, content_lines, options = {}, &block)
-      use_overlay = @terminal_ui &&
-                    @terminal_ui.respond_to?(:screen) &&
-                    @terminal_ui.respond_to?(:renderer) &&
-                    @terminal_ui.screen &&
-                    @terminal_ui.renderer
-
-      if use_overlay
-        @terminal_ui.show_overlay_dialog(title, content_lines, options, &block)
-      else
-        width = options[:width]
-        height = options[:height]
-
-        unless width && height
-          width, height = @dialog_renderer.calculate_dimensions(content_lines, {
-            title: title,
-            min_width: options[:min_width] || 40,
-            max_width: options[:max_width] || 80
-          })
-        end
-
-        x, y = @dialog_renderer.calculate_center(width, height)
+    def prompt_and_select_entry(title, prompt, border_color, title_color)
+      current_path = @directory_listing&.current_path || Dir.pwd
 
-        @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
-          border_color: options[:border_color] || "\e[37m",
-          title_color: options[:title_color] || "\e[1;33m",
-          content_color: options[:content_color] || "\e[37m"
-        })
+      name = @dialog_renderer.show_input_dialog(title, prompt, {
+        border_color: border_color,
+        title_color: title_color,
+        content_color: "\e[37m"
+      })
 
-        key = block_given? ? yield : STDIN.getch
+      return false if name.nil? || name.empty?
 
-        @dialog_renderer.clear_area(x, y, width, height)
-        @terminal_ui&.refresh_display
+      result = yield(current_path, name)
 
-        key
+      if result.success
+        @directory_listing.refresh
+        entries = @directory_listing.list_entries
+        new_index = entries.find_index { |e| e[:name] == name }
+        @nav_controller.select_index(new_index) if new_index
       end
+
+      @terminal_ui&.refresh_display
+      result.success
     end
 
     def show_delete_confirmation(count, source_path = nil)
@@ -342,111 +244,37 @@ module Rufio
 
       print "\a"
 
-      confirmed = false
-      show_overlay_dialog(title, content_lines, {
+      confirm_dialog(title, content_lines, {
         width: dialog_width,
         height: dialog_height,
         border_color: "\e[31m",
         title_color: "\e[1;31m",
         content_color: "\e[37m"
-      }) do
-        loop do
-          input = STDIN.getch.downcase
-          case input
-          when 'y'
-            confirmed = true
-            break
-          when 'n', "\e", "\x03", 'q'
-            confirmed = false
-            break
-          end
-        end
-        nil
-      end
-
-      confirmed
+      })
     end
 
     def show_move_confirmation(count, source_path, dest_path)
-      source_display = shorten_path(source_path, 35)
-      dest_display = shorten_path(dest_path, 35)
-
-      content_lines = [
-        '',
-        "Move #{count} item(s)?",
-        '',
-        "From: #{source_display}",
-        "To:   #{dest_display}",
-        '',
-        '  [Y]es - Move',
-        '  [N]o  - Cancel',
-        ''
-      ]
-
-      confirmed = false
-      show_overlay_dialog('Move Confirmation', content_lines, {
-        width: CONFIRMATION_DIALOG_WIDTH,
-        height: DIALOG_BORDER_HEIGHT + content_lines.length,
-        border_color: "\e[34m",
-        title_color: "\e[1;34m",
-        content_color: "\e[37m"
-      }) do
-        loop do
-          input = STDIN.getch.downcase
-          case input
-          when 'y'
-            confirmed = true
-            break
-          when 'n', "\e", "\x03", 'q'
-            confirmed = false
-            break
-          end
-        end
-        nil
-      end
-
-      confirmed
+      show_transfer_confirmation('Move', count, source_path, dest_path, '34')
     end
 
     def show_copy_confirmation(count, source_path, dest_path)
-      source_display = shorten_path(source_path, 35)
-      dest_display = shorten_path(dest_path, 35)
+      show_transfer_confirmation('Copy', count, source_path, dest_path, '32')
+    end
 
+    def show_transfer_confirmation(action, count, source_path, dest_path, color)
       content_lines = [
-        '',
-        "Copy #{count} item(s)?",
-        '',
-        "From: #{source_display}",
-        "To:   #{dest_display}",
-        '',
-        '  [Y]es - Copy',
-        '  [N]o  - Cancel',
-        ''
+        '', "#{action} #{count} item(s)?", '',
+        "From: #{shorten_path(source_path, 35)}",
+        "To:   #{shorten_path(dest_path, 35)}", '',
+        "  [Y]es - #{action}", '  [N]o  - Cancel', ''
       ]
-
-      confirmed = false
-      show_overlay_dialog('Copy Confirmation', content_lines, {
+      confirm_dialog("#{action} Confirmation", content_lines, {
         width: CONFIRMATION_DIALOG_WIDTH,
         height: DIALOG_BORDER_HEIGHT + content_lines.length,
-        border_color: "\e[32m",
-        title_color: "\e[1;32m",
+        border_color: "\e[#{color}m",
+        title_color: "\e[1;#{color}m",
         content_color: "\e[37m"
-      }) do
-        loop do
-          input = STDIN.getch.downcase
-          case input
-          when 'y'
-            confirmed = true
-            break
-          when 'n', "\e", "\x03", 'q'
-            confirmed = false
-            break
-          end
-        end
-        nil
-      end
-
-      confirmed
+      })
     end
 
     def show_deletion_result(success_count, total_count, error_messages = [])
@@ -484,14 +312,13 @@ module Rufio
         title_color: title_color,
         content_color: "\e[37m"
       }) do
-        STDIN.getch
+        KeyInput.getch
         nil
       end
     end
 
     def shorten_path(path, max_length)
-      return path if path.length <= max_length
-      "...#{path[-(max_length - 3)..-1]}"
+      TextUtils.shorten_path_from_end(path, max_length)
     end
   end
 end

data/lib/rufio/file_preview.rb

@@ -13,6 +13,9 @@ module Rufio
     CONTROL_CHAR_NEWLINE = 10
     CONTROL_CHAR_CARRIAGE_RETURN = 13
 
+    # ZIPプレビューで一覧表示するエントリ数の上限
+    ARCHIVE_PREVIEW_ENTRIES = 200
+
     def initialize
       # future: hold syntax highlight settings etc.
     end
@@ -25,6 +28,8 @@ module Rufio
       return empty_response if file_size == 0
 
       begin
+        return archive_response(file_path, max_lines) if zip_archive?(file_path)
+
         # binary file detection
         sample = File.binread(file_path, [file_size, BINARY_SAMPLE_SIZE].min)
         return binary_response(file_path) if binary_file?(sample)
@@ -49,6 +54,45 @@ module Rufio
 
     private
 
+    def zip_archive?(file_path)
+      File.extname(file_path).casecmp?('.zip') || ZipArchive.zip_signature?(file_path)
+    end
+
+    # unzip -l 相当のエントリ一覧をプレビュー行として返す
+    def archive_response(file_path, max_lines)
+      limit = [max_lines, ARCHIVE_PREVIEW_ENTRIES].max
+      listing = ZipArchive.list(file_path, limit: limit)
+      total_size = listing.entries.sum(&:size)
+
+      lines = ["ZIP archive: #{listing.total_entries} entries#{' (ZIP64)' if listing.zip64?}", '']
+      lines << format('%12s  %-8s  %-16s  %s', 'Length', 'Method', 'Modified', 'Name')
+      lines << format('%12s  %-8s  %-16s  %s', '-' * 10, '-' * 8, '-' * 16, '-' * 4)
+      listing.entries.each do |entry|
+        modified = entry.mtime ? entry.mtime.strftime('%Y-%m-%d %H:%M') : '-'
+        method = entry.encrypted? ? "#{ZipArchive.method_name(entry.method)}*" : ZipArchive.method_name(entry.method)
+        lines << format('%12d  %-8s  %-16s  %s', entry.size, method, modified, entry.name)
+      end
+      lines << format('%12s', '-' * 10)
+      if listing.truncated?
+        lines << "... #{listing.total_entries - listing.entries.length} more entries"
+      else
+        lines << format('%12d  %d files', total_size, listing.entries.length)
+      end
+      lines << "Comment: #{listing.comment}" unless listing.comment.empty?
+
+      {
+        type: "archive",
+        language: nil,
+        lines: lines,
+        truncated: listing.truncated?,
+        size: File.size(file_path),
+        modified: File.mtime(file_path),
+        encoding: "UTF-8"
+      }
+    rescue ZipArchive::FormatError => e
+      error_response("#{ConfigLoader.message('file.invalid_archive')}: #{e.message}")
+    end
+
     def binary_file?(sample)
       return false if sample.empty?
 
@@ -77,7 +121,7 @@ module Rufio
             end
 
             lines << line.chomp
-          rescue EncodingError, ArgumentError => e
+          rescue EncodingError, ArgumentError
             # If encoding fails, add placeholder
             lines << "[encoding error in line #{index + 1}]"
           end
@@ -104,7 +148,7 @@ module Rufio
               # Ensure line is properly encoded as UTF-8
               line = line.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
               lines << line.chomp
-            rescue EncodingError, ArgumentError => e
+            rescue EncodingError, ArgumentError
               # If encoding fails, add placeholder
               lines << "[encoding error in line #{index + 1}]"
             end

data/lib/rufio/global_search.rb

@@ -3,19 +3,36 @@
 require 'thread'
 require_relative 'text_utils'
 require_relative 'config_loader'
+require_relative 'document_text_extractor'
+require_relative 'native_content_search'
 
 module Rufio
   # ブックマーク配下のファイル名・テキスト内容をバックグラウンドで横断検索する。
   class GlobalSearch
     SPINNER_FRAMES = ['|', '/', '-', '\\'].freeze
     SPINNER_INTERVAL = 0.12
+    # 検索語に一致した部分の表示（黒の太字・黄色背景）
+    MATCH_FG = "\e[30m\e[1m"
+    MATCH_BG = "\e[43m"
 
     attr_reader :query, :results, :errors, :selected_index, :search_type, :skipped_files
 
+    class << self
+      # nil: 利用可能なら Zig 実装を使う（RUFIO_NATIVE_SEARCH=0 で無効化）
+      attr_writer :native_search
+
+      def native_search?
+        enabled = @native_search.nil? ? ENV['RUFIO_NATIVE_SEARCH'] != '0' : @native_search
+        enabled && NativeContentSearch.available?
+      end
+    end
+
     def initialize
       @active = false
       @scanning = false
       @worker = nil
+      @document_extractor = DocumentTextExtractor.new
+      @document_cache = DocumentTextCache.new(extractor: @document_extractor)
     end
 
     def active?
@@ -63,8 +80,12 @@ module Rufio
         when :entry
           @entries << value
           @results << value if @search_type == :content || matches_query?(value)
+        when :entries
+          # Zig 実装の結果はまとめて届くので、1 フレーム 256 件の上限に縛られない
+          @entries.concat(value)
+          @results.concat(value)
         when :error then @errors << value
-        when :skipped then @skipped_files += 1
+        when :skipped then @skipped_files += value || 1
         when :done then @scanning = false
         end
       end
@@ -118,11 +139,20 @@ module Rufio
       first = [@selected_index - capacity + 1, 0].max
       @results.slice(first, capacity).to_a.each_with_index do |entry, index|
         selected = first + index == @selected_index
-        text = "#{selected ? '>' : ' '} [#{entry[:bookmark]}] #{entry[:relative_path]}"
-        text += ":#{entry[:line_number]}" if entry[:line_number]
+        prefix = "#{selected ? '>' : ' '} [#{entry[:bookmark]}] "
+        text = "#{prefix}#{entry[:relative_path]}"
+        text += if entry[:location]
+                  " - #{entry[:location]}"
+                elsif entry[:line_number]
+                  ":#{entry[:line_number]}"
+                else
+                  ''
+                end
         y = index * row_height + 3
-        write_line(screen, y, text, width, selected ? "\e[1;36m" : nil)
-        write_line(screen, y + 1, "    #{entry[:match_text]}", width) if entry[:line_number]
+        # ファイル名検索はパス、本文検索はスニペットの一致箇所をハイライトする
+        path_highlight = @search_type == :filename ? prefix.length : nil
+        write_line(screen, y, text, width, selected ? "\e[1;36m" : nil, highlight_from: path_highlight)
+        write_line(screen, y + 1, "    #{entry[:match_text]}", width, highlight_from: 4) if entry[:match_text]
       end
       if @results.empty?
         message = if @bookmark_count.zero?
@@ -160,9 +190,14 @@ module Rufio
       return unless @scanning
 
       roots, events, type, query = @roots, @events, @search_type, @query.downcase
+      native_cache = self.class.native_search? ? (@native_cache ||= NativeContentSearch::Cache.new) : nil
       @worker = Thread.new do
         begin
-          scan_roots(roots, events, type, query)
+          if native_cache && type == :content && NativeContentSearch.supports_query?(query)
+            scan_roots_natively(roots, events, query, native_cache)
+          else
+            scan_roots(roots, events, type, query)
+          end
         rescue StandardError => e
           events << [:error, e.message]
         end
@@ -230,7 +265,58 @@ module Rufio
       end
     end
 
+    # Zig 実装で走査・検索し、PDF などのドキュメントだけ Ruby 側で抽出する
+    def scan_roots_natively(roots, events, query, cache)
+      valid_roots = []
+      roots.each do |name, root|
+        root = File.expand_path(root)
+        raise Errno::ENOTDIR, root unless File.directory?(root)
+
+        valid_roots << [name, root]
+      rescue SystemCallError, IOError => e
+        events << [:error, "#{name}: #{e.message}"]
+      end
+      return if valid_roots.empty?
+
+      engine = NativeContentSearch.new(roots: valid_roots.map(&:last), query: query,
+                                       excluded_extensions: @excluded_extensions,
+                                       document_extensions: DocumentTextExtractor::EXTENSIONS, cache: cache)
+      engine.each_batch do |batch|
+        entries = []
+        batch.each do |kind, *args|
+          case kind
+          when :match, :document
+            name, root = valid_roots[args[0]]
+            path = args[1]
+            entry = { path: path, bookmark: name, relative_path: path.delete_prefix(root + File::SEPARATOR) }
+            if kind == :document
+              scan_content(entry, query, events)
+            else
+              entries << entry.merge(line_number: args[2], match_text: args[3])
+            end
+          when :error then events << [:error, args[1]]
+          when :skipped then events << [:skipped, args[0]]
+          end
+        end
+        events << [:entries, entries] unless entries.empty?
+      end
+    ensure
+      engine&.close
+    end
+
     def scan_content(entry, query, events)
+      if @document_extractor.supported?(entry[:path])
+        @document_cache.each_record(entry[:path]) do |record|
+          match_index = record[:search_text].index(query)
+          next unless match_index
+
+          snippet = record[:text][[match_index - 30, 0].max, 200].to_s.strip
+          metadata = record.reject { |key, _| key == :text || key == :search_text }
+          events << [:entry, entry.merge(metadata).merge(match_text: snippet)]
+        end
+        return
+      end
+
       File.open(entry[:path], 'rb') do |file|
         sample = file.read(8192).to_s
         if sample.include?("\0")
@@ -249,13 +335,39 @@ module Rufio
           events << [:entry, entry.merge(line_number: number, match_text: snippet)]
         end
       end
-    rescue SystemCallError, IOError => e
+    rescue SystemCallError, IOError, DocumentTextExtractor::ExtractionError => e
       events << [:error, "#{entry[:path]}: #{e.message}"]
     end
 
-    def write_line(screen, y, text, width, color = nil)
+    def write_line(screen, y, text, width, color = nil, highlight_from: nil)
       safe_text = text.scrub.gsub(/[[:cntrl:]]/, ' ')
-      screen.put_string(0, y, TextUtils.truncate_to_width(safe_text, width), fg: color)
+      visible = TextUtils.truncate_to_width(safe_text, width)
+      screen.put_string(0, y, visible, fg: color)
+      return unless highlight_from
+
+      match_ranges(visible, highlight_from).each do |start, length|
+        x = TextUtils.display_width(visible[0, start])
+        screen.put_string(x, y, visible[start, length], fg: MATCH_FG, bg: MATCH_BG)
+      end
+    end
+
+    # 検索と同じく大文字小文字を区別せず、from 文字目以降の一致位置を [開始, 長さ] で返す
+    def match_ranges(text, from)
+      needle = @query.to_s.downcase.chars
+      return [] if needle.empty?
+
+      folded = text.chars.map(&:downcase)
+      ranges = []
+      index = from
+      while index + needle.length <= folded.length
+        if folded[index, needle.length] == needle
+          ranges << [index, needle.length]
+          index += needle.length
+        else
+          index += 1
+        end
+      end
+      ranges
     end
   end
 end

data/lib/rufio/help_menu.rb

@@ -62,6 +62,7 @@ module Rufio
           '', 'Selection and file operations',
           "#{key(:select)}: Select / unselect file",
           "#{key(:copy_selected)}/#{key(:move_selected)}/#{key(:delete_selected)}: Copy / move / delete selected files",
+          "#{key(:zoxide)}: Extract selected .zip files / compress selected items",
           "#{key(:rename)}/#{key(:delete)}: Rename / delete current file",
           "#{key(:create_file)}/#{key(:create_dir)}: Create file / directory",
           '', 'Search and bookmarks',
@@ -72,8 +73,9 @@ module Rufio
           "#{key(:add_bookmark)}/#{key(:bookmark_menu)}: Add / manage bookmarks",
           'Tab / Shift+Tab: Next / previous bookmark',
           "1-9: Jump to bookmark | #{key(:start_dir)}: Start directory",
-          "#{key(:zoxide)}: Directory history (zoxide)",
-          "#{key(:quit)}: Quit (with confirmation)"
+          "#{key(:zoxide)}: Directory history (zoxide, when nothing is selected)",
+          "#{key(:quit)}: Quit (with confirmation)",
+          "#{key(:quit_cd)}: Quit and cd to the current directory (rufio --shell-init)"
         ]
       when 'Modes'
         [
@@ -87,6 +89,10 @@ module Rufio
           'Search file names or text inside every bookmarked directory.',
           'Tab: Switch File names / Content (literal, case insensitive)',
           'Content results show file, line number and matching text.',
+          'Documents: .pdf (page), .xlsx (sheet/cell), .pptx (slide)',
+          'Ruby extracts document text; no Python or Office is needed.',
+          'Unchanged document text is cached in memory for faster searches.',
+          'Images need OCR; legacy .xls/.ppt and slide notes are unsupported.',
           'Yellow Searching... + spinner: Search is running.',
           'Green Search complete: All bookmarked directories scanned.',
           'Exclude extensions in ~/.config/rufio/config.rb:',