rufio 0.33.0 → 0.34.0

data/lib_zig/rufio_native/src/main.zig.sync

@@ -0,0 +1,205 @@
+const std = @import("std");
+const c = @cImport({
+    @cInclude("dirent.h");
+    @cInclude("sys/stat.h");
+    @cInclude("string.h");
+    @cInclude("stdlib.h");
+});
+
+/// ディレクトリエントリ情報（内部保持用）
+const DirEntry = struct {
+    name: []u8,
+    is_dir: bool,
+    size: u64,
+    mtime: i64,
+    executable: bool,
+    hidden: bool,
+
+    fn deinit(self: *DirEntry) void {
+        c.free(self.name.ptr);
+    }
+};
+
+/// スキャナーコア（状態を保持）
+const Scanner = struct {
+    entries: []DirEntry,
+    capacity: usize,
+    count: usize,
+
+    fn init() !*Scanner {
+        const self = @as(?*Scanner, @ptrCast(@alignCast(c.malloc(@sizeOf(Scanner))))) orelse return error.OutOfMemory;
+        self.*.capacity = 64;
+        const entries_size = self.*.capacity * @sizeOf(DirEntry);
+        const entries_ptr = c.malloc(entries_size) orelse {
+            c.free(self);
+            return error.OutOfMemory;
+        };
+        self.*.entries = @as([*]DirEntry, @ptrCast(@alignCast(entries_ptr)))[0..self.*.capacity];
+        self.*.count = 0;
+        return self;
+    }
+
+    fn deinit(self: *Scanner) void {
+        // 各エントリの名前を解放
+        for (self.entries[0..self.count]) |*entry| {
+            entry.deinit();
+        }
+        // エントリ配列を解放
+        c.free(self.entries.ptr);
+        // 自身を解放
+        c.free(self);
+    }
+
+    fn clear(self: *Scanner) void {
+        // 既存のエントリをクリア
+        for (self.entries[0..self.count]) |*entry| {
+            entry.deinit();
+        }
+        self.count = 0;
+    }
+
+    fn ensureCapacity(self: *Scanner, needed: usize) !void {
+        if (needed <= self.capacity) return;
+
+        const new_capacity = @max(needed, self.capacity * 2);
+        const new_size = new_capacity * @sizeOf(DirEntry);
+        const new_ptr = c.realloc(self.entries.ptr, new_size) orelse return error.OutOfMemory;
+        self.entries = @as([*]DirEntry, @ptrCast(@alignCast(new_ptr)))[0..new_capacity];
+        self.capacity = new_capacity;
+    }
+
+    fn scan(self: *Scanner, path: [*:0]const u8, max_entries: usize) !void {
+        // 既存のエントリをクリア
+        self.clear();
+
+        const dir = c.opendir(path) orelse return error.CannotOpenDir;
+        defer _ = c.closedir(dir);
+
+        const path_len = c.strlen(path);
+        const path_slice = path[0..path_len];
+
+        while (c.readdir(dir)) |entry| {
+            // エントリ数制限チェック
+            if (max_entries > 0 and self.count >= max_entries) break;
+
+            const name_ptr = @as([*:0]const u8, @ptrCast(&entry.*.d_name));
+            const name_len = c.strlen(name_ptr);
+            const name_slice = name_ptr[0..name_len];
+
+            // "." と ".." をスキップ
+            if (std.mem.eql(u8, name_slice, ".") or std.mem.eql(u8, name_slice, "..")) {
+                continue;
+            }
+
+            // 容量確保
+            try self.ensureCapacity(self.count + 1);
+
+            // フルパスを構築
+            var path_buf: [std.fs.max_path_bytes]u8 = undefined;
+            const full_path = std.fmt.bufPrintZ(&path_buf, "{s}/{s}", .{ path_slice, name_slice }) catch continue;
+
+            // ファイル情報を取得
+            var stat_buf: c.struct_stat = undefined;
+            if (c.lstat(full_path.ptr, &stat_buf) != 0) {
+                continue;
+            }
+
+            // 名前をコピー
+            const name_copy_ptr = c.malloc(name_len + 1) orelse return error.OutOfMemory;
+            const name_copy_bytes = @as([*]u8, @ptrCast(@alignCast(name_copy_ptr)));
+            const name_copy = name_copy_bytes[0..name_len];
+            @memcpy(name_copy, name_slice);
+            name_copy_bytes[name_len] = 0;
+
+            // エントリを追加
+            self.entries[self.count] = DirEntry{
+                .name = name_copy,
+                .is_dir = (stat_buf.st_mode & c.S_IFMT) == c.S_IFDIR,
+                .size = @intCast(stat_buf.st_size),
+                .mtime = @intCast(stat_buf.st_mtimespec.tv_sec),
+                .executable = (stat_buf.st_mode & c.S_IXUSR) != 0,
+                .hidden = name_slice[0] == '.',
+            };
+            self.count += 1;
+        }
+    }
+};
+
+// ============================================================
+// ABI Boundary: Ruby ABI非依存・ハンドルベース
+// ============================================================
+
+/// スキャナーを作成（ハンドル返却）
+export fn core_create() u64 {
+    const scanner = Scanner.init() catch return 0;
+    return @intFromPtr(scanner);
+}
+
+/// ディレクトリをスキャン
+export fn core_scan(handle: u64, path: [*:0]const u8) i32 {
+    if (handle == 0) return -1;
+
+    const scanner = @as(*Scanner, @ptrFromInt(handle));
+    scanner.scan(path, 0) catch return -1;
+    return 0;
+}
+
+/// 高速スキャン（エントリ数制限付き）
+export fn core_scan_fast(handle: u64, path: [*:0]const u8, max_entries: usize) i32 {
+    if (handle == 0) return -1;
+
+    const scanner = @as(*Scanner, @ptrFromInt(handle));
+    scanner.scan(path, max_entries) catch return -1;
+    return 0;
+}
+
+/// エントリ数を取得
+export fn core_get_count(handle: u64) usize {
+    if (handle == 0) return 0;
+
+    const scanner = @as(*Scanner, @ptrFromInt(handle));
+    return scanner.count;
+}
+
+/// 指定インデックスのエントリ名を取得
+export fn core_get_name(handle: u64, index: usize, buf: [*]u8, buf_size: usize) usize {
+    if (handle == 0) return 0;
+
+    const scanner = @as(*Scanner, @ptrFromInt(handle));
+    if (index >= scanner.count) return 0;
+
+    const entry = &scanner.entries[index];
+    const copy_len = @min(entry.name.len, buf_size - 1);
+    @memcpy(buf[0..copy_len], entry.name[0..copy_len]);
+    buf[copy_len] = 0;
+    return copy_len;
+}
+
+/// 指定インデックスのエントリ属性を取得
+export fn core_get_attrs(handle: u64, index: usize, is_dir: *u8, size: *u64, mtime: *i64, executable: *u8, hidden: *u8) i32 {
+    if (handle == 0) return -1;
+
+    const scanner = @as(*Scanner, @ptrFromInt(handle));
+    if (index >= scanner.count) return -1;
+
+    const entry = &scanner.entries[index];
+    is_dir.* = if (entry.is_dir) 1 else 0;
+    size.* = entry.size;
+    mtime.* = entry.mtime;
+    executable.* = if (entry.executable) 1 else 0;
+    hidden.* = if (entry.hidden) 1 else 0;
+    return 0;
+}
+
+/// スキャナーを破棄
+export fn core_destroy(handle: u64) void {
+    if (handle == 0) return;
+
+    const scanner = @as(*Scanner, @ptrFromInt(handle));
+    scanner.deinit();
+}
+
+/// バージョン情報
+export fn core_version() [*:0]const u8 {
+    return "3.0.0-handle-based";
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufio
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - masisz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-03 00:00:00.000000000 Z
+date: 2026-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -129,7 +129,7 @@ files:
 - docs/CHANGELOG_v0.30.0.md
 - docs/CHANGELOG_v0.31.0.md
 - docs/CHANGELOG_v0.32.0.md
-- docs/CHANGELOG_v0.33.0.md
+- docs/CHANGELOG_v0.34.0.md
 - docs/CHANGELOG_v0.4.0.md
 - docs/CHANGELOG_v0.5.0.md
 - docs/CHANGELOG_v0.6.0.md
@@ -143,6 +143,8 @@ files:
 - info/welcome.md
 - lib/rufio.rb
 - lib/rufio/application.rb
+- lib/rufio/async_scanner_fiber.rb
+- lib/rufio/async_scanner_promise.rb
 - lib/rufio/background_command_executor.rb
 - lib/rufio/bookmark.rb
 - lib/rufio/bookmark_manager.rb
@@ -164,11 +166,10 @@ files:
 - lib/rufio/info_notice.rb
 - lib/rufio/keybind_handler.rb
 - lib/rufio/logger.rb
-- lib/rufio/native/rufio_native.bundle
 - lib/rufio/native/rufio_zig.bundle
 - lib/rufio/native_scanner.rb
-- lib/rufio/native_scanner_magnus.rb
 - lib/rufio/native_scanner_zig.rb
+- lib/rufio/parallel_scanner.rb
 - lib/rufio/plugin.rb
 - lib/rufio/plugin_config.rb
 - lib/rufio/plugin_manager.rb
@@ -183,14 +184,10 @@ files:
 - lib/rufio/text_utils.rb
 - lib/rufio/version.rb
 - lib/rufio/zoxide_integration.rb
-- lib_rust/rufio_native/.cargo/config.toml
-- lib_rust/rufio_native/Cargo.lock
-- lib_rust/rufio_native/Cargo.toml
-- lib_rust/rufio_native/build.rs
-- lib_rust/rufio_native/src/lib.rs
 - lib_zig/rufio_native/Makefile
 - lib_zig/rufio_native/build.zig
 - lib_zig/rufio_native/src/main.zig
+- lib_zig/rufio_native/src/main.zig.sync
 - publish_gem.zsh
 - retag.sh
 - test_delete/test1.txt

data/lib/rufio/native_scanner_magnus.rb

@@ -1,194 +0,0 @@
-# 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_rust/rufio_native/.cargo/config.toml

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