Update

mantas6 · Dec 30, 2024 · 07b0dfd · 07b0dfd
1 parent 7b3b5ab
commit 07b0dfd
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 209 deletions.
diff --git a/base/.local/share/services/packages/zero/app/Commands/FzfDownload.php b/base/.local/share/services/packages/zero/app/Commands/FzfDownload.php
diff --git a/base/.local/share/services/packages/zero/app/Commands/FzfPhp.php b/base/.local/share/services/packages/zero/app/Commands/FzfPhp.php
diff --git a/base/.local/share/services/packages/zero/app/Commands/Projects/AddCommand.php b/base/.local/share/services/packages/zero/app/Commands/Projects/AddCommand.php
@@ -7,6 +7,7 @@
 use LaravelZero\Framework\Commands\Command;
 
 use function Laravel\Prompts\search;
+use function Mantas6\FzfPhp\fzf;
 
 class AddCommand extends Command
 {
@@ -35,18 +36,22 @@ public function handle()
             ->collect()
             ->mapWithKeys(fn (array $project) => [$project['id'] => $project['name']]);
 
-        $selected = search(
-            label: 'Select project',
-            scroll: 20,
-            options: fn (string $search) =>
-                $items->filter(fn (string $name) => str($name)->contains($search, ignoreCase: true))
-                ->toArray()
+        $selected = fzf(
+            options: $items->map(fn ($name, $id) => "$id:$name")
+                ->toArray(),
+
+            arguments: [
+                'delimiter' => ':',
+                'with-nth' => '2',
+            ],
         );
 
+        $index = str($selected)->before(':')->toString();
+
         $project = Project::query()
-            ->firstOrNew(['name' => $items[$selected]]);
+            ->firstOrNew(['name' => $items[$index]]);
 
-        $project->ext_id = $selected;
+        $project->ext_id = $index;
         $project->save();
     }
 }
diff --git a/base/.local/share/services/packages/zero/app/Commands/Tasks/CopyCommand.php b/base/.local/share/services/packages/zero/app/Commands/Tasks/CopyCommand.php
@@ -11,6 +11,8 @@
 use Illuminate\Support\Facades\Storage;
 use LaravelZero\Framework\Commands\Command;
 
+use function Mantas6\FzfPhp\fzf;
+
 class CopyCommand extends Command implements PromptsForMissingInput
 {
     /**
@@ -46,12 +48,11 @@ public function handle()
             ->tasks
             ->map(fn(Task $task) => $task->name);
 
-        Storage::put('tasks', $tasks->join("\n"));
+        $selected = fzf(
+            options: $tasks->toArray(),
+            arguments: ['tac' => true],
+        );
 
-        Process::pipe(function (Pipe $pipe) {
-            $pipe->command('cat ' . Storage::path('tasks'));
-            $pipe->command('fzf --tac');
-            $pipe->command('xc');
-        });
+        Process::input($selected)->run('xc');
     }
 }
diff --git a/base/.local/share/services/packages/zero/app/Providers/AppServiceProvider.php b/base/.local/share/services/packages/zero/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Mantas6\FzfPhp\FuzzyFinder;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -11,7 +12,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        //
+        // FuzzyFinder::usingCommand('/usr/bin/env fzf');
     }
 
     /**

diff --git a/base/.local/share/services/packages/zero/composer.json b/base/.local/share/services/packages/zero/composer.json
@@ -20,6 +20,7 @@
         "illuminate/database": "^11.5",
         "laravel-zero/framework": "^11.0.2",
         "laravel/serializable-closure": "^2.0",
+        "mantas6/fzf-php": "^0.1.1",
         "saloonphp/laravel-http-sender": "^3.0",
         "saloonphp/laravel-plugin": "^3.0",
         "saloonphp/saloon": "^3.0"

diff --git a/base/.local/share/services/packages/zero/composer.lock b/base/.local/share/services/packages/zero/composer.lock