Merge pull request #994 from yousuf-hossain-shanto/master

Added LfmItem property selection via config
UniSharp · Nov 18, 2020 · d3bac1f · d3bac1f
2 parents a4223ee + 0a9aac3
commit d3bac1f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.lock
 /docs/Gemfile.lock
 /docs/_site
 .DS_Store
+/.idea
diff --git a/src/LfmItem.php b/src/LfmItem.php
@@ -12,14 +12,15 @@ class LfmItem
     private $isDirectory;
     private $mimeType = null;
 
-    private $columns = ['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url'];
+    private $columns = [];
     public $attributes = [];
 
     public function __construct(LfmPath $lfm, Lfm $helper, $isDirectory = false)
     {
         $this->lfm = $lfm->thumb(false);
         $this->helper = $helper;
         $this->isDirectory = $isDirectory;
+        $this->columns = $helper->config('item_columns')??['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url'];
     }
 
     public function __get($var_name)

diff --git a/src/config/lfm.php b/src/config/lfm.php
@@ -109,6 +109,9 @@
     // setting it to false show `error-file-exist` error and stop upload
     'over_write_on_duplicate'  => false,
 
+    // Item Columns
+    'item_columns' => ['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url'],
+
     /*
     |--------------------------------------------------------------------------
     | Thumbnail

diff --git a/tests/LfmItemTest.php b/tests/LfmItemTest.php
@@ -19,6 +19,7 @@ public function setUp()
 
         $this->lfm_path = m::mock(LfmPath::class);
         $this->lfm_path->shouldReceive('thumb')->andReturn($this->lfm_path);
+        $this->lfm->shouldReceive('config')->with('item_columns')->andReturn(['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url']);
     }
 
     public function tearDown()
@@ -30,7 +31,7 @@ public function tearDown()
 
     public function testMagicGet()
     {
-        $this->lfm_item = new LfmItem($this->lfm_path, m::mock(Lfm::class));
+        $this->lfm_item = new LfmItem($this->lfm_path, $this->lfm);
 
         $this->lfm_item->attributes['foo'] = 'bar';
 

diff --git a/tests/LfmPathTest.php b/tests/LfmPathTest.php
@@ -126,6 +126,7 @@ public function testFolders()
         $helper->shouldReceive('getThumbFolderName')->andReturn('thumbs');
         $helper->shouldReceive('isRunningOnWindows')->andReturn(false);
         $helper->shouldReceive('ds')->andReturn('/');
+        $helper->shouldReceive('config')->with('item_columns')->andReturn(['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url']);
 
         $path = new LfmPath($helper);
 
@@ -145,6 +146,7 @@ public function testFiles()
         $helper->shouldReceive('getNameFromPath')->andReturn('bar');
         $helper->shouldReceive('isRunningOnWindows')->andReturn(false);
         $helper->shouldReceive('ds')->andReturn('/');
+        $helper->shouldReceive('config')->with('item_columns')->andReturn(['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url']);
 
         $path = new LfmPath($helper);
 
@@ -156,6 +158,7 @@ public function testPretty()
         $helper = m::mock(Lfm::class);
         $helper->shouldReceive('getNameFromPath')->andReturn('bar');
         $helper->shouldReceive('isRunningOnWindows')->andReturn(false);
+        $helper->shouldReceive('config')->with('item_columns')->andReturn(['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url']);
 
         $path = new LfmPath($helper);