Merge pull request #41 from TheDragonCode/1.x

Added extended information output

Author: andrey-helldar

app/Commands/ReadCommand.php

@@ -4,6 +4,7 @@
 
 use DragonCode\GithubNotifications\Factories\ClientFactory;
 use DragonCode\GithubNotifications\Services\GitHub;
+use DragonCode\GithubNotifications\Services\Output;
 use Github\ResultPager;
 use LaravelZero\Framework\Commands\Command;
 use Symfony\Component\Console\Exception\InvalidOptionException;
@@ -35,13 +36,14 @@ public function handle(): void
     protected function welcome(array $repositories): void
     {
         if ($repositories) {
-            $this->components->info('You specified the following repository name masks:');
+            Output::info('You specified the following repository name masks:');
+
             $this->components->bulletList($repositories);
 
             return;
         }
 
-        $this->components->info('Mark as read all notifications except open ones');
+        Output::info('Mark as read all notifications except open ones');
     }
 
     protected function hasContinue(): bool

app/Services/GitHub.php

@@ -25,6 +25,8 @@ class GitHub
 
     protected int $index = 0;
 
+    protected int $marked = 0;
+
     public function __construct(
         protected Factory $output,
         protected Client $github,
@@ -66,17 +68,36 @@ public function when(bool $value, Closure $callback, Closure $default): void
 
     public function markAll(): void
     {
-        $this->notifications()->markRead();
+        $this->output->task('Mark all notifications', fn () => $this->notifications()->markRead());
+
+        Output::success('All notifications have been successfully marked.');
     }
 
     public function mark(): void
     {
         if (! $items = $this->paginated()) {
-            $this->output->info('No unread notifications');
+            Output::success('No unread notifications');
 
             return;
         }
 
+        $count = count($items);
+
+        Output::info('unread notifications detected', $count);
+
+        $this->process($items);
+        $this->result($count);
+    }
+
+    protected function markAsRead(NotificationData $data): void
+    {
+        $this->github->notification()->markThreadRead($data->id);
+
+        ++$this->marked;
+    }
+
+    protected function process(array $items): void
+    {
         foreach ($items as $data) {
             $notification = new NotificationData($data, ++$this->index);
 
@@ -88,11 +109,6 @@ public function mark(): void
         }
     }
 
-    protected function markAsRead(NotificationData $data): void
-    {
-        $this->github->notification()->markThreadRead($data->id);
-    }
-
     protected function paginated(): array
     {
         return $this->paginator->fetchAll($this->notifications(), 'all');
@@ -154,4 +170,15 @@ protected function shouldSkip(NotificationData $notification, ItemData $item): b
 
         return $item->isOpen;
     }
+
+    protected function result(int $count): void
+    {
+        $info = sprintf(
+            '%d notifications were marked as read and %d were skipped.',
+            $this->marked,
+            $count - $this->marked
+        );
+
+        $this->marked ? Output::success($info) : Output::info($info);
+    }
 }

app/Services/Output.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\GithubNotifications\Services;
+
+use Illuminate\Support\Str;
+
+use function Termwind\{render};
+
+class Output
+{
+    public static function info(string $value, int|string $title = 'INFO'): void
+    {
+        static::line($value, $title, 'blue-300');
+    }
+
+    public static function success(string $value, int|string $title = 'SUCCESS'): void
+    {
+        static::line($value, $title, 'green-300');
+    }
+
+    public static function comment(string $value, int|string $title = 'COMMENT'): void
+    {
+        static::line($value, $title, 'gray-300');
+    }
+
+    protected static function line(string $value, int|string $title, string $color): void
+    {
+        $padding = static::padding($title);
+
+        render(
+            <<<HTML
+                    <div class="py-1 ml-1">
+                        <div class="px-$padding bg-$color text-black">
+                            $title
+                        </div>
+                        <em class="ml-1">
+                          $value
+                        </em>
+                    </div>
+                HTML
+        );
+    }
+
+    protected static function padding(int|string $value): int
+    {
+        return match (Str::length((string) $value)) {
+            1, 2 => 3,
+            3, 4 => 2,
+            default => 1
+        };
+    }
+}

composer.json

@@ -38,6 +38,7 @@
         "knplabs/github-api": "^3.14.1",
         "laravel-zero/framework": "^10.3",
         "mockery/mockery": "^1.6.11",
+        "nunomaduro/termwind": "^1.15.1",
         "pestphp/pest": "^2.34.6"
     },
     "minimum-stability": "stable",