rufio 0.32.0 → 0.33.0

data/lib/rufio/native_scanner_magnus.rb

@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+module Rufio
+  # Magnus拡張のラッパー
+  # FFIを使わずに直接Rubyオブジェクトとして扱える
+  module NativeScannerMagnusLoader
+    LIB_PATH = File.expand_path('native/rufio_native.bundle', __dir__)
+
+    @loaded = false
+    @available = false
+
+    class << self
+      def load!
+        return @available if @loaded
+
+        @loaded = true
+
+        if File.exist?(LIB_PATH)
+          begin
+            # .bundleファイルを直接ロード
+            # 拡張子を外してrequireする
+            lib_path_without_ext = LIB_PATH.sub(/\.bundle$/, '')
+            require lib_path_without_ext
+            @available = defined?(Rufio::NativeScannerMagnus)
+          rescue LoadError => e
+            warn "Failed to load magnus extension: #{e.message}" if ENV['RUFIO_DEBUG']
+            @available = false
+          end
+        else
+          @available = false
+        end
+
+        @available
+      end
+
+      def available?
+        load! unless @loaded
+        @available
+      end
+    end
+  end
+
+  # Magnus拡張が利用可能な場合のみロード
+  if NativeScannerMagnusLoader.load!
+    # NativeScannerにmagnusモードを追加
+    class NativeScanner
+      class << self
+        # magnusモードを追加
+        alias_method :original_mode=, :mode=
+
+        def mode=(value)
+          case value
+          when 'magnus'
+            if NativeScannerMagnusLoader.available?
+              @mode = 'magnus'
+              @current_library = nil  # magnus は FFI を使わない
+            else
+              @mode = 'ruby'
+              @current_library = nil
+            end
+          else
+            send(:original_mode=, value)
+          end
+        end
+
+        # magnusスキャン
+        def scan_directory_with_magnus(path)
+          raise StandardError, "Directory does not exist: #{path}" unless Dir.exist?(path)
+
+          entries = NativeScannerMagnus.scan_directory(path)
+
+          # 結果の形式を統一（すでに正しい形式だが念のため）
+          entries.map do |entry|
+            {
+              name: entry[:name],
+              type: entry[:is_dir] ? 'directory' : 'file',
+              size: entry[:size],
+              mtime: entry[:mtime],
+              mode: 0,
+              executable: entry[:executable],
+              hidden: entry[:hidden]
+            }
+          end
+        rescue StandardError => e
+          raise StandardError, "Magnus scan failed: #{e.message}"
+        end
+
+        # magnusで高速スキャン
+        def scan_directory_fast_with_magnus(path, max_entries)
+          raise StandardError, "Directory does not exist: #{path}" unless Dir.exist?(path)
+
+          entries = NativeScannerMagnus.scan_directory_fast(path, max_entries)
+
+          entries.map do |entry|
+            {
+              name: entry[:name],
+              type: entry[:is_dir] ? 'directory' : 'file',
+              size: entry[:size],
+              mtime: entry[:mtime],
+              mode: 0,
+              executable: entry[:executable],
+              hidden: entry[:hidden]
+            }
+          end
+        rescue StandardError => e
+          raise StandardError, "Magnus fast scan failed: #{e.message}"
+        end
+
+        # scan_directoryメソッドを拡張
+        alias_method :original_scan_directory, :scan_directory
+
+        def scan_directory(path)
+          mode if @mode.nil?
+
+          case @mode
+          when 'magnus'
+            scan_directory_with_magnus(path)
+          else
+            original_scan_directory(path)
+          end
+        end
+
+        # scan_directory_fastメソッドを拡張
+        alias_method :original_scan_directory_fast, :scan_directory_fast
+
+        def scan_directory_fast(path, max_entries = 1000)
+          mode if @mode.nil?
+
+          case @mode
+          when 'magnus'
+            scan_directory_fast_with_magnus(path, max_entries)
+          else
+            original_scan_directory_fast(path, max_entries)
+          end
+        end
+
+        # versionメソッドを拡張
+        alias_method :original_version, :version
+
+        def version
+          mode if @mode.nil?
+
+          case @mode
+          when 'magnus'
+            NativeScannerMagnus.version
+          else
+            original_version
+          end
+        end
+
+        # available_librariesを更新
+        alias_method :original_available_libraries, :available_libraries
+
+        def available_libraries
+          original = original_available_libraries
+          original.merge(magnus: NativeScannerMagnusLoader.available?)
+        end
+
+        # autoモードの優先順位を更新（magnus > rust > go > ruby）
+        alias_method :original_auto_mode, :mode=
+
+        def mode=(value)
+          case value
+          when 'auto'
+            # 優先順位: Magnus > Rust > Go > Ruby
+            if NativeScannerMagnusLoader.available?
+              @mode = 'magnus'
+              @current_library = nil
+            elsif RustLib.available?
+              @mode = 'rust'
+              @current_library = RustLib
+            elsif GoLib.available?
+              @mode = 'go'
+              @current_library = GoLib
+            else
+              @mode = 'ruby'
+              @current_library = nil
+            end
+          when 'magnus'
+            if NativeScannerMagnusLoader.available?
+              @mode = 'magnus'
+              @current_library = nil
+            else
+              @mode = 'ruby'
+              @current_library = nil
+            end
+          else
+            send(:original_auto_mode, value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rufio/native_scanner_zig.rb

@@ -0,0 +1,221 @@
+# frozen_string_literal: true
+
+module Rufio
+  # Zig拡張のラッパー
+  # FFIを使わずに直接Rubyオブジェクトとして扱える
+  module NativeScannerZigLoader
+    LIB_PATH = File.expand_path('native/rufio_zig.bundle', __dir__)
+
+    @loaded = false
+    @available = false
+
+    class << self
+      def load!
+        return @available if @loaded
+
+        @loaded = true
+
+        if File.exist?(LIB_PATH)
+          begin
+            # .bundleファイルを直接ロード
+            # 拡張子を外してrequireする
+            lib_path_without_ext = LIB_PATH.sub(/\.bundle$/, '')
+            require lib_path_without_ext
+            @available = defined?(Rufio::NativeScannerZig)
+          rescue LoadError => e
+            warn "Failed to load zig extension: #{e.message}" if ENV['RUFIO_DEBUG']
+            @available = false
+          end
+        else
+          @available = false
+        end
+
+        @available
+      end
+
+      def available?
+        load! unless @loaded
+        @available
+      end
+    end
+  end
+
+  # Zig拡張が利用可能な場合のみロード
+  if NativeScannerZigLoader.load!
+    # NativeScannerにzigモードを追加
+    class NativeScanner
+      class << self
+        # zigモードを追加
+        alias_method :original_mode=, :mode= unless method_defined?(:original_mode=)
+
+        def mode=(value)
+          case value
+          when 'zig'
+            if NativeScannerZigLoader.available?
+              @mode = 'zig'
+              @current_library = nil  # zig は FFI を使わない
+            else
+              @mode = 'ruby'
+              @current_library = nil
+            end
+          else
+            original_mode=(value)
+          end
+        end
+
+        # zigスキャン
+        def scan_directory_with_zig(path)
+          raise StandardError, "Directory does not exist: #{path}" unless Dir.exist?(path)
+
+          entries = NativeScannerZig.scan_directory(path)
+
+          # 結果の形式を統一
+          entries.map do |entry|
+            {
+              name: entry[:name],
+              type: entry[:is_dir] ? 'directory' : 'file',
+              size: entry[:size],
+              mtime: entry[:mtime],
+              mode: 0,
+              executable: entry[:executable],
+              hidden: entry[:hidden]
+            }
+          end
+        rescue StandardError => e
+          raise StandardError, "Zig scan failed: #{e.message}"
+        end
+
+        # zigで高速スキャン
+        def scan_directory_fast_with_zig(path, max_entries)
+          raise StandardError, "Directory does not exist: #{path}" unless Dir.exist?(path)
+
+          entries = NativeScannerZig.scan_directory_fast(path, max_entries)
+
+          entries.map do |entry|
+            {
+              name: entry[:name],
+              type: entry[:is_dir] ? 'directory' : 'file',
+              size: entry[:size],
+              mtime: entry[:mtime],
+              mode: 0,
+              executable: entry[:executable],
+              hidden: entry[:hidden]
+            }
+          end
+        rescue StandardError => e
+          raise StandardError, "Zig fast scan failed: #{e.message}"
+        end
+
+        # scan_directoryメソッドを拡張
+        alias_method :original_scan_directory, :scan_directory unless method_defined?(:original_scan_directory)
+
+        def scan_directory(path)
+          mode if @mode.nil?
+
+          case @mode
+          when 'zig'
+            scan_directory_with_zig(path)
+          when 'magnus'
+            # magnusモードの場合は、native_scanner_magnus.rbで定義されたメソッドを呼ぶ
+            if defined?(NativeScannerMagnusLoader) && respond_to?(:scan_directory_with_magnus, true)
+              scan_directory_with_magnus(path)
+            else
+              original_scan_directory(path)
+            end
+          else
+            original_scan_directory(path)
+          end
+        end
+
+        # scan_directory_fastメソッドを拡張
+        alias_method :original_scan_directory_fast, :scan_directory_fast unless method_defined?(:original_scan_directory_fast)
+
+        def scan_directory_fast(path, max_entries = 1000)
+          mode if @mode.nil?
+
+          case @mode
+          when 'zig'
+            scan_directory_fast_with_zig(path, max_entries)
+          when 'magnus'
+            # magnusモードの場合は、native_scanner_magnus.rbで定義されたメソッドを呼ぶ
+            if defined?(NativeScannerMagnusLoader) && respond_to?(:scan_directory_fast_with_magnus, true)
+              scan_directory_fast_with_magnus(path, max_entries)
+            else
+              original_scan_directory_fast(path, max_entries)
+            end
+          else
+            original_scan_directory_fast(path, max_entries)
+          end
+        end
+
+        # versionメソッドを拡張
+        alias_method :original_version, :version unless method_defined?(:original_version)
+
+        def version
+          mode if @mode.nil?
+
+          case @mode
+          when 'zig'
+            NativeScannerZig.version
+          else
+            original_version
+          end
+        end
+
+        # available_librariesを更新
+        alias_method :original_available_libraries, :available_libraries unless method_defined?(:original_available_libraries)
+
+        def available_libraries
+          original = original_available_libraries
+          result = original.merge(zig: NativeScannerZigLoader.available?)
+          # magnusが既に追加されていなければ追加
+          if defined?(NativeScannerMagnusLoader) && !result.key?(:magnus)
+            result = result.merge(magnus: NativeScannerMagnusLoader.available?)
+          end
+          result
+        end
+
+        # autoモードの優先順位を更新（magnus > zig > rust > go > ruby）
+        def mode=(value)
+          case value
+          when 'auto'
+            # 優先順位: Magnus > Zig > Rust > Go > Ruby
+            if defined?(NativeScannerMagnusLoader) && NativeScannerMagnusLoader.available?
+              @mode = 'magnus'
+              @current_library = nil
+            elsif NativeScannerZigLoader.available?
+              @mode = 'zig'
+              @current_library = nil
+            elsif defined?(RustLib) && RustLib.available?
+              @mode = 'rust'
+              @current_library = RustLib
+            elsif defined?(GoLib) && GoLib.available?
+              @mode = 'go'
+              @current_library = GoLib
+            else
+              @mode = 'ruby'
+              @current_library = nil
+            end
+          when 'zig'
+            if NativeScannerZigLoader.available?
+              @mode = 'zig'
+              @current_library = nil
+            else
+              @mode = 'ruby'
+              @current_library = nil
+            end
+          when 'magnus'
+            if defined?(NativeScannerMagnusLoader) && NativeScannerMagnusLoader.available?
+              @mode = 'magnus'
+              @current_library = nil
+            else
+              send(:original_mode=, value)
+            end
+          else
+            send(:original_mode=, value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rufio/terminal_ui.rb

@@ -62,13 +62,17 @@ module Rufio
       @in_log_mode = false
     end
 
-    def start(directory_listing, keybind_handler, file_preview)
+    def start(directory_listing, keybind_handler, file_preview, background_executor = nil)
       @directory_listing = directory_listing
       @keybind_handler = keybind_handler
       @file_preview = file_preview
+      @background_executor = background_executor
       @keybind_handler.set_directory_listing(@directory_listing)
       @keybind_handler.set_terminal_ui(self)
 
+      # コマンドモードにバックグラウンドエグゼキュータを設定
+      @command_mode.background_executor = @background_executor if @background_executor
+
       @running = true
       setup_terminal
 
@@ -114,8 +118,29 @@ module Rufio
     end
 
     def main_loop
+      last_notification_check = Time.now
+      notification_message = nil
+      notification_time = nil
+
       while @running
-        draw_screen
+        # バックグラウンドコマンドの完了チェック（0.5秒ごと）
+        if @background_executor && (Time.now - last_notification_check) > 0.5
+          if !@background_executor.running? && @background_executor.get_completion_message
+            notification_message = @background_executor.get_completion_message
+            notification_time = Time.now
+            @background_executor.instance_variable_set(:@completion_message, nil)  # メッセージをクリア
+          end
+          last_notification_check = Time.now
+        end
+
+        # 通知メッセージを表示（3秒間）
+        if notification_message && (Time.now - notification_time) < 3.0
+          draw_screen_with_notification(notification_message)
+        else
+          notification_message = nil if notification_message
+          draw_screen
+        end
+
         handle_input
       end
     end
@@ -165,6 +190,23 @@ module Rufio
       end
     end
 
+    def draw_screen_with_notification(notification_message)
+      # 通常の画面を描画
+      draw_screen
+
+      # 通知メッセージを画面下部に表示
+      notification_line = @screen_height - 1
+      print "\e[#{notification_line};1H"  # カーソルを画面下部に移動
+
+      # 通知メッセージを反転表示で目立たせる
+      message_display = " #{notification_message} "
+      if message_display.length > @screen_width
+        message_display = message_display[0...(@screen_width - 3)] + "..."
+      end
+
+      print "\e[7m#{message_display.ljust(@screen_width)}\e[0m"
+    end
+
     def draw_header
       current_path = @directory_listing.current_path
       header = "📁 rufio - #{current_path}"
@@ -310,15 +352,22 @@ module Rufio
     end
 
     def draw_file_preview(selected_entry, width, height, left_offset)
+      # 事前計算（ループの外で一度だけ）
+      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
+
+      # プレビューコンテンツとWrapped linesを一度だけ計算
+      preview_content = nil
+      wrapped_lines = nil
+
+      if selected_entry && selected_entry[:type] == 'file'
+        preview_content = get_preview_content(selected_entry)
+        wrapped_lines = TextUtils.wrap_preview_lines(preview_content, safe_width - 1) if safe_width > 0
+      end
+
       (0...height).each do |i|
         line_num = i + CONTENT_START_LINE
-        # カーソル位置を左パネルの右端に設定
-        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
 
         print "\e[#{line_num};#{cursor_position}H" # カーソル位置設定
         print '│' # 区切り線
@@ -333,11 +382,8 @@ module Rufio
             header += "[PREVIEW MODE]"
           end
           content_to_print = header
-        elsif selected_entry && selected_entry[:type] == 'file' && i >= 2
+        elsif wrapped_lines && i >= 2
           # ファイルプレビュー（折り返し対応）
-          preview_content = get_preview_content(selected_entry)
-          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
@@ -569,8 +615,12 @@ module Rufio
 
       result = @command_mode.execute(command_string)
 
-      # コマンド実行結果をフローティングウィンドウで表示
-      @command_mode_ui.show_result(result) if result
+      # バックグラウンドコマンドの場合は結果表示をスキップ
+      # (完了通知は別途メインループで表示される)
+      if result && !result.to_s.include?("🔄 バックグラウンドで実行中")
+        # コマンド実行結果をフローティングウィンドウで表示
+        @command_mode_ui.show_result(result)
+      end
 
       # 画面を再描画
       draw_screen
@@ -1028,7 +1078,7 @@ module Rufio
         'z        - Zoxide navigation',
         '0        - Go to start directory',
         '1-9      - Go to bookmark',
-        'p        - Project mode',
+        'P        - Project mode',
         ':        - Command mode',
         'q        - Quit',
         ''

data/lib/rufio/version.rb

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

data/lib/rufio.rb

@@ -30,6 +30,11 @@ require_relative "rufio/command_mode_ui"
 require_relative "rufio/command_history"
 require_relative "rufio/command_completion"
 require_relative "rufio/shell_command_completion"
+require_relative "rufio/command_logger"
+require_relative "rufio/background_command_executor"
+require_relative "rufio/native_scanner"
+require_relative "rufio/native_scanner_magnus"
+require_relative "rufio/native_scanner_zig"
 
 # プロジェクトモード
 require_relative "rufio/project_mode"

data/lib_rust/rufio_native/.cargo/config.toml

@@ -0,0 +1,2 @@
+[env]
+RUBY = "/Users/miso/.rbenv/versions/3.4.2/bin/ruby"