rufio 1.1.0 → 1.4.0

data/lib/rufio/ui_renderer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'text_utils'
+require_relative 'background_status'
 
 module Rufio
   # UIレンダリング専用クラス
@@ -10,8 +11,12 @@ module Rufio
   # - シンタックスハイライト（bat 連携）を担当
   class UIRenderer
     # Layout constants
-    HEADER_FOOTER_MARGIN = 2       # Header(1行) + Footer(1行) 分のマージン
-    CONTENT_START_LINE = 1         # コンテンツ開始行（フッタ1行: Y=0）
+    PATH_LINE = 0                  # 現在のパス（Y=0）
+    BOOKMARK_LINE = 1              # ブックマーク一覧（Y=1）
+    HEADER_FOOTER_MARGIN = 3       # パス(1行) + ブックマーク(1行) + モードタブ(1行) 分のマージン
+    CONTENT_START_LINE = 2         # コンテンツ開始行
+    JOB_HEADER_FOOTER_MARGIN = 2   # ジョブモード: ジョブフッタ(1行) + モードタブ(1行)
+    JOB_CONTENT_START_LINE = 1     # ジョブモードのコンテンツ開始行
     CURSOR_OFFSET = 1              # カーソル位置のオフセット
     ICON_SIZE_PADDING = 12         # アイコン、選択マーク、サイズ情報分
     BOOKMARK_HIGHLIGHT_DURATION = 0.5  # ブックマークハイライト表示時間（秒）
@@ -24,7 +29,7 @@ module Rufio
 
     attr_accessor :keybind_handler, :directory_listing, :file_preview
     attr_accessor :background_executor, :test_mode
-    attr_accessor :completion_lamp_message, :completion_lamp_time
+    attr_reader :background_status
     attr_reader :tab_mode_manager, :highlight_updated, :left_panel_ratio
 
     def preview_enabled?
@@ -64,9 +69,8 @@ module Rufio
       @highlighted_bookmark_index = nil
       @highlighted_bookmark_time = nil
 
-      # Completion lamp
-      @completion_lamp_message = nil
-      @completion_lamp_time = nil
+      # 通知とフッターで同じ完了状態を参照する。
+      @background_status = BackgroundStatus.new
 
       # Tab mode manager
       @tab_mode_manager = TabModeManager.new
@@ -124,17 +128,18 @@ module Rufio
     # @param job_mode_instance [JobMode, nil] ジョブモードインスタンス
     def draw_screen(screen, notification_message: nil, fps: nil,
                     in_job_mode: false, job_manager: nil, job_mode_instance: nil)
-      content_height = @screen_height - HEADER_FOOTER_MARGIN
-
       if in_job_mode
-        # ジョブモード: フッタ y=0（上部）、コンテンツ y=1〜h-2、統合行 y=h-1（下部）
+        # ジョブモード: フッタ y=0（上部）、コンテンツ y=1〜h-2、統合行 y=h-1（下部・パス付き）
+        content_height = @screen_height - JOB_HEADER_FOOTER_MARGIN
         log_mode = job_mode_instance&.log_mode? || false
         draw_job_footer_to_buffer(screen, 0, job_manager, log_mode: log_mode)
         draw_job_list_to_buffer(screen, content_height, job_manager, job_mode_instance)
         draw_mode_tabs_to_buffer(screen, @screen_height - 1)
       else
-        # 通常モード: フッタ y=0（上部）、コンテンツ y=1〜h-2、統合行 y=h-1（下部）
-        draw_footer_to_buffer(screen, 0, fps)
+        # 通常モード: パス y=0、ブックマーク y=1、コンテンツ y=2〜h-2、モードタブ y=h-1（下部）
+        content_height = @screen_height - HEADER_FOOTER_MARGIN
+        draw_path_line_to_buffer(screen, PATH_LINE)
+        draw_footer_to_buffer(screen, BOOKMARK_LINE, fps)
 
         entries = get_display_entries
         selected_entry = entries[@keybind_handler.current_index]
@@ -142,10 +147,14 @@ module Rufio
         left_width = (@screen_width * @left_panel_ratio).to_i
         right_width = @screen_width - left_width
 
-        draw_directory_list_to_buffer(screen, entries, left_width, content_height)
-        draw_file_preview_to_buffer(screen, selected_entry, right_width, content_height, left_width)
+        if @keybind_handler.preview_focused?
+          draw_file_preview_to_buffer(screen, selected_entry, @screen_width, content_height, 0)
+        else
+          draw_directory_list_to_buffer(screen, entries, left_width, content_height)
+          draw_file_preview_to_buffer(screen, selected_entry, right_width, content_height, left_width)
+        end
 
-        draw_mode_tabs_to_buffer(screen, @screen_height - 1)
+        draw_mode_tabs_to_buffer(screen, @screen_height - 1, show_path: false)
       end
 
       # 通知メッセージがある場合は表示
@@ -223,7 +232,7 @@ module Rufio
     # FilePreview の結果ハッシュからプレーンテキスト行を抽出する
     def extract_preview_lines(preview)
       case preview[:type]
-      when 'text', 'code'
+      when 'text', 'code', 'archive'
         preview[:lines]
       when 'binary'
         ["(#{ConfigLoader.message('file.binary_file')})", ConfigLoader.message('file.cannot_preview')]
@@ -309,9 +318,10 @@ module Rufio
 
     def draw_file_preview_to_buffer(screen, selected_entry, width, height, left_offset)
       # 事前計算
+      fullscreen = @keybind_handler&.preview_focused?
       cursor_position = left_offset + CURSOR_OFFSET
       max_chars_from_cursor = @screen_width - cursor_position
-      safe_width = [max_chars_from_cursor - 2, width - 2, 0].max
+      safe_width = fullscreen ? @screen_width : [max_chars_from_cursor - 2, width - 2, 0].max
 
       # プレビューコンテンツをキャッシュから取得
       preview_content = nil
@@ -382,13 +392,13 @@ module Rufio
         end
       end
 
-      content_x = cursor_position + 1
+      content_x = fullscreen ? 0 : cursor_position + 1
 
       (0...height).each do |i|
         line_num = i + CONTENT_START_LINE
 
         # 区切り線
-        screen.put(cursor_position, line_num, '│')
+        screen.put(cursor_position, line_num, '│') unless fullscreen
 
         next if safe_width <= 0
 
@@ -473,7 +483,7 @@ module Rufio
 
     def draw_footer_to_buffer(screen, y, fps = nil)
       if @keybind_handler.filter_active?
-        if @keybind_handler.instance_variable_get(:@filter_mode)
+        if @keybind_handler.filter_mode?
           help_text = "Filter mode: Type to filter, ESC to clear, Enter to apply, Backspace to delete"
         else
           help_text = "Filtered view active - Space to edit filter, ESC to clear filter"
@@ -518,13 +528,8 @@ module Rufio
           if @background_executor.running?
             command_name = @background_executor.current_command || "処理中"
             right_parts << "\e[32m🔄\e[0m #{command_name}"
-          elsif @completion_lamp_message && @completion_lamp_time
-            if (Time.now - @completion_lamp_time) < 3.0
-              right_parts << @completion_lamp_message
-            else
-              @completion_lamp_message = nil
-              @completion_lamp_time = nil
-            end
+          elsif @background_status.message
+            right_parts << @background_status.message
           end
         end
 
@@ -575,7 +580,41 @@ module Rufio
     # モードタブ描画
     # ============================
 
-    def draw_mode_tabs_to_buffer(screen, y)
+    # 現在のパスを 1 行で表示する（ホームは ~、長い場合は左側を省略）
+    def draw_path_line_to_buffer(screen, y)
+      path_text = " #{format_header_path(@directory_listing.current_path, @screen_width - 2)}"
+      screen.put_string(0, y, path_text.ljust(@screen_width), fg: "\e[1m")
+    end
+
+    def format_header_path(path, max_width)
+      home = Dir.home rescue nil
+      display = path.to_s
+      if home && !home.empty?
+        if display == home
+          display = '~'
+        elsif display.start_with?(home + '/')
+          display = "~#{display.delete_prefix(home)}"
+        end
+      end
+      return display if TextUtils.display_width(display) <= max_width
+
+      # 末尾（現在のディレクトリ側）を残して先頭を … に置き換える
+      ellipsis = '…'
+      budget = max_width - TextUtils.display_width(ellipsis)
+      tail = +''
+      tail_width = 0
+      display.reverse.each_char do |char|
+        char_width = TextUtils.display_width(char)
+        break if tail_width + char_width > budget
+
+        tail.prepend(char)
+        tail_width += char_width
+      end
+      "#{ellipsis}#{tail}"
+    end
+
+    # show_path: Files モードではパスを最上段に出すため、タブ行には表示しない
+    def draw_mode_tabs_to_buffer(screen, y, show_path: true)
       # タブモードマネージャの状態を同期
       sync_tab_mode_with_keybind_handler
 
@@ -626,7 +665,7 @@ module Rufio
         current_x += 1
 
         path_end = @screen_width - 1 - version_w
-        path_str = " #{shorten_path(current_path)} "
+        path_str = show_path ? " #{shorten_path(current_path)} " : ''
         path_str.each_char do |char|
           break if current_x >= path_end
           char_w = TextUtils.display_width(char)
@@ -674,7 +713,7 @@ module Rufio
       selected_index = job_mode_instance&.selected_index || 0
 
       (0...height).each do |i|
-        line_num = i + CONTENT_START_LINE
+        line_num = i + JOB_CONTENT_START_LINE
 
         if i < jobs.length
           job = jobs[i]
@@ -687,16 +726,16 @@ module Rufio
 
     def draw_job_log_to_buffer(screen, height, job)
       unless job
-        screen.put_string(0, CONTENT_START_LINE, 'No job selected'.ljust(@screen_width), fg: "\e[90m")
+        screen.put_string(0, JOB_CONTENT_START_LINE, 'No job selected'.ljust(@screen_width), fg: "\e[90m")
         return
       end
 
       log_lines = job.logs || []
       title = "=== Log: #{job.name} ==="
-      screen.put_string(0, CONTENT_START_LINE, title.ljust(@screen_width), fg: "\e[1;36m")
+      screen.put_string(0, JOB_CONTENT_START_LINE, title.ljust(@screen_width), fg: "\e[1;36m")
 
       (0...height - 1).each do |i|
-        line_num = i + CONTENT_START_LINE + 1
+        line_num = i + JOB_CONTENT_START_LINE + 1
         line = log_lines[i] || ''
         line = line[0...@screen_width].ljust(@screen_width)
         screen.put_string(0, line_num, line, fg: "\e[37m")
@@ -762,20 +801,9 @@ module Rufio
     private
 
     def get_display_entries
-      entries = if @keybind_handler.filter_active?
-                  all_entries = @directory_listing.list_entries
-                  query = @keybind_handler.filter_query.downcase
-                  query.empty? ? all_entries : all_entries.select { |entry| entry[:name].downcase.include?(query) }
-                else
-                  @directory_listing.list_entries
-                end
+      return @keybind_handler.get_active_entries if @keybind_handler.respond_to?(:get_active_entries)
 
-      # ヘルプモードとLogsモードでは..を非表示にする
-      if @keybind_handler.help_mode? || @keybind_handler.log_viewer_mode?
-        entries.reject { |entry| entry[:name] == '..' }
-      else
-        entries
-      end
+      @directory_listing.list_entries
     end
 
     # キーバインドハンドラの状態とタブモードを同期

data/lib/rufio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufio
-  VERSION = '1.1.0'
+  VERSION = '1.4.0'
 end

data/lib/rufio/zip_archive.rb

@@ -0,0 +1,314 @@
+# frozen_string_literal: true
+
+require 'zlib'
+
+module Rufio
+  # ZIPアーカイブの読み取り専用パーサー（FastZip Phase 1: Pure Ruby 実装）
+  #
+  # EOCD → (ZIP64 EOCD) → Central Directory の順に辿り、
+  # ファイル本体を展開せずにエントリ一覧（unzip -l 相当）を取得する。
+  # 将来の Zig ネイティブ実装はこのクラスと同じ結果を返すことを互換条件とする。
+  class ZipArchive
+    class FormatError < StandardError; end
+
+    Entry = Struct.new(
+      :name, :compressed_size, :size, :method, :crc32, :mtime,
+      :local_header_offset, :flags, :directory, :encrypted,
+      :version_made_by, :external_attributes,
+      keyword_init: true
+    ) do
+      alias_method :directory?, :directory
+      alias_method :encrypted?, :encrypted
+
+      # Unix 系で作られたエントリのファイルモード（それ以外は nil）
+      def unix_mode
+        return nil unless (version_made_by >> 8) == HOST_UNIX
+
+        mode = external_attributes >> 16
+        mode.zero? ? nil : mode
+      end
+
+      def symlink?
+        mode = unix_mode
+        !mode.nil? && (mode & S_IFMT) == S_IFLNK
+      end
+    end
+
+    Listing = Struct.new(:entries, :total_entries, :comment, :zip64, :central_directory_offset, keyword_init: true) do
+      alias_method :zip64?, :zip64
+
+      def truncated?
+        entries.length < total_entries
+      end
+    end
+
+    EOCD_SIGNATURE = 0x06054b50
+    ZIP64_EOCD_SIGNATURE = 0x06064b50
+    ZIP64_LOCATOR_SIGNATURE = 0x07064b50
+    CENTRAL_HEADER_SIGNATURE = 0x02014b50
+
+    EOCD_SIZE = 22
+    ZIP64_LOCATOR_SIZE = 20
+    ZIP64_EOCD_MIN_SIZE = 56
+    CENTRAL_HEADER_SIZE = 46
+    MAX_COMMENT_SIZE = 0xFFFF
+
+    ZIP64_EXTRA_ID = 0x0001
+    UNICODE_PATH_EXTRA_ID = 0x7075
+
+    FLAG_ENCRYPTED = 0x0001
+    FLAG_UTF8 = 0x0800
+
+    HOST_UNIX = 3
+    S_IFMT = 0o170000
+    S_IFLNK = 0o120000
+    S_IFDIR = 0o040000
+    S_IFREG = 0o100000
+
+    METHOD_NAMES = {
+      0 => 'Stored',
+      8 => 'Deflate',
+      9 => 'Deflate64',
+      12 => 'BZip2',
+      14 => 'LZMA',
+      93 => 'Zstd',
+      95 => 'XZ',
+      99 => 'AES'
+    }.freeze
+
+    def self.method_name(method)
+      METHOD_NAMES.fetch(method, "Method#{method}")
+    end
+
+    # ZIPのマジックナンバーで始まるか（空アーカイブはEOCDから始まる）
+    def self.zip_signature?(path)
+      head = File.binread(path, 4)
+      ["PK\x03\x04".b, "PK\x05\x06".b].include?(head)
+    rescue SystemCallError
+      false
+    end
+
+    # @param path [String] ZIPファイルのパス
+    # @param limit [Integer, nil] 読み取るエントリ数の上限（プレビュー用）
+    # @return [Listing]
+    def self.list(path, limit: nil)
+      new(path).list(limit: limit)
+    end
+
+    def initialize(path)
+      @path = path
+    end
+
+    def list(limit: nil)
+      File.open(@path, 'rb') do |io|
+        file_size = io.size
+        eocd = read_end_of_central_directory(io, file_size)
+        count = limit ? [eocd[:total_entries], limit].min : eocd[:total_entries]
+        entries = read_central_directory(io, file_size, eocd, count)
+
+        Listing.new(
+          entries: entries,
+          total_entries: eocd[:total_entries],
+          comment: eocd[:comment],
+          zip64: eocd[:zip64],
+          central_directory_offset: eocd[:cd_offset]
+        )
+      end
+    end
+
+    private
+
+    # ファイル末尾から EOCD を後方探索する
+    def read_end_of_central_directory(io, file_size)
+      raise FormatError, 'File too small to be a ZIP archive' if file_size < EOCD_SIZE
+
+      tail_size = [file_size, EOCD_SIZE + MAX_COMMENT_SIZE].min
+      tail_offset = file_size - tail_size
+      tail = read_at(io, tail_offset, tail_size)
+
+      position = find_eocd_position(io, tail)
+      raise FormatError, 'End of central directory not found' unless position
+
+      fields = tail.byteslice(position, EOCD_SIZE).unpack('VvvvvVVv')
+      _sig, disk, cd_disk, _disk_entries, total_entries, cd_size, cd_offset, comment_length = fields
+      comment = tail.byteslice(position + EOCD_SIZE, comment_length)
+      eocd = {
+        total_entries: total_entries,
+        cd_size: cd_size,
+        cd_offset: cd_offset,
+        comment: decode_text(comment, utf8: false),
+        zip64: false
+      }
+
+      if zip64_required?(fields)
+        apply_zip64_eocd(io, tail_offset + position, eocd)
+      elsif disk != 0 || cd_disk != 0
+        raise FormatError, 'Multi-disk ZIP archives are not supported'
+      end
+
+      eocd
+    end
+
+    # コメント長と整合し、指す先に Central Directory がある最後の EOCD を探す
+    # （コメント内に EOCD と同じバイト列が含まれていても誤認しない）
+    def find_eocd_position(io, tail)
+      signature = [EOCD_SIGNATURE].pack('V')
+      position = tail.bytesize - EOCD_SIZE
+
+      while position >= 0
+        position = tail.rindex(signature, position)
+        return nil unless position
+
+        return position if plausible_eocd?(io, tail, position)
+
+        position -= 1
+      end
+
+      nil
+    end
+
+    def plausible_eocd?(io, tail, position)
+      fields = tail.byteslice(position, EOCD_SIZE).unpack('VvvvvVVv')
+      return false unless position + EOCD_SIZE + fields[7] == tail.bytesize
+      return true if fields[4].zero? || zip64_required?(fields)
+
+      io.seek(fields[6])
+      io.read(4)&.unpack1('V') == CENTRAL_HEADER_SIGNATURE
+    end
+
+    def zip64_required?(fields)
+      fields[1..4].any? { |v| v == 0xFFFF } || fields[5] == 0xFFFFFFFF || fields[6] == 0xFFFFFFFF
+    end
+
+    def apply_zip64_eocd(io, eocd_offset, eocd)
+      locator_offset = eocd_offset - ZIP64_LOCATOR_SIZE
+      raise FormatError, 'ZIP64 locator not found' if locator_offset.negative?
+
+      sig, _disk, zip64_eocd_offset, _total_disks = read_at(io, locator_offset, ZIP64_LOCATOR_SIZE).unpack('VVQ<V')
+      raise FormatError, 'ZIP64 locator not found' unless sig == ZIP64_LOCATOR_SIGNATURE
+
+      record = read_at(io, zip64_eocd_offset, ZIP64_EOCD_MIN_SIZE)
+      sig, _size, _made, _needed, _disk, _cd_disk, _disk_entries, total_entries, cd_size, cd_offset =
+        record.unpack('VQ<vvVVQ<Q<Q<Q<')
+      raise FormatError, 'ZIP64 end of central directory not found' unless sig == ZIP64_EOCD_SIGNATURE
+
+      eocd.merge!(total_entries: total_entries, cd_size: cd_size, cd_offset: cd_offset, zip64: true)
+    end
+
+    def read_central_directory(io, file_size, eocd, count)
+      cd_end = eocd[:cd_offset] + eocd[:cd_size]
+      raise FormatError, 'Central directory is out of range' if cd_end > file_size
+
+      offset = eocd[:cd_offset]
+      Array.new(count) do
+        raise FormatError, 'Central directory is truncated' if offset + CENTRAL_HEADER_SIZE > cd_end
+
+        entry, offset = read_central_header(io, offset, cd_end)
+        entry
+      end
+    end
+
+    def read_central_header(io, offset, cd_end)
+      header = read_at(io, offset, CENTRAL_HEADER_SIZE)
+      sig, made_by, _needed, flags, method, dos_time, dos_date, crc32, compressed_size, size,
+        name_length, extra_length, comment_length, _disk, _int_attr, ext_attr, local_offset =
+        header.unpack('VvvvvvvVVVvvvvvVV')
+      raise FormatError, "Invalid central directory header at offset #{offset}" unless sig == CENTRAL_HEADER_SIGNATURE
+
+      variable_length = name_length + extra_length + comment_length
+      next_offset = offset + CENTRAL_HEADER_SIZE + variable_length
+      raise FormatError, 'Central directory is truncated' if next_offset > cd_end
+
+      variable = read_at(io, offset + CENTRAL_HEADER_SIZE, name_length + extra_length)
+      raw_name = variable.byteslice(0, name_length)
+      extra = parse_extra_fields(variable.byteslice(name_length, extra_length))
+
+      sizes = { size: size, compressed_size: compressed_size, local_header_offset: local_offset }
+      apply_zip64_extra(sizes, extra[ZIP64_EXTRA_ID]) if extra[ZIP64_EXTRA_ID]
+
+      name = unicode_path(extra[UNICODE_PATH_EXTRA_ID], raw_name) ||
+             decode_text(raw_name, utf8: (flags & FLAG_UTF8) != 0)
+
+      entry = Entry.new(
+        name: name,
+        compressed_size: sizes[:compressed_size],
+        size: sizes[:size],
+        method: method,
+        crc32: crc32,
+        mtime: dos_to_time(dos_date, dos_time),
+        local_header_offset: sizes[:local_header_offset],
+        flags: flags,
+        directory: name.end_with?('/'),
+        encrypted: (flags & FLAG_ENCRYPTED) != 0,
+        version_made_by: made_by,
+        external_attributes: ext_attr
+      )
+      [entry, next_offset]
+    end
+
+    def parse_extra_fields(data)
+      fields = {}
+      pos = 0
+      while pos + 4 <= data.bytesize
+        id, length = data.byteslice(pos, 4).unpack('vv')
+        break if pos + 4 + length > data.bytesize
+
+        fields[id] ||= data.byteslice(pos + 4, length)
+        pos += 4 + length
+      end
+      fields
+    end
+
+    # ZIP64 拡張フィールドには 0xFFFFFFFF だった値だけが既定の順序で格納される
+    def apply_zip64_extra(sizes, data)
+      pos = 0
+      %i[size compressed_size local_header_offset].each do |key|
+        next unless sizes[key] == 0xFFFFFFFF
+        break if pos + 8 > data.bytesize
+
+        sizes[key] = data.byteslice(pos, 8).unpack1('Q<')
+        pos += 8
+      end
+    end
+
+    # Info-ZIP Unicode Path 拡張（元のファイル名のCRCが一致する場合のみ採用）
+    def unicode_path(data, raw_name)
+      return nil if data.nil? || data.bytesize < 5
+
+      version, name_crc = data.unpack('CV')
+      return nil unless version == 1 && name_crc == Zlib.crc32(raw_name)
+
+      name = data.byteslice(5..).force_encoding(Encoding::UTF_8)
+      name.valid_encoding? ? name : nil
+    end
+
+    # UTFフラグがなければ UTF-8 → CP932（Windows日本語環境で作られたZIP）→ 置換 の順で解釈する
+    def decode_text(raw, utf8:)
+      text = raw.dup.force_encoding(Encoding::UTF_8)
+      return text if utf8 || text.valid_encoding?
+
+      raw.encode(Encoding::UTF_8, Encoding::Windows_31J)
+    rescue EncodingError
+      raw.encode(Encoding::UTF_8, Encoding::BINARY, invalid: :replace, undef: :replace, replace: '?')
+    end
+
+    def dos_to_time(date, time)
+      return nil if date.zero?
+
+      Time.new(
+        ((date >> 9) & 0x7F) + 1980, (date >> 5) & 0x0F, date & 0x1F,
+        (time >> 11) & 0x1F, (time >> 5) & 0x3F, (time & 0x1F) * 2
+      )
+    rescue ArgumentError
+      nil
+    end
+
+    def read_at(io, offset, length)
+      io.seek(offset)
+      data = io.read(length)
+      raise FormatError, 'Unexpected end of file' if data.nil? || data.bytesize < length
+
+      data
+    end
+  end
+end