update

Author: tamedevelopers

src/Capsule/Artisan.php

@@ -71,6 +71,8 @@ public static function call(string $input): int
         $args    = array_slice($tokens, 1);
         $argv    = array_merge(['tame'], [$command], $args);
 
+        require_once base_path('tame');
+
         $artisan = new self();
 
         return $artisan->run($argv);

src/Commands/ProcessorCommand.php

@@ -4,9 +4,11 @@
 
 namespace Tamedevelopers\Support\Commands;
 
+use Tamedevelopers\Support\Tame;
 use Tamedevelopers\Support\Server;
 use Tamedevelopers\Support\ImageToText;
 use Tamedevelopers\Support\NameToImage;
+use Tamedevelopers\Support\Capsule\File;
 use Tamedevelopers\Support\Capsule\Logger;
 use Tamedevelopers\Support\Capsule\CommandHelper;
 
@@ -36,8 +38,8 @@ class ProcessorCommand extends CommandHelper
     public function handle()
     {
         Logger::helpHeader('<yellow>Usage:</yellow>');
-        Logger::writeln('  php tame make:processor [name]');
-        Logger::writeln('  php tame make:processor [name]');
+        Logger::writeln("  php tame processor:toImage --name --path --bgColor --textColor --fontWeight=[bold|normal] --type=[circle|radius]  --generate=[bool] \n");
+        Logger::writeln('  php tame processor:toText --path= --grayscale=[bool] --contrast=[int]');
         Logger::writeln('');
     }
 
@@ -46,15 +48,15 @@ public function handle()
      */
     public function toImage(): string
     {
-        $args  = $this->arguments();
-        [$name, $bgColor, $textColor, $path, $generate, $output, $fontWeight] = [
+        [$name, $bgColor, $textColor, $path, $generate, $output, $fontWeight, $type] = [
             $this->flag('name'), 
             $this->flag('bgColor'), 
             $this->flag('textColor'), 
             $this->flag('path'),
-            $this->flag('output'),
             (bool) $this->flag('generate') ?: false,
+            $this->flag('output'),
             $this->flag('fontWeight'), 
+            $this->flag('type'), 
         ];
 
         if(!in_array($output, ['save', 'data'])){
@@ -69,46 +71,38 @@ public function toImage(): string
             'destination' => $path,
             'output' => $output, 
             'generate' => $generate, 
+            'type' => $type, 
         ]));
 
+        $path = Tame::getBasePath($path);
+
         Logger::info("$path\n");
 
         return $path;
     }
 
     /**
-     * Convert and Extract Image to Text
+     * Extract an Image to Text
      */
     public function toText(): string
     {
-        $args  = $this->arguments();
-        [$name, $bgColor, $textColor, $path, $generate, $output, $fontWeight] = [
-            $this->flag('name'), 
-            $this->flag('bgColor'), 
-            $this->flag('textColor'), 
-            $this->flag('path'),
-            $this->flag('output'),
-            (bool) $this->flag('generate') ?: false,
-            $this->flag('fontWeight'), 
+        [$path, $grayscale, $contrast] = [
+            $this->flag('path'), 
+            (bool) $this->flag('grayscale') ?: true, 
+            $this->flag('contrast') ?: 20, 
         ];
-
-        if(!in_array($output, ['save', 'data'])){
-            $output = 'save';
-        }
-
-        $path = Server::pathReplacer(ImageToText::run([
-            'name' => $name,
-            'bg_color' => $bgColor,
-            'font_weight' => $fontWeight,
-            'text_color' => $textColor,
-            'destination' => $path,
-            'output' => $output, 
-            'generate' => $generate, 
-        ]));
-
-        Logger::info("$path\n");
-
-        return $path;
+        
+        $text = ImageToText::run([
+            'source' => Tame::getBasePath($path),
+            'preprocess' => [
+                'grayscale' => $grayscale,
+                'contrast'  => $contrast,
+            ],
+        ]);
+
+        Logger::info("$text\n");
+
+        return $text;
     }
 
 }

src/Traits/TameTrait.php

@@ -263,7 +263,7 @@ private static function getFiletime($path = null)
      * @param  string|null $path
      * @return mixed
      */
-    private static function getBasePath($path = null)
+    public static function getBasePath($path = null)
     {
         // removing default base directory path if added by default
         $path = Str::replace(Server::formatWithBaseDirectory(), '', $path);

tests/imageToText.php

@@ -1,6 +1,7 @@
 <?php
 
 use Tamedevelopers\Support\ImageToText;
+use Tamedevelopers\Support\Capsule\Artisan;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
@@ -14,33 +15,19 @@
 
 $isCli = (php_sapi_name() === 'cli');
 
-if ($isCli) {
-    $path = $argv[1] ?? '';
-    $lang = $argv[2] ?? 'eng';
-    $psm  = isset($argv[3]) ? (int)$argv[3] : null;
+dd(
+  Artisan::call('processor:toText --path=thousand_units.png'),
+);
 
-    if ($path === '' || !is_readable($path)) {
-        fwrite(STDERR, "Usage: php tests/imagetotext.php <image_path> [lang=eng] [psm]\n");
-        exit(1);
-    }
+// :toText --path=thousand_units.png
+if ($isCli) {
+  $text = Artisan::call('processor');
 
-    try {
-        $text = ImageToText::run([
-            'source'     => $path,
-            'language'   => $lang,
-            'psm'        => $psm,
-            'preprocess' => [
-                'grayscale' => true,
-                'contrast'  => 20,
-                // 'threshold' => 170, // optionally enable thresholding
-            ],
-        ]);
-        echo $text, "\n";
-    } catch (\Throwable $e) {
-        fwrite(STDERR, 'OCR error: ' . $e->getMessage() . "\n");
-        exit(2);
-    }
-    exit(0);
+  dd(
+    // $args,
+    Artisan::call("list"),
+    $text
+  );
 }
 
 // Web mode