rufio 1.1.0 → 1.3.0

data/lib/rufio/application.rb

@@ -7,8 +7,10 @@ module Rufio
     # Error display constants
     BACKTRACE_LINES = 5  # Number of backtrace lines to show
 
-    def initialize(start_directory = Dir.pwd)
+    # choosedir: T キーで終了した時に最後のディレクトリを書き出すファイル（rufio --shell-init の関数が使う）
+    def initialize(start_directory = Dir.pwd, choosedir: nil)
       @start_directory = File.expand_path(start_directory)
+      @choosedir = choosedir
       # Load configuration including language settings
       ConfigLoader.load_config
     end
@@ -28,12 +30,21 @@ module Rufio
 
       # アプリケーション開始
       terminal_ui.start(directory_listing, keybind_handler, file_preview, background_executor)
+      write_choosedir(terminal_ui.exit_directory)
     rescue Interrupt
       puts "\n\n#{ConfigLoader.message('app.interrupted')}"
     rescue StandardError => e
       puts "\n#{ConfigLoader.message('app.error_occurred')}: #{e.message}"
       puts e.backtrace.first(BACKTRACE_LINES).join("\n")
     end
+
+    private
+
+    def write_choosedir(directory)
+      return unless @choosedir && directory
+
+      File.write(@choosedir, directory)
+    end
   end
 end
 

data/lib/rufio/archive_controller.rb

@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+require_relative 'dialog_support'
+require_relative 'zip_extractor'
+require_relative 'zip_writer'
+
+module Rufio
+  # 選択中のアイテムを z キーで圧縮・展開するコントローラ
+  #
+  # - 選択がすべて .zip ファイルなら、それぞれを現在のディレクトリの <名前>/ に展開する
+  # - それ以外は選択アイテムを 1 つの ZIP にまとめて現在のディレクトリに作成する
+  # 処理は JobManager のジョブとしてバックグラウンドで実行し、Jobs モードからキャンセルできる。
+  class ArchiveController
+    include DialogSupport
+
+    DEFAULT_ARCHIVE_NAME = 'Archive.zip'
+    DIALOG_WIDTH = 50
+    DIALOG_BORDER_HEIGHT = 4
+    PROGRESS_STEP = 5 # 進捗表示を更新する間隔（%）
+
+    Plan = Struct.new(:action, :source_dir, :dest_dir, :items, :archives, :default_name, keyword_init: true)
+
+    def initialize(directory_listing, dialog_renderer, selection_manager, job_manager, notification_manager)
+      @directory_listing = directory_listing
+      @dialog_renderer = dialog_renderer
+      @selection_manager = selection_manager
+      @job_manager = job_manager
+      @notification_manager = notification_manager
+      @terminal_ui = nil
+      @mutex = Mutex.new
+      @finished_dirs = []
+      @progress_changed = false
+    end
+
+    def set_terminal_ui(terminal_ui)
+      @terminal_ui = terminal_ui
+    end
+
+    def set_directory_listing(directory_listing)
+      @directory_listing = directory_listing
+    end
+
+    # 選択アイテムから実行内容を決める（UI に依存しない）
+    def self.plan(source_dir, items, dest_dir)
+      items = items.reject { |item| item == '..' }
+      return nil if items.empty?
+
+      paths = items.map { |item| File.join(source_dir, item) }
+      if paths.all? { |path| File.file?(path) && File.extname(path).casecmp?('.zip') }
+        archives = paths.map { |path| [path, unique_path(dest_dir, File.basename(path, '.*'), '')] }
+        Plan.new(action: :extract, source_dir: source_dir, dest_dir: dest_dir, items: items, archives: archives)
+      else
+        default_name = items.length == 1 ? "#{File.basename(items.first)}.zip" : DEFAULT_ARCHIVE_NAME
+        Plan.new(action: :compress, source_dir: source_dir, dest_dir: dest_dir, items: items, default_name: default_name)
+      end
+    end
+
+    # dir/base<ext> が既にあれば "base 2<ext>", "base 3<ext>" ... を返す
+    def self.unique_path(dir, base, ext)
+      candidate = File.join(dir, "#{base}#{ext}")
+      number = 2
+      while File.exist?(candidate) || File.symlink?(candidate)
+        candidate = File.join(dir, "#{base} #{number}#{ext}")
+        number += 1
+      end
+      candidate
+    end
+
+    # 入力されたアーカイブ名を検証して .zip を補う（不正なら nil）
+    def self.archive_name(input, default_name)
+      name = input.to_s.strip
+      name = default_name if name.empty?
+      return nil if name.match?(%r{[/\\\0]}) || ['.', '..'].include?(name)
+
+      File.extname(name).casecmp?('.zip') ? name : "#{name}.zip"
+    end
+
+    # z キー（選択あり）の入口
+    def archive_selected
+      return false if @selection_manager.empty?
+
+      current_path = @directory_listing&.current_path || Dir.pwd
+      source_dir = @selection_manager.source_directory || current_path
+      plan = self.class.plan(source_dir, @selection_manager.selected_items, current_path)
+      return false unless plan
+
+      started = plan.action == :extract ? confirm_and_extract(plan) : prompt_and_compress(plan)
+      @selection_manager.clear if started
+      @terminal_ui&.refresh_display
+      started
+    end
+
+    def start_extract(zip_path, dest_dir)
+      run_job("Extract #{File.basename(zip_path)}", [File.dirname(dest_dir), dest_dir]) do |job, progress|
+        created = !File.exist?(dest_dir)
+        begin
+          result = ZipExtractor.new(zip_path, dest_dir, progress: progress, cancelled: -> { job.cancelled? }).extract
+        rescue StandardError
+          # 新しく作った展開先だけを片付ける（既存ディレクトリには触れない）
+          FileUtils.rm_rf(dest_dir) if created
+          raise
+        end
+        job.append_log("Extracted #{result.extracted.length} item(s) to #{dest_dir}")
+        result.skipped.each { |skip| job.append_log("Skipped #{skip[:name]} (#{skip[:reason]})") }
+      end
+    end
+
+    def start_compress(zip_path, source_dir, items)
+      run_job("Compress #{File.basename(zip_path)}", [File.dirname(zip_path)]) do |job, progress|
+        result = ZipWriter.new(zip_path, source_dir, items, progress: progress, cancelled: -> { job.cancelled? }).write
+        job.append_log("Created #{zip_path} with #{result.added.length} item(s)")
+        result.skipped.each { |skip| job.append_log("Skipped #{skip[:name]} (#{skip[:reason]})") }
+      end
+    end
+
+    # メインループから呼ぶ。表示を更新すべき変化があれば true
+    def poll
+      finished, changed = @mutex.synchronize do
+        dirs = @finished_dirs
+        @finished_dirs = []
+        progress = @progress_changed
+        @progress_changed = false
+        [dirs, progress || !dirs.empty?]
+      end
+
+      current = @directory_listing&.current_path
+      @directory_listing.refresh if current && finished.any? { |dir| File.expand_path(dir) == File.expand_path(current) }
+      changed
+    end
+
+    private
+
+    def confirm_and_extract(plan)
+      lines = ['', "Extract #{plan.archives.length} archive(s)?", '']
+      plan.archives.first(5).each do |zip, dest|
+        lines << "  #{TextUtils.shorten_path_from_end(File.basename(zip), 20)} -> #{TextUtils.shorten_path_from_end(File.basename(dest), 20)}/"
+      end
+      lines << "  ... #{plan.archives.length - 5} more" if plan.archives.length > 5
+      lines += ['', "To: #{TextUtils.shorten_path_from_end(plan.dest_dir, 40)}", '', '  [Y]es - Extract', '  [N]o  - Cancel', '']
+
+      return false unless confirm_dialog('Extract Archives', lines, dialog_options(lines))
+
+      plan.archives.each { |zip, dest| start_extract(zip, dest) }
+      true
+    end
+
+    def prompt_and_compress(plan)
+      input = @dialog_renderer.show_input_dialog(
+        "Compress #{plan.items.length} item(s)",
+        "Archive name (Enter: #{plan.default_name}):",
+        { width: DIALOG_WIDTH, border_color: "\e[36m", title_color: "\e[1;36m", content_color: "\e[37m" }
+      )
+      return false if input.nil?
+
+      name = self.class.archive_name(input, plan.default_name)
+      zip_path = name && File.join(plan.dest_dir, name)
+      if zip_path.nil? || File.exist?(zip_path)
+        message = zip_path ? "Already exists: #{name}" : "Invalid archive name: #{input}"
+        @notification_manager&.add(message, :error, duration: 3, exit_code: nil)
+        return false
+      end
+
+      start_compress(zip_path, plan.source_dir, plan.items)
+      true
+    end
+
+    def dialog_options(lines)
+      {
+        width: DIALOG_WIDTH,
+        height: DIALOG_BORDER_HEIGHT + lines.length,
+        border_color: "\e[36m",
+        title_color: "\e[1;36m",
+        content_color: "\e[37m"
+      }
+    end
+
+    # refresh_dirs: 完了時に表示中なら再読み込みするディレクトリ
+    def run_job(name, refresh_dirs)
+      job = @job_manager.add_job(name: name, path: refresh_dirs.first, command: nil)
+      job.start
+      last_percent = -PROGRESS_STEP
+      progress = lambda do |done, total|
+        percent = total.zero? ? 100 : (done * 100 / total)
+        next if percent < last_percent + PROGRESS_STEP
+
+        last_percent = percent
+        job.name = "#{name} #{percent}%"
+        @mutex.synchronize { @progress_changed = true }
+      end
+
+      Thread.new do
+        begin
+          yield job, progress
+          job.name = name
+          job.complete(exit_code: 0) unless job.cancelled?
+        rescue ZipExtractor::CancelledError, ZipWriter::CancelledError
+          job.name = name
+          job.append_log('Cancelled')
+        rescue StandardError => e
+          job.name = name
+          job.append_log("Error: #{e.message}")
+          job.fail(exit_code: 1) unless job.cancelled?
+        ensure
+          @job_manager.notify_completion(job) unless job.cancelled?
+          @mutex.synchronize { @finished_dirs.concat(refresh_dirs) }
+        end
+      end
+      job
+    end
+  end
+end

data/lib/rufio/background_command_executor.rb

@@ -135,6 +135,15 @@ module Rufio
       @completion_message
     end
 
+    # 完了メッセージを一度だけ受け取る。実行中は消費しない。
+    def consume_completion_message
+      return nil if running?
+
+      message = @completion_message
+      @completion_message = nil
+      message
+    end
+
     # 現在実行中のコマンド名を取得
     # @return [String, nil] コマンド名（実行中でない場合はnil）
     def current_command

data/lib/rufio/background_status.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Rufio
+  # 完了通知とフッターランプで共有する実行状態・表示期限。
+  # 描画側は message を読むだけにし、状態の更新はメインループで行う。
+  class BackgroundStatus
+    POLL_INTERVAL = 0.1
+    DISPLAY_DURATION = 3.0
+
+    attr_reader :message
+
+    def initialize(now: Time.now)
+      @last_poll = now
+      @running = false
+      @message = nil
+      @expires_at = nil
+    end
+
+    # 描画に関わる状態が変化した場合だけ true を返す。
+    def update(executor, now: Time.now)
+      changed = expire(now)
+      running = executor ? executor.running? : false
+      if running != @running
+        @running = running
+        changed = true
+      end
+
+      if executor && now - @last_poll > POLL_INTERVAL
+        @last_poll = now
+        if (message = executor.consume_completion_message)
+          @message = message
+          @expires_at = now + DISPLAY_DURATION
+          changed = true
+        end
+      end
+      changed
+    end
+
+    private
+
+    def expire(now)
+      return false unless @expires_at && now >= @expires_at
+
+      @message = nil
+      @expires_at = nil
+      true
+    end
+  end
+end

data/lib/rufio/bookmark_controller.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'dialog_support'
+
 module Rufio
   # ブックマーク・zoxide・スクリプトパス専用コントローラ
   # KeybindHandler からブックマーク系・zoxide・スクリプトパス系メソッドを分離し、単一責任原則に準拠
   class BookmarkController
+    include DialogSupport
+
     def initialize(directory_listing, bookmark_manager, dialog_renderer, nav_controller,
                    script_path_manager, notification_manager, zoxide_integration)
       @directory_listing = directory_listing
@@ -78,8 +82,6 @@ module Rufio
     end
 
     def show_bookmark_menu
-      current_path = @directory_listing&.current_path || Dir.pwd
-
       menu_items = [
         '1. Add current dir to bookmarks',
         '2. Add to script paths',
@@ -154,56 +156,14 @@ module Rufio
     # 存在しないパスのブックマークはスキップする
     # @return [Integer, nil] 新しいブックマークインデックス、またはnil
     def goto_next_bookmark
-      bookmarks = @bookmark_manager.list
-      return nil unless bookmarks&.any?
-
-      current_path = @directory_listing.current_path
-      current_position = bookmarks.find_index { |bm| bm[:path] == current_path }
-      start_idx = if current_position
-        (current_position + 1) % bookmarks.length
-      elsif @last_bookmark_idx
-        (@last_bookmark_idx + 1) % bookmarks.length
-      else
-        0
-      end
-
-      bookmarks.length.times do |i|
-        idx = (start_idx + i) % bookmarks.length
-        next unless Dir.exist?(bookmarks[idx][:path])
-
-        @last_bookmark_idx = idx
-        navigate_to_directory(bookmarks[idx][:path])
-        return @last_bookmark_idx
-      end
-      nil
+      cycle_bookmark(1)
     end
 
     # 前のブックマークに移動（Shift+Tabキー）
     # 存在しないパスのブックマークはスキップする
     # @return [Integer, nil] 新しいブックマークインデックス、またはnil
     def goto_prev_bookmark
-      bookmarks = @bookmark_manager.list
-      return nil unless bookmarks&.any?
-
-      current_path = @directory_listing.current_path
-      current_position = bookmarks.find_index { |bm| bm[:path] == current_path }
-      start_idx = if current_position
-        (current_position - 1 + bookmarks.length) % bookmarks.length
-      elsif @last_bookmark_idx
-        (@last_bookmark_idx - 1 + bookmarks.length) % bookmarks.length
-      else
-        bookmarks.length - 1
-      end
-
-      bookmarks.length.times do |i|
-        idx = (start_idx - i + bookmarks.length) % bookmarks.length
-        next unless Dir.exist?(bookmarks[idx][:path])
-
-        @last_bookmark_idx = idx
-        navigate_to_directory(bookmarks[idx][:path])
-        return @last_bookmark_idx
-      end
-      nil
+      cycle_bookmark(-1)
     end
 
     # ============================
@@ -262,8 +222,6 @@ module Rufio
       end
 
       selected_index = 0
-      screen = @terminal_ui&.screen
-      renderer = @terminal_ui&.renderer
 
       loop do
         menu_items = paths.each_with_index.map do |path, i|
@@ -277,30 +235,13 @@ module Rufio
         width = 50
         height = content_lines.length + 4
 
-        if screen && renderer
-          screen.enable_overlay
-          x, y = @dialog_renderer.calculate_center(width, height)
-          @dialog_renderer.draw_floating_window_to_overlay(screen, x, y, width, height, title, content_lines, {
-            border_color: "\e[35m",
-            title_color: "\e[1;35m",
-            content_color: "\e[37m"
-          })
-          renderer.render(screen)
-
-          key = STDIN.getch
-          screen.disable_overlay
-          renderer.render(screen)
-        else
-          x, y = @dialog_renderer.calculate_center(width, height)
-          @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
-            border_color: "\e[35m",
-            title_color: "\e[1;35m",
-            content_color: "\e[37m"
-          })
-
-          key = STDIN.getch
-          @dialog_renderer.clear_area(x, y, width, height)
-        end
+        key = show_overlay_dialog(title, content_lines, {
+          width: width,
+          height: height,
+          border_color: "\e[35m",
+          title_color: "\e[1;35m",
+          content_color: "\e[37m"
+        })
 
         case key
         when 'j'
@@ -358,59 +299,38 @@ module Rufio
     # ============================
 
     def navigate_to_directory(path)
-      return false unless @directory_listing
-
-      result = @directory_listing.navigate_to_path(path)
-      if result
-        @nav_controller.select_index(0)
-        @nav_controller.clear_filter_mode
-        true
-      else
-        false
-      end
+      @nav_controller.navigate_to_directory(path)
     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)
-
-        @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"
-        })
-
-        key = block_given? ? yield : STDIN.getch
+    def cycle_bookmark(step)
+      bookmarks = @bookmark_manager.list
+      return nil unless bookmarks&.any?
 
-        @dialog_renderer.clear_area(x, y, width, height)
-        @terminal_ui&.refresh_display
+      len = bookmarks.length
+      current_path = @directory_listing.current_path
+      current_position = bookmarks.find_index { |bm| bm[:path] == current_path }
+      start_idx = if current_position
+                    (current_position + step + len) % len
+                  elsif @last_bookmark_idx
+                    (@last_bookmark_idx + step + len) % len
+                  else
+                    step > 0 ? 0 : len - 1
+                  end
+
+      len.times do |i|
+        idx = (start_idx + (i * step) + len) % len
+        next unless Dir.exist?(bookmarks[idx][:path])
 
-        key
+        @last_bookmark_idx = idx
+        navigate_to_directory(bookmarks[idx][:path])
+        return @last_bookmark_idx
       end
+      nil
     end
 
-    def show_notification(title, message, type)
+    def show_notification(title, _message, type)
       return unless @notification_manager
 
       @notification_manager.add(title, type, duration: 3, exit_code: nil)
@@ -424,16 +344,13 @@ module Rufio
 
     def wait_for_keypress
       print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
-      STDIN.getch
+      KeyInput.getch
     end
 
     def truncate_path(path, max_length)
       return path if path.length <= max_length
 
-      display_path = path.sub(Dir.home, '~')
-      return display_path if display_path.length <= max_length
-
-      "...#{display_path[-(max_length - 3)..]}"
+      TextUtils.shorten_path_from_end(path, max_length, tilde: true)
     end
   end
 end