mirror_html/DirectoryLister
1
0
Fork 0
mirror of https://github.com/DirectoryLister/DirectoryLister.git synced 2025-08-24 22:46:08 +02:00
Code Issues Projects Releases Wiki Activity

Fixed all files being hidden when no hidden files are defined (oops!)

Browse Source
This commit is contained in:
Chris Kankiewicz
2020-04-20 20:38:05 -07:00
parent d0e1e7c1ab
commit ba90b51025
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/Factories/FinderFactory.php
View File

@@ -48,9 +48,14 @@ class FinderFactory
{
$finder = Finder::create()->followLinks();
$finder->ignoreVCS($this->container->get('hide_vcs_files'));
$finder->filter(function (SplFileInfo $file): bool {
return (bool) ! preg_match($this->hiddenPattern(), $file->getRealPath());
});
if ($this->hiddenFiles()->isNotEmpty()) {
$finder->filter(function (SplFileInfo $file): bool {
return (bool) ! preg_match(Glob::toRegex(
sprintf('%s/{%s}', $this->container->get('base_path'), $this->hiddenFiles()->implode(','))
), $file->getRealPath());
});
}
$sortOrder = $this->container->get('sort_order');
if ($sortOrder instanceof Closure) {
@@ -71,20 +76,16 @@ class FinderFactory
}
/**
* Get the regular expression patern for hidden files.
* Get a collection of hidden file paths.
*
* @return string
* @return \Illuminate\Support\Collection
*/
protected function hiddenPattern(): string
protected function hiddenFiles(): Collection
{
$collection = Collection::make(
return Collection::make(
$this->container->get('hidden_files')
)->when($this->container->get('hide_app_files'), static function (Collection $collection) {
return $collection->merge(self::APP_FILES);
})->unique();
return Glob::toRegex(
sprintf('%s/{%s}', $this->container->get('base_path'), $collection->implode(','))
);
}
}