add support for absolute paths

Author: florisbosch

config/log-viewer.php

@@ -66,8 +66,10 @@
     |--------------------------------------------------------------------------
     |
     */
+    'disable_absolute_filepaths' => env('LOG_VIEWER_DISABLE_ABSOLUTE_FILEPATHS',  false),
+
     'filesystem' => [
-        'root' => env('LOG_VIEWER_FILESYSTEM_ROOT', ''),
+        'root' => env('LOG_VIEWER_FILESYSTEM_ROOT',''),
         'disk' => env('LOG_VIEWER_FILESYSTEM_DISK', 'log-viewer-local'),
     ],
 

src/Facades/LogViewer.php

@@ -20,7 +20,7 @@
  * @method static void clearFileCache()
  * @method static string|null getRouteDomain()
  * @method static array getRouteMiddleware()
- * @method static Filesystem getFilesystem()
+ * @method static Filesystem getFilesystem($absolutePath = '')
  * @method static string getRoutePrefix()
  * @method static void auth($callback = null)
  * @method static void setMaxLogSize(int $bytes)

src/LogFile.php

@@ -8,6 +8,7 @@
 use Opcodes\LogViewer\Exceptions\InvalidRegularExpression;
 use Opcodes\LogViewer\Facades\LogViewer;
 use Opcodes\LogViewer\Utils\Utils;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class LogFile
@@ -16,25 +17,28 @@ class LogFile
     use Concerns\LogFile\CanCacheData;
 
     public string $path;
-
     public string $name;
-
     public string $identifier;
-
+    public string $absolutePath = '';
     public string $subFolder = '';
-
     private array $_logIndexCache;
 
     public function __construct(string $path)
     {
+        $pathInfo = pathinfo($path);
         $this->path = $path;
-        $this->name = basename($path);
+        $this->name = $pathInfo['basename'];
         $this->identifier = Str::substr(md5($path), -8, 8).'-'.$this->name;
 
         // Let's remove the file name because we already know it.
         $this->subFolder = str_replace($this->name, '', $path);
         $this->subFolder = rtrim($this->subFolder, DIRECTORY_SEPARATOR);
 
+        if (str_starts_with($path, DIRECTORY_SEPARATOR)) {
+            $this->absolutePath = pathinfo($path)['dirname'];
+            $this->path         = pathinfo($path)['basename'];
+        }
+
         $this->loadMetadata();
     }
 
@@ -54,9 +58,7 @@ public function logs(): LogReader
 
     public function size(): int
     {
-        return LogViewer::getFilesystem()->exists($this->path)
-            ? LogViewer::getFilesystem()->size($this->path)
-            : 0;
+        return LogViewer::getFilesystem($this->absolutePath)->size($this->path);
     }
 
     public function sizeInMB(): float
@@ -81,7 +83,7 @@ public function downloadUrl(): string
 
     public function download(): StreamedResponse
     {
-        return LogViewer::getFilesystem()->download($this->path);
+        return LogViewer::getFilesystem($this->absolutePath)->download($this->path);
     }
 
     public function addRelatedIndex(LogIndex $logIndex): void
@@ -109,15 +111,13 @@ public function getLastScannedFilePositionForQuery(?string $query = ''): ?int
     public function earliestTimestamp(): int
     {
         return $this->getMetadata('earliest_timestamp')
-            ?? 0;
-//            ?? LogViewer::getFilesystem()->exists($this->path) ? LogViewer::getFilesystem()->lastModified($this->path) : 0;
+            ?? LogViewer::getFilesystem($this->absolutePath)->lastModified($this->path);
     }
 
     public function latestTimestamp(): int
     {
         return $this->getMetadata('latest_timestamp')
-            ?? 0;
-//            ?? LogViewer::getFilesystem()->exists($this->path) ? LogViewer::getFilesystem()->lastModified($this->path) : 0;
+            ?? LogViewer::getFilesystem($this->absolutePath)->lastModified($this->path);
     }
 
     public function scan(int $maxBytesToScan = null, bool $force = false): void
@@ -141,7 +141,7 @@ public function search(string $query = null): LogReader
     public function delete(): void
     {
         $this->clearCache();
-        LogViewer::getFilesystem()->delete($this->path);
+        LogViewer::getFilesystem($this->absolutePath)->delete($this->path);
         LogFileDeleted::dispatch($this);
     }
 }

src/LogReader.php

@@ -163,7 +163,7 @@ public function open(): self
             return $this;
         }
 
-        $this->fileHandle = LogViewer::getFilesystem()->readStream($this->file->path);
+        $this->fileHandle = LogViewer::getFilesystem($this->file->absolutePath)->readStream($this->file->path);
 
         if ($this->fileHandle === false) {
             throw new \Exception('Could not open "'.$this->file->path.'" for reading.');

src/LogViewerService.php

@@ -38,31 +38,48 @@ protected function getFilePaths(): array
         );
 
         foreach (config('log-viewer.include_files', []) as $pattern) {
+            $absolute = true;
             if (! str_starts_with($pattern, DIRECTORY_SEPARATOR)) {
                 $pattern = $baseDir.$pattern;
+                $absolute = false;
             }
 
-            $files = array_merge($files, $this->getFilePathsMatchingPattern($pattern));
+            $files = array_merge($files, $this->getFilePathsMatchingPattern($pattern, $absolute));
         }
 
         foreach (config('log-viewer.exclude_files', []) as $pattern) {
+            $absolute = true;
             if (! str_starts_with($pattern, DIRECTORY_SEPARATOR)) {
                 $pattern = $baseDir.$pattern;
+                $absolute = false;
             }
 
-            $files = array_diff($files, $this->getFilePathsMatchingPattern($pattern));
+            $files = array_diff($files, $this->getFilePathsMatchingPattern($pattern, $absolute));
         }
 
         return array_values(array_reverse($files));
     }
 
-    protected function getFilePathsMatchingPattern($pattern)
+    protected function getFilePathsMatchingPattern($pattern, $absolute = false): array
     {
         $files = [];
 
-        foreach ($this->getFilesystem()->allFiles($this->basePathForLogs()) as $file) {
+        if (!$absolute) {
+            $scannedFiles = $this->getFilesystem()->allFiles($this->basePathForLogs());
+        } else {
+            $pathInfo = pathinfo($pattern);
+            $dirname = $pathInfo['dirname'];
+            $pattern = $pathInfo['basename'];
+
+            $scannedFiles = $this->getFilesystem($dirname)->allFiles();
+        }
+
+        foreach($scannedFiles as $file)
+        {
             if (preg_match(pattern: Glob::toRegex(glob: $pattern), subject: $file)) {
-                $files[] = $file;
+                $files[] = isset($dirname)
+                    ? $dirname . DIRECTORY_SEPARATOR . $file
+                    : $file;
             }
         }
 
@@ -72,7 +89,6 @@ protected function getFilePathsMatchingPattern($pattern)
     public function basePathForLogs(): string
     {
         $rootFolder = Str::of(config('log-viewer.filesystem.root'));
-
         return empty($rootFolder)
             ? $rootFolder->finish('/')
             : $rootFolder;
@@ -153,8 +169,17 @@ public function getRouteMiddleware(): array
         return config('log-viewer.middleware', []) ?: ['web'];
     }
 
-    public function getFilesystem(): Filesystem
+    public function getFilesystem($absolutePath = ''): Filesystem
     {
+        if (!config('disable_absolute_filepaths') && ($absolutePath !== '') && is_dir($absolutePath)) {
+            config()->set('filesystems.disks.log-viewer-absolute', [
+                'driver' => 'local',
+                'root' => $absolutePath,
+            ]);
+
+            return Storage::disk('log-viewer-absolute');
+        }
+
         return Storage::disk(config('log-viewer.filesystem.disk'));
     }