rufio 0.20.0 → 0.30.0

data/lib/rufio/terminal_ui.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 require 'io/console'
+require_relative 'text_utils'
 
 module Rufio
   class TerminalUI
     # Layout constants
-    HEADER_HEIGHT = 2              # Header占有行数
-    FOOTER_HEIGHT = 1              # Footer占有行数
-    HEADER_FOOTER_MARGIN = 4       # Header + Footer分のマージン
+    HEADER_HEIGHT = 1              # Header占有行数
+    FOOTER_HEIGHT = 1              # Footer占有行数（ブックマーク一覧 + ステータス情報）
+    HEADER_FOOTER_MARGIN = 3       # Header + Footer分のマージン
 
     # Panel layout ratios
     LEFT_PANEL_RATIO = 0.5         # 左パネルの幅比率
@@ -17,8 +18,6 @@ module Rufio
     DEFAULT_SCREEN_WIDTH = 80      # デフォルト画面幅
     DEFAULT_SCREEN_HEIGHT = 24     # デフォルト画面高さ
     HEADER_PADDING = 2             # ヘッダーのパディング
-    BASE_INFO_RESERVED_WIDTH = 20  # ベースディレクトリ表示の予約幅
-    BASE_INFO_MIN_WIDTH = 10       # ベースディレクトリ表示の最小幅
     FILTER_TEXT_RESERVED = 15      # フィルタテキスト表示の予約幅
 
     # File display constants
@@ -31,7 +30,7 @@ module Rufio
     GIGABYTE = MEGABYTE * 1024
 
     # Line offsets
-    CONTENT_START_LINE = 3         # コンテンツ開始行（ヘッダー2行スキップ）
+    CONTENT_START_LINE = 2         # コンテンツ開始行（ヘッダー1行スキップ）
 
     def initialize
       console = IO.console
@@ -116,6 +115,9 @@ module Rufio
     end
 
     def draw_screen
+      # 処理時間測定開始
+      start_time = Time.now
+
       # move cursor to top of screen (don't clear)
       print "\e[H"
 
@@ -125,9 +127,8 @@ module Rufio
         return
       end
 
-      # header (2 lines)
+      # header (1 line)
       draw_header
-      draw_base_directory_info
 
       # main content (left: directory list, right: preview)
       entries = get_display_entries
@@ -144,8 +145,9 @@ module Rufio
       draw_directory_list(entries, left_width, content_height)
       draw_file_preview(selected_entry, right_width, content_height, left_width)
 
-      # footer
-      draw_footer
+      # footer (統合されたステータス情報を含む)
+      render_time = Time.now - start_time
+      draw_footer(render_time)
 
       # コマンドモードがアクティブな場合はコマンド入力ウィンドウを表示
       if @command_mode_active
@@ -163,6 +165,11 @@ module Rufio
       current_path = @directory_listing.current_path
       header = "📁 rufio - #{current_path}"
 
+      # Add help mode indicator if in help mode
+      if @keybind_handler.help_mode?
+        header += " [Help Mode - Press ESC to exit]"
+      end
+
       # Add filter indicator if in filter mode
       if @keybind_handler.filter_active?
         filter_text = " [Filter: #{@keybind_handler.filter_query}]"
@@ -171,7 +178,12 @@ module Rufio
 
       # abbreviate if path is too long
       if header.length > @screen_width - HEADER_PADDING
-        if @keybind_handler.filter_active?
+        if @keybind_handler.help_mode?
+          # prioritize showing help mode indicator
+          help_text = " [Help Mode - Press ESC to exit]"
+          base_length = @screen_width - help_text.length - FILTER_TEXT_RESERVED
+          header = "📁 rufio - ...#{current_path[-base_length..-1]}#{help_text}"
+        elsif @keybind_handler.filter_active?
           # prioritize showing filter when active
           filter_text = " [Filter: #{@keybind_handler.filter_query}]"
           base_length = @screen_width - filter_text.length - FILTER_TEXT_RESERVED
@@ -184,42 +196,6 @@ module Rufio
       puts "\e[7m#{header.ljust(@screen_width)}\e[0m" # reverse display
     end
 
-    def draw_base_directory_info
-      # 強制的に表示 - デバッグ用に安全チェックを緩和
-      if @keybind_handler && @keybind_handler.instance_variable_get(:@base_directory)
-        base_dir = @keybind_handler.instance_variable_get(:@base_directory)
-        selected_count = @keybind_handler.selected_items.length
-        base_info = "📋 Base Directory: #{base_dir}"
-        
-        # 選択されたアイテム数を表示
-        if selected_count > 0
-          base_info += " | Selected: #{selected_count} item(s)"
-        end
-      else
-        # keybind_handlerがない場合、またはbase_directoryが設定されていない場合
-        base_info = "📋 Base Directory: #{Dir.pwd}"
-      end
-      
-      # 長すぎる場合は省略
-      if base_info.length > @screen_width - HEADER_PADDING
-        if base_info.include?(" | Selected:")
-          selected_part = base_info.split(" | Selected:").last
-          available_length = @screen_width - BASE_INFO_RESERVED_WIDTH - " | Selected:#{selected_part}".length
-        else
-          available_length = @screen_width - BASE_INFO_RESERVED_WIDTH
-        end
-        
-        if available_length > BASE_INFO_MIN_WIDTH
-          # パスの最後の部分を表示
-          dir_part = base_info.split(": ").last.split(" | ").first
-          short_base_dir = "...#{dir_part[-available_length..-1]}"
-          base_info = base_info.gsub(dir_part, short_base_dir)
-        end
-      end
-      
-      # 2行目に確実に表示
-      print "\e[2;1H\e[44m\e[37m#{base_info.ljust(@screen_width)}\e[0m"
-    end
 
 
     def draw_directory_list(entries, width, height)
@@ -348,12 +324,19 @@ module Rufio
         if selected_entry && i == 0
           # プレビューヘッダー
           header = " #{selected_entry[:name]} "
+          # プレビューフォーカス中は表示を追加
+          if @keybind_handler&.preview_focused?
+            header += "[PREVIEW MODE]"
+          end
           content_to_print = header
         elsif selected_entry && selected_entry[:type] == 'file' && i >= 2
           # ファイルプレビュー（折り返し対応）
           preview_content = get_preview_content(selected_entry)
-          wrapped_lines = wrap_preview_lines(preview_content, safe_width - 1) # スペース分を除く
-          display_line_index = i - 2
+          wrapped_lines = TextUtils.wrap_preview_lines(preview_content, safe_width - 1) # スペース分を除く
+
+          # スクロールオフセットを適用
+          scroll_offset = @keybind_handler&.preview_scroll_offset || 0
+          display_line_index = i - 2 + scroll_offset
 
           if display_line_index < wrapped_lines.length
             line = wrapped_lines[display_line_index] || ''
@@ -370,16 +353,16 @@ module Rufio
         if safe_width <= 0
           # 表示スペースがない場合は何も出力しない
           next
-        elsif display_width(content_to_print) > safe_width
+        elsif TextUtils.display_width(content_to_print) > safe_width
           # 表示幅ベースで切り詰める
-          content_to_print = truncate_to_width(content_to_print, safe_width)
+          content_to_print = TextUtils.truncate_to_width(content_to_print, safe_width)
         end
 
         # 出力（パディングなし、はみ出し防止のため）
         print content_to_print
 
         # 残りのスペースを埋める（ただし安全な範囲内のみ）
-        remaining_space = safe_width - display_width(content_to_print)
+        remaining_space = safe_width - TextUtils.display_width(content_to_print)
         print ' ' * remaining_space if remaining_space > 0
       end
     end
@@ -402,98 +385,6 @@ module Rufio
       ["(#{ConfigLoader.message('file.preview_error')})"]
     end
 
-    def wrap_preview_lines(lines, max_width)
-      return [] if lines.empty? || max_width <= 0
-
-      wrapped_lines = []
-
-      lines.each do |line|
-        if display_width(line) <= max_width
-          # 短い行はそのまま追加
-          wrapped_lines << line
-        else
-          # 長い行は折り返し
-          remaining_line = line
-          while display_width(remaining_line) > max_width
-            # 単語境界で折り返すことを試みる
-            break_point = find_break_point(remaining_line, max_width)
-            wrapped_lines << remaining_line[0...break_point]
-            remaining_line = remaining_line[break_point..-1]
-          end
-          # 残りの部分を追加
-          wrapped_lines << remaining_line if remaining_line.length > 0
-        end
-      end
-
-      wrapped_lines
-    end
-
-    def display_width(string)
-      # 文字列の表示幅を計算する
-      # 日本語文字（全角）は幅2、ASCII文字（半角）は幅1として計算
-      width = 0
-      string.each_char do |char|
-        # 全角文字の判定
-        width += if char.ord > 127 || char.match?(/[あ-んア-ン一-龯]/)
-                   2
-                 else
-                   1
-                 end
-      end
-      width
-    end
-
-    def truncate_to_width(string, max_width)
-      # 表示幅を指定して文字列を切り詰める
-      return string if display_width(string) <= max_width
-
-      current_width = 0
-      result = ''
-
-      string.each_char do |char|
-        char_width = char.ord > 127 || char.match?(/[あ-んア-ン一-龯]/) ? 2 : 1
-
-        if current_width + char_width > max_width
-          # "..."を追加できるかチェック
-          result += '...' if max_width >= 3 && current_width <= max_width - 3
-          break
-        end
-
-        result += char
-        current_width += char_width
-      end
-
-      result
-    end
-
-    def find_break_point(line, max_width)
-      # 最大幅以内で適切な折り返し位置を見つける
-      return line.length if display_width(line) <= max_width
-
-      # 文字ごとに幅を計算しながら適切な位置を探す
-      current_width = 0
-      best_break_point = 0
-      space_break_point = nil
-      punct_break_point = nil
-
-      line.each_char.with_index do |char, index|
-        char_width = char.ord > 127 || char.match?(/[あ-んア-ン一-龯]/) ? 2 : 1
-
-        break if current_width + char_width > max_width
-
-        current_width += char_width
-        best_break_point = index + 1
-
-        # スペースで区切れる位置を記録
-        space_break_point = index + 1 if char == ' ' && current_width > max_width * 0.5
-
-        # 日本語の句読点で区切れる位置を記録
-        punct_break_point = index + 1 if char.match?(/[、。，．！？]/) && current_width > max_width * 0.5
-      end
-
-      # 最適な折り返し位置を選択
-      space_break_point || punct_break_point || best_break_point
-    end
 
     def get_display_entries
       if @keybind_handler.filter_active?
@@ -506,9 +397,9 @@ module Rufio
       end
     end
 
-    def draw_footer
-      # 最下行から1行上に表示してスクロールを避ける
-      footer_line = @screen_height - FOOTER_HEIGHT
+    def draw_footer(render_time = nil)
+      # フッタは最下行に表示
+      footer_line = @screen_height - FOOTER_HEIGHT + 1
       print "\e[#{footer_line};1H"
 
       if @keybind_handler.filter_active?
@@ -517,14 +408,50 @@ module Rufio
         else
           help_text = "Filtered view active - Space to edit filter, ESC to clear filter"
         end
+        # フィルタモードでは通常のフッタを表示
+        footer_content = help_text.ljust(@screen_width)[0...@screen_width]
+        print "\e[7m#{footer_content}\e[0m"
       else
-        help_text = ConfigLoader.message('help.full')
-        help_text = ConfigLoader.message('help.short') if help_text.length > @screen_width
-      end
+        # 通常モードではブックマーク一覧、ステータス情報、?:helpを1行に表示
+        require_relative 'bookmark'
+        bookmark = Bookmark.new
+        bookmarks = bookmark.list
+
+        # 起動ディレクトリを取得
+        start_dir = @directory_listing&.start_directory
+        start_dir_name = if start_dir
+                           File.basename(start_dir)
+                         else
+                           "start"
+                         end
+
+        # ブックマーク一覧を作成（0.起動dir を先頭に追加）
+        bookmark_parts = ["0.#{start_dir_name}"]
+        unless bookmarks.empty?
+          bookmark_parts.concat(bookmarks.take(9).map.with_index(1) { |bm, idx| "#{idx}.#{bm[:name]}" })
+        end
+        bookmark_text = bookmark_parts.join(" ")
 
-      # 文字列を確実に画面幅に合わせる
-      footer_content = help_text.ljust(@screen_width)[0...@screen_width]
-      print "\e[7m#{footer_content}\e[0m"
+        # ステータス情報を作成
+        time_info = render_time ? "#{(render_time * 1000).round(1)}ms" : "-ms"
+
+        # 右側の情報: 処理時間 | ?:help
+        right_info = "#{time_info} | ?:help"
+
+        # ブックマーク一覧を利用可能な幅に収める
+        available_width = @screen_width - right_info.length - 3
+        if bookmark_text.length > available_width && available_width > 3
+          bookmark_text = bookmark_text[0...available_width - 3] + "..."
+        elsif available_width <= 3
+          bookmark_text = ""
+        end
+
+        # フッタ全体を構築
+        padding = @screen_width - bookmark_text.length - right_info.length
+        footer_content = "#{bookmark_text}#{' ' * padding}#{right_info}"
+        footer_content = footer_content.ljust(@screen_width)[0...@screen_width]
+        print "\e[7m#{footer_content}\e[0m"
+      end
     end
 
     def handle_input
@@ -786,11 +713,12 @@ module Rufio
         is_project_selected = (bookmark[:name] == selected_name)
         selection_mark = is_project_selected ? "✓ " : "  "
 
-        # ブックマーク名を表示
+        # ブックマーク名を表示（番号付き）
+        number = index + 1  # 1-based index
         name = bookmark[:name]
-        max_name_length = width - 4  # selection_mark分を除く
+        max_name_length = width - 8  # selection_mark(2) + number(1-2) + ". "(2) + padding
         display_name = name.length > max_name_length ? name[0...max_name_length - 3] + '...' : name
-        line_content = "#{selection_mark}#{display_name}".ljust(width)
+        line_content = "#{selection_mark}#{number}. #{display_name}".ljust(width)
 
         if index == current_index
           # カーソル位置は選択色でハイライト
@@ -994,6 +922,69 @@ module Rufio
       draw_screen
     end
 
+    # ヘルプダイアログを表示
+    def show_help_dialog
+      content_lines = [
+        '',
+        "rufio v#{VERSION}",
+        '',
+        'Key Bindings:',
+        '',
+        'j/k      - Move up/down',
+        'h/l      - Navigate back/enter',
+        'g/G      - Go to top/bottom',
+        'o        - Open file',
+        'f        - Filter files',
+        's        - Search with fzf',
+        'F        - Content search (rga)',
+        'a/A      - Create file/directory',
+        'm/c/x    - Move/Copy/Delete',
+        'b        - Add bookmark',
+        'z        - Zoxide navigation',
+        '0        - Go to start directory',
+        '1-9      - Go to bookmark',
+        'p        - Project mode',
+        ':        - Command mode',
+        'q        - Quit',
+        ''
+      ]
+
+      # お知らせ情報を追加
+      require_relative 'info_notice'
+      info_notice = InfoNotice.new
+      all_notices = Dir.glob(File.join(info_notice.info_dir, '*.txt'))
+
+      if !all_notices.empty?
+        content_lines << 'Recent Updates:'
+        content_lines << ''
+        all_notices.take(3).each do |file|
+          title = info_notice.extract_title(file)
+          content_lines << "  • #{title}"
+        end
+        content_lines << ''
+      end
+
+      content_lines << 'Press any key to continue...'
+
+      width = 60
+      height = [content_lines.length + 4, @screen_height - 4].min
+      x, y = @dialog_renderer.calculate_center(width, height)
+
+      @dialog_renderer.draw_floating_window(x, y, width, height, 'rufio - Help', content_lines, {
+        border_color: "\e[36m",    # Cyan
+        title_color: "\e[1;36m",   # Bold cyan
+        content_color: "\e[37m"    # White
+      })
+
+      require 'io/console'
+      IO.console.getch
+      @dialog_renderer.clear_area(x, y, width, height)
+
+      # 画面を再描画
+      refresh_display
+      draw_screen
+    end
+
     # プロジェクトモードでコマンドを実行
     def activate_project_command_mode(project_mode, project_command, project_log)
       return unless project_mode.selected_path

data/lib/rufio/text_utils.rb

@@ -104,5 +104,54 @@ module Rufio
 
       space_break_point || punct_break_point || best_break_point
     end
+
+    # Wrap preview lines to fit within max_width
+    # @param lines [Array<String>] Lines to wrap
+    # @param max_width [Integer] Maximum width for each line
+    # @return [Array<String>] Wrapped lines
+    def wrap_preview_lines(lines, max_width)
+      return lines if max_width <= 0
+
+      wrapped = []
+      lines.each do |line|
+        # Remove trailing whitespace
+        line = line.rstrip
+
+        # If line is empty, keep it
+        if line.empty?
+          wrapped << ''
+          next
+        end
+
+        # If line fits within max_width, keep it as is
+        if display_width(line) <= max_width
+          wrapped << line
+          next
+        end
+
+        # Split long lines
+        current_line = []
+        current_width = 0
+
+        line.each_char do |char|
+          char_width = display_width(char)
+
+          if current_width + char_width > max_width
+            # Start a new line
+            wrapped << current_line.join
+            current_line = [char]
+            current_width = char_width
+          else
+            current_line << char
+            current_width += char_width
+          end
+        end
+
+        # Add remaining characters
+        wrapped << current_line.join unless current_line.empty?
+      end
+
+      wrapped
+    end
   end
 end

data/lib/rufio/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufio
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.30.0
 platform: ruby
 authors:
 - masisz
@@ -119,6 +119,8 @@ files:
 - CHANGELOG.md
 - CHANGELOG_v0.10.0.md
 - CHANGELOG_v0.20.0.md
+- CHANGELOG_v0.21.0.md
+- CHANGELOG_v0.30.0.md
 - CHANGELOG_v0.4.0.md
 - CHANGELOG_v0.5.0.md
 - CHANGELOG_v0.6.0.md
@@ -132,7 +134,9 @@ files:
 - config_example.rb
 - docs/PLUGIN_GUIDE.md
 - docs/plugin_example.rb
-- info/welcome.txt
+- info/help.md
+- info/keybindings.md
+- info/welcome.md
 - lib/rufio.rb
 - lib/rufio/application.rb
 - lib/rufio/bookmark.rb

data/info/welcome.txt

@@ -1,21 +0,0 @@
-# Welcome to rufio!
-
-Thank you for using rufio - a terminal-based file manager.
-
-Key Features:
-  - Vim-like keybindings (j/k/h/l for navigation)
-  - Real-time filtering (f key)
-  - Advanced search with fzf and rga
-  - Bookmark support (b key)
-  - Plugin system for extensibility
-
-Quick Start:
-  j/k       - Move up/down
-  h/l       - Parent dir / Enter dir
-  f         - Filter files
-  b         - Bookmarks
-  :         - Command mode
-  q         - Quit
-
-For more information, visit:
-  https://github.com/masisz/rufio