Added singleline option

Author: devdot

src/Commands/SearchLog.php

@@ -22,8 +22,7 @@ public function handle() {
         parent::handle();
     }
 
-    protected function printRecord($record) {
-        // simply add highlighting and then let the parent handle it
+    protected function addHighlightingToRecord(LogRecord $record): LogRecord {
         $message = str_replace($this->filter['search'], '<bg=yellow>'.$this->filter['search'].'</>', $record['message']);
         $driver = $record->getDriver();
         $record = new LogRecord(
@@ -35,6 +34,19 @@ protected function printRecord($record) {
             $record['extra'],
         );
         $record->setDriver($driver);
+        return $record;
+    }
+
+    protected function printRecord(LogRecord $record): void {
+        // simply add highlighting and then let the parent handle it
+        $record = $this->addHighlightingToRecord($record);
         parent::printRecord($record);
     }
+
+    protected function printRecordSingleline(LogRecord $record): void {
+        // same as print Record
+        // simply add highlighting and then let the parent handle it
+        $record = $this->addHighlightingToRecord($record);
+        parent::printRecordSingleline($record);
+    }
 }

src/Commands/ShowLog.php

@@ -4,6 +4,7 @@
 
 use Devdot\LogArtisan\Helpers\CommandHelper;
 use Devdot\LogArtisan\Models\DriverMultiple;
+use Devdot\LogArtisan\Models\LogRecord;
 use Illuminate\Console\Command;
 
 class ShowLog extends Command
@@ -32,6 +33,7 @@ class ShowLog extends Command
         {--l|level= : Show only entries with this log level}
         {--channel= : Use this specified logging channel}
         {--s|short : Only show short snippets}
+        {--singleline : Show single-lined layout}
         {--stacktrace : Show the full stacktrace}
     ';
 
@@ -125,8 +127,12 @@ public function handle()
         }
 
         foreach($records as $log) {
-            $this->printSeparator();
-            $this->printRecord($log);
+            if($this->option('singleline'))
+                $this->printRecordSingleline($log);
+            else {
+                $this->printSeparator();
+                $this->printRecord($log);
+            }
         }
 
         $this->printSeparator();
@@ -146,13 +152,8 @@ protected function printSeparator() {
         $this->newLine();
     }
 
-    protected function printRecord($record) {
-        $this->line(
-            $record['datetime']->format('Y-m-d H:i:s').
-            ' <fg=gray>'.$record['channel'].'</>.'.
-            CommandHelper::styleDebugLevel($record['level']).
-            ' <fg=gray>@'.$record->getDriver()->getLaravelChannel().'</>:'
-        );
+    protected function printRecord(LogRecord $record): void {
+        $this->line(CommandHelper::styleLogRecordHeader($record));
         $this->line($record['message']);
         // stop output here if it's short output
         if($this->option('short')) {
@@ -194,4 +195,49 @@ protected function printRecord($record) {
 
         }   
     }
+
+    protected function printRecordSingleline(LogRecord $record): void {
+        // create the heading text
+        $str = CommandHelper::styleLogRecordHeader($record);
+        
+        // now add the message
+        $str .= ' '.$record['message'];
+
+        // remove line wraps
+        $str = str_replace(PHP_EOL, ' ', $str);
+
+        // and create a string without the formatting
+        $plain = preg_replace('/<[^\/]*?>(.*?)<\/>/', '$1', $str);
+
+        // and shorten the entire string to fit one line
+        if(strlen($plain) > $this->terminalWidth) {
+            // calculate the allowed length by adding the formatting length
+            $formattingLength = strlen($str) - strlen($plain);
+
+            // make it shorter
+            $str = substr($str, 0, $this->terminalWidth + $formattingLength);
+
+            // and make sure we are closing every formatting properly
+            if(substr($str, -2) === '</')
+                $str = substr($str, 0, -3).'</>';
+
+            // count to make sure we close every opened formatting tag
+            $countOpen = count(preg_split('/<[^\/]*?>/', $str));
+            $countClose = count(preg_split('/<\/>/', $str));
+
+            // check if we are odd between open and close
+            if($countOpen > $countClose) {
+                // make sure we didn't cut a closing tag short
+                if(substr($str, -1) == '<')
+                    $str = substr($str, 0, -3);
+
+                // append for each missing one the close tag
+                for($i = $countClose; $i < $countOpen; $i++)
+                    $str .= '</>';
+            }
+        }
+
+        // print the string
+        $this->line($str);
+    }
 }

src/Helpers/CommandHelper.php

@@ -2,6 +2,7 @@
 
 namespace Devdot\LogArtisan\Helpers;
 
+use Devdot\LogArtisan\Models\LogRecord;
 use Illuminate\Console\Command;
 
 // this helper needs to extend Command in order to access protected properties
@@ -47,4 +48,12 @@ public static function styleDebugLevel(string $level): string {
         $value = '<fg='.$color.'>'.strtoupper($level).'</>';
         return $value;
     }
+
+    public static function styleLogRecordHeader(LogRecord $record): string {
+        return
+            $record['datetime']->format('Y-m-d H:i:s').
+            ' <fg=gray>'.$record['channel'].'</>.'.
+            CommandHelper::styleDebugLevel($record['level']).
+            ' <fg=gray>@'.$record->getDriver()->getLaravelChannel().'</>:';
+    }
 }