log location customisable #139 + fix #156

* Creating a  array that content all the patterns used in the class, this allow if in the feature we want to create a new featured that include patterns we cant add this for a best readeability (some patterns get really complicated

* Modifying all the sugestion from rap2hpoutre in the PR comments

* Log Location customisable #139

* changing storage_path() to ->storage_path

* Fixing error Cannot use object of type Rap2hpoutre\LaravelLogViewer\Pattern as array

 + changing array to not static + creating new function getPattern

*  fixing Codacy/PR Quality Review

Author: elminson

src/Rap2hpoutre/LaravelLogViewer/LaravelLogViewer.php

@@ -18,6 +18,11 @@ class LaravelLogViewer
      */
     private $folder;
 
+    /**
+     * @var string storage_path
+     */
+    private $storage_path;
+
     /**
      * Why? Uh... Sorry
      */
@@ -40,14 +45,16 @@ public function __construct()
     {
         $this->level = new Level();
         $this->pattern = new Pattern();
+        $this->storage_path = function_exists('config') ? config('logviewer.storage_path', storage_path('logs')) : storage_path('logs');
+
     }
 
     /**
      * @param string $folder
      */
     public function setFolder($folder)
     {
-        $logsPath = storage_path('logs') . '/' . $folder;
+        $logsPath = $this->storage_path . '/' . $folder;
 
         if (app('files')->exists($logsPath)) {
             $this->folder = $folder;
@@ -74,7 +81,7 @@ public function setFile($file)
      */
     public function pathToLogFile($file)
     {
-        $logsPath = storage_path('logs');
+        $logsPath = $this->storage_path;
         $logsPath .= ($this->folder) ? '/' . $this->folder : '';
 
         if (app('files')->exists($file)) { // try the absolute path
@@ -126,13 +133,13 @@ public function all()
 
         $file = app('files')->get($this->file);
 
-        preg_match_all($this->pattern['logs'], $file, $headings);
+        preg_match_all($this->pattern->getPattern('logs'), $file, $headings);
 
         if (!is_array($headings)) {
             return $log;
         }
 
-        $log_data = preg_split($this->pattern['logs'], $file);
+        $log_data = preg_split($this->pattern->getPattern('logs'), $file);
 
         if ($log_data[0] < 1) {
             array_shift($log_data);
@@ -143,7 +150,7 @@ public function all()
                 foreach ($this->level->all() as $level) {
                     if (strpos(strtolower($h[$i]), '.' . $level) || strpos(strtolower($h[$i]), $level . ':')) {
 
-                        preg_match($this->pattern['current_log'][0] . $level . $this->pattern['current_log'][1], $h[$i], $current);
+                        preg_match($this->pattern->getPattern('current_log',0) . $level . $this->pattern->getPattern('current_log',1), $h[$i], $current);
                         if (!isset($current[4])) continue;
 
                         $log[] = array(
@@ -188,7 +195,7 @@ public function all()
      */
     public function getFolders()
     {
-        $folders = glob(storage_path() . '/logs/*', GLOB_ONLYDIR);
+        $folders = glob(storage_path() . '/'.$this->storage_path.'/*', GLOB_ONLYDIR);
         if (is_array($folders)) {
             foreach ($folders as $k => $folder) {
                 $folders[$k] = basename($folder);
@@ -214,7 +221,7 @@ public function getFolderFiles($basename = false)
     public function getFiles($basename = false, $folder = '')
     {
         $pattern = function_exists('config') ? config('logviewer.pattern', '*.log') : '*.log';
-        $files = glob(storage_path() . '/logs/' . $folder . '/' . $pattern, preg_match($this->pattern['files'], $pattern) ? GLOB_BRACE : 0);
+        $files = glob(storage_path() . '/'.$this->storage_path.'/' . $folder . '/' . $pattern, preg_match($this->pattern->getPattern('files'), $pattern) ? GLOB_BRACE : 0);
         $files = array_reverse($files);
         $files = array_filter($files, 'is_file');
         if ($basename && is_array($files)) {

src/Rap2hpoutre/LaravelLogViewer/Pattern.php

@@ -14,7 +14,7 @@ class Pattern
     /**
      * @var array
      */
-    private static $patterns = [
+    private $patterns = [
         'logs' => '/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}([\+-]\d{4})?\].*/',
         'current_log' => [
             '/^\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}([\+-]\d{4})?)\](?:.*?(\w+)\.|.*?)',
@@ -31,4 +31,18 @@ public function all()
         return array_keys($this->patterns);
     }
 
+    /**
+     * @param $pattern
+     * @param null $position
+     * @return string pattern
+     */
+    public function getPattern($pattern, $position = null)
+    {
+        if ($position != null) {
+            return $this->patterns[$pattern][$position];
+        }
+        return $this->patterns[$pattern];
+        
+    }
+
 }

src/config/logviewer.php

@@ -2,4 +2,5 @@
 
 return [
     'pattern' => env('LOGVIEWER_PATTERN', '*.log'),
+    'storage_path' => env('LOGVIEWER_STORAGE_PATH', 'logs'),
 ];