be able display subfolders of log folder. (#155)

Author: sskl

src/Rap2hpoutre/LaravelLogViewer/LaravelLogViewer.php

@@ -14,6 +14,11 @@ class LaravelLogViewer
      */
     private static $file;
 
+    /**
+     * @var string folder
+     */
+    private static $folder;
+
     private static $levels_classes = [
         'debug' => 'info',
         'info' => 'info',
@@ -59,6 +64,18 @@ class LaravelLogViewer
 
     const MAX_FILE_SIZE = 52428800; // Why? Uh... Sorry
 
+    /**
+     * @param string $folder
+     */
+    public static function setFolder($folder)
+    {
+        $logsPath = storage_path('logs') . '/' . $folder;
+
+        if (app('files')->exists($logsPath)) {
+            self::$folder = $folder;
+        }
+    }
+
     /**
      * @param string $file
      */
@@ -79,7 +96,8 @@ public static function setFile($file)
     public static function pathToLogFile($file)
     {
         $logsPath = storage_path('logs');
-
+        $logsPath .= (self::$folder) ? '/' . self::$folder : '' ;
+    
         if (app('files')->exists($file)) { // try the absolute path
             return $file;
         }
@@ -94,6 +112,14 @@ public static function pathToLogFile($file)
         return $file;
     }
 
+    /**
+     * @return string
+     */
+    public static function getFolderName()
+    {
+        return self::$folder;
+    }
+
     /**
      * @return string
      */
@@ -112,7 +138,7 @@ public static function all()
         $pattern = '/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}([\+-]\d{4})?\].*/';
 
         if (!self::$file) {
-            $log_file = self::getFiles();
+            $log_file = (!self::$folder) ? self::getFiles() : self::getFolderFiles();
             if(!count($log_file)) {
                 return [];
             }
@@ -180,14 +206,37 @@ public static function all()
         return array_reverse($log);
     }
 
+    /**
+     * @return array
+     */
+    public static function getFolders()
+    {
+        $folders = glob(storage_path() . '/logs/*', GLOB_ONLYDIR);
+        if (is_array($folders)) {
+            foreach ($folders as $k => $folder) {
+                $folders[$k] = basename($folder);
+            }
+        }
+        return array_values($folders);
+    }
+
+    /**
+     * @param bool $basename
+     * @return array
+     */
+    public static function getFolderFiles($basename = false)
+    {
+        return self::getFiles($basename, self::$folder);
+    }
+
     /**
      * @param bool $basename
      * @return array
      */
-    public static function getFiles($basename = false)
+    public static function getFiles($basename = false, $folder = '')
     {
         $pattern = function_exists('config') ? config('logviewer.pattern', '*.log') : '*.log';
-        $files = glob(storage_path() . '/logs/' . $pattern, preg_match('/\{.*?\,.*?\}/i', $pattern) ? GLOB_BRACE : 0);
+        $files = glob(storage_path() . '/logs/' . $folder . '/' . $pattern, preg_match('/\{.*?\,.*?\}/i', $pattern) ? GLOB_BRACE : 0);
         $files = array_reverse($files);
         $files = array_filter($files, 'is_file');
         if ($basename && is_array($files)) {

src/controllers/LogViewerController.php

@@ -30,16 +30,24 @@ public function __construct ()
      */
     public function index()
     {
+        $folderFiles = [];
+        if ($this->request->input('f')) {
+            LaravelLogViewer::setFolder(Crypt::decrypt($this->request->input('f')));
+            $folderFiles = LaravelLogViewer::getFolderFiles(true);
+        }
         if ($this->request->input('l')) {
             LaravelLogViewer::setFile(Crypt::decrypt($this->request->input('l')));
         }
 
         if ($early_return = $this->earlyReturn()) {
             return $early_return;
         }
-        
+
         $data = [
             'logs' => LaravelLogViewer::all(),
+            'folders' => LaravelLogViewer::getFolders(),
+            'current_folder' => LaravelLogViewer::getFolderName(),
+            'folder_files' => $folderFiles,
             'files' => LaravelLogViewer::getFiles(true),
             'current_file' => LaravelLogViewer::getFileName(),
             'standardFormat' => true,

src/views/log.blade.php

@@ -53,6 +53,10 @@
     .list-group-item {
       word-wrap: break-word;
     }
+
+    .folder {
+      padding-top: 5px;
+    }
   </style>
 </head>
 <body>
@@ -62,6 +66,23 @@
       <h1><i class="fa fa-calendar" aria-hidden="true"></i> Laravel Log Viewer</h1>
       <p class="text-muted"><i>by Rap2h</i></p>
       <div class="list-group">
+        @foreach($folders as $folder)
+          <div class="list-group-item">
+            <a href="?f={{ \Illuminate\Support\Facades\Crypt::encrypt($folder) }}">
+              <span class="fa fa-folder"></span> {{$folder}}
+            </a>
+            @if ($current_folder == $folder)
+              <div class="list-group folder">
+                @foreach($folder_files as $file)
+                  <a href="?l={{ \Illuminate\Support\Facades\Crypt::encrypt($file) }}&f={{ \Illuminate\Support\Facades\Crypt::encrypt($folder) }}"
+                    class="list-group-item @if ($current_file == $file) llv-active @endif">
+                    {{$file}}
+                  </a>
+                @endforeach
+              </div>
+            @endif
+          </div>
+        @endforeach
         @foreach($files as $file)
           <a href="?l={{ \Illuminate\Support\Facades\Crypt::encrypt($file) }}"
              class="list-group-item @if ($current_file == $file) llv-active @endif">