blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-06-07 12:38:11 +08:00
Code Issues Projects Releases Wiki Activity

fix: 进一步优化路扫描

Browse Source
This commit is contained in:
邹景立 2024-09-09 23:49:10 +08:00
parent ee6783804e
commit 24b5dbcbeb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/think-library/src/extend/ToolsExtend.php
View File

@ -22,6 +22,7 @@ use Closure;
use FilesystemIterator; use FilesystemIterator;
use Generator; use Generator;
use SplFileInfo; use SplFileInfo;
use think\File;
/** /**
* 通用工具扩展 * 通用工具扩展
@ -106,11 +107,16 @@ class ToolsExtend
*/ */
public static function findFilesArray(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $shortPath = true, ?int $depth = null): array public static function findFilesArray(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $shortPath = true, ?int $depth = null): array
{ {
if (!file_exists($path)) return []; if (is_dir($path)) {
$pathLength = $shortPath ? strlen(realpath($path)) + 1 : 0; $pathSize = $shortPath ? strlen(realpath($path)) + 1 : 0;
return file_exists($path) ? array_map(function ($file) use ($shortPath, $pathLength) { return file_exists($path) ? array_map(function ($file) use ($pathSize, $shortPath) {
return $shortPath ? substr($file->getRealPath(), $pathLength) : $file->getRealPath(); return $shortPath ? substr($file->getRealPath(), $pathSize) : $file->getRealPath();
}, iterator_to_array(static::findFilesYield($path, $filterFile, $filterPath, false, $depth))) : []; }, iterator_to_array(static::findFilesYield($path, $filterFile, $filterPath, false, $depth))) : [];
} elseif (is_file($path)) {
return $filterFile === null || $filterFile(new SplFileInfo($path)) ? [basename($path)] : [];
} else {
return [];
}
} }
/** /**
@ -125,7 +131,7 @@ class ToolsExtend
private static function findFilesYield(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $appendPath = false, ?int $depth = null): Generator private static function findFilesYield(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $appendPath = false, ?int $depth = null): Generator
{ {
if (!file_exists($path)) return; if (!file_exists($path)) return;
foreach (is_file($path) ? [new SplFileInfo($path)] : new FilesystemIterator($path) as $item) { foreach (is_file($path) ? [new SplFileInfo($path)] : new FilesystemIterator($path, FilesystemIterator::SKIP_DOTS) as $item) {
$isDir = $item->isDir() && !$item->isLink(); $isDir = $item->isDir() && !$item->isLink();
if ($isDir && ($filterPath === null || $filterPath($item))) { if ($isDir && ($filterPath === null || $filterPath($item))) {
if ($depth === null || $depth > 0) { if ($depth === null || $depth > 0) {
@ -137,6 +143,4 @@ class ToolsExtend
} }
} }
} }
} }