rufio 1.1.0 → 1.4.0

data/info/keybindings.md

@@ -9,22 +9,24 @@ Complete reference of all keyboard shortcuts in **rufio**.
 | `j` / `Down` | Move down |
 | `k` / `Up` | Move up |
 | `h` / `Left` | Go to parent directory |
-| `l` / `Right` / `Enter` | Enter directory or open file |
+| `l` / `Right` / `Enter` | Enter directory |
 | `g` | Jump to top of list |
-| `G` | Jump to bottom of list |
+| `}` | Jump to bottom of list |
 
 ## File Operations
 
 | Key | Action |
 |-----|--------|
 | `o` | Open file with external editor |
-| `e` | Open in file explorer (system default) |
+| `e` | Open current directory in file explorer |
 | `R` | Refresh directory contents |
 | `r` | Rename file or directory |
 | `d` | Delete file or directory (with confirmation) |
 | `a` | Create new file |
 | `A` | Create new directory |
 
+`.zip` previews list the archive entries (size, method, modified time, name) without extracting them.
+
 ## File Selection
 
 | Key | Action |
@@ -33,6 +35,9 @@ Complete reference of all keyboard shortcuts in **rufio**.
 | `m` | Move selected items to current directory |
 | `c` | Copy selected items to current directory |
 | `x` | Delete selected items |
+| `z` | Extract selected `.zip` files (each into `<name>/`) / compress selected items into one `.zip` |
+
+ZIP extraction and compression run as background jobs. Check progress in Jobs mode (`J`).
 
 ## Filtering & Search
 
@@ -40,7 +45,9 @@ Complete reference of all keyboard shortcuts in **rufio**.
 |-----|--------|
 | `f` | Enter filter mode (type to filter) |
 | `s` | Search file names with fzf |
+| `/` | Search file names with fzf (same as `s`) |
 | `F` | Search file contents with rga |
+| `G` | Global search: file names or contents across all bookmarks |
 
 ## Bookmarks & Navigation
 
@@ -50,30 +57,33 @@ Complete reference of all keyboard shortcuts in **rufio**.
 | `B` | Bookmark menu (view/add/remove/script paths) |
 | `0` | Jump to startup directory |
 | `1-9` | Jump to bookmark 1-9 |
-| `z` | Navigate using zoxide history |
+| `Tab` | Cycle to next bookmark (Files mode) |
+| `Shift+Tab` | Cycle to previous bookmark (Files mode) |
+| `z` | Navigate using zoxide history (when nothing is selected) |
 
-## Command Mode & Tool Runtime
+## Modes & Tool Runtime
 
 | Key | Action |
 |-----|--------|
 | `:` | Enter command mode |
+| `G` | Global search mode |
+| `C` | Config mode: open `~/.config/rufio/` |
 | `J` | Job mode (view background jobs) |
 | `L` | View execution logs |
-
-## Mode Switching
-
-| Key | Action |
-|-----|--------|
-| `Tab` | Switch mode: Files -> Logs -> Jobs -> Help |
-| `Shift+Tab` | Switch mode (reverse direction) |
-| `?` | Enter help mode |
-| `ESC` | Exit current mode (help/filter/command) |
-| `q` | Quit rufio |
+| `?` | Open the floating help menu |
+| `q` | Quit rufio (with confirmation) |
+| `T` | Quit rufio and cd the shell to the current directory (requires `rufio --shell-init`) |
 
 ---
 
 ## Mode-Specific Keys
 
+### Preview
+- **P**: Open fullscreen file preview (hides the file list)
+- **j/k**: Scroll preview
+- **Ctrl+D/U**: Page down/up
+- **ESC**: Back to the file list
+
 ### Filter Mode
 - **Any character**: Add to filter query
 - **Backspace**: Remove last character
@@ -82,7 +92,7 @@ Complete reference of all keyboard shortcuts in **rufio**.
 
 ### Command Mode
 - **Any character**: Add to command input
-- **Tab**: Auto-complete (scripts, rake tasks, commands)
+- **Tab**: Auto-complete (scripts, rake tasks, commands, paths)
 - **Up/Down**: Navigate command history
 - **Enter**: Execute command
 - **Backspace**: Remove last character
@@ -92,27 +102,45 @@ Complete reference of all keyboard shortcuts in **rufio**.
 - `@script` - Execute a registered or local script
 - `rake:task` - Execute a Rakefile task
 - `!command` - Execute a shell command
+- `cd <path>` - Go to a directory (paste a path; a file path selects the file, `cd -` goes back, `Tab` completes directories)
 - `command` - Execute a built-in or plugin command
 
-### Help Mode
-- **j/k/h/l**: Navigate help files
-- **ESC**: Exit help mode and return to previous directory
+### Global Search (G)
+- **Type**: Filter results (literal, case insensitive)
+- **Tab**: Switch between file names and content
+- **Up/Down** or **Ctrl+J/K or Ctrl+N/P**: Select a result
+- **Enter**: Go to the selected file in Files mode
+- **Ctrl+U**: Clear the query
+- **ESC**: Return to the previous mode
+- Content search also reads `.pdf`, `.xlsx` and `.pptx`
 
-### Job Mode
+### Config Mode (C)
+- Same navigation, preview and file operations as Files mode
+- Leaving `~/.config/rufio/` returns to Files mode
+
+### Job Mode (J)
 - **j/k**: Navigate through jobs
+- **g/G**: First / last job
+- **Space**: View job log
+- **`x`: Cancel** the selected job (including ZIP jobs)
 - **ESC**: Exit job mode
 
+### Help Menu (?)
+- **1/2/3** or **Tab/Shift+Tab**: Switch section (Controls / Modes / Scripts)
+- **j/k**: Scroll | **Ctrl+D/U**: Page down/up | **g/G**: Top / bottom
+- **ESC**, **q** or **?**: Close and keep your current mode and directory
+
 ---
 
 ## Tips
 
 - **Vim users**: Navigation keys (`hjkl`) work exactly like Vim
 - **Selection**: Use `Space` to mark multiple files, then operate on all at once
-- **Quick access**: Number keys `1-9` provide instant access to bookmarks
+- **Quick access**: Number keys `1-9` and `Tab` provide instant access to bookmarks
 - **Filtering**: Press `f` and start typing for real-time filtering
 - **Rake tasks**: Type `:rake:` then `Tab` to see available tasks
 - **Local scripts**: Scripts in the current directory are auto-detected with `@` prefix
 
 ---
 
-*Press `?` anytime to return to help mode*
+*Press `?` anytime to open the help menu*

data/info/welcome.md

@@ -10,6 +10,8 @@ A TUI file manager that executes and coordinates tools and scripts from files.
 - **Vim-like Keybindings** - Navigate with `j/k/h/l` keys
 - **Real-time Filtering** - Press `f` to filter files instantly
 - **Advanced Search** - Use `fzf` for file names and `rga` for content search
+- **Global Search** - Press `G` to search names or contents (including PDF/Excel/PowerPoint) across all bookmarks
+- **ZIP Support** - Preview `.zip` contents, extract or compress selected items with `z`
 - **Bookmark Support** - Quick access to favorite directories
 - **Job Management** - Run commands in the background
 - **Plugin System** - Extend functionality with custom plugins
@@ -24,12 +26,18 @@ A TUI file manager that executes and coordinates tools and scripts from files.
 | `s` | Search with fzf |
 | `b` | Add bookmark |
 | `B` | Bookmark menu |
-| `z` | zoxide history |
+| `Tab` | Next bookmark |
+| `z` | zoxide history / extract or compress selected items |
+| `G` | Global search across bookmarks |
+| `C` | Config mode |
 | `:` | Command mode |
 | `J` | Job mode |
-| `?` | Help mode |
-| `Tab` | Switch mode (Files / Logs / Jobs / Help) |
+| `L` | Execution logs |
+| `?` | Help menu |
 | `q` | Quit |
+| `T` | Quit and cd to the current directory |
+
+In G mode, use `Ctrl+J` / `Ctrl+K` to select the next / previous result and `Enter` to open it.
 
 ## Command Mode
 
@@ -38,12 +46,13 @@ Press `:` to enter command mode:
 - `@script.sh` - Execute a script
 - `rake:test` - Execute a rake task
 - `!git status` - Run a shell command
+- `cd ~/projects` - Go to a pasted path
 - `Tab` - Auto-complete commands
 
 ## Getting Help
 
-Press `?` to enter **Help Mode** where you can browse all documentation files.
-Press `ESC` to exit Help Mode.
+Press `?` to open the floating **Help Menu** (Controls / Modes / Scripts).
+Switch sections with `1/2/3` or `Tab`, scroll with `j/k`, and close with `ESC`.
 
 ## More Information
 

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