Skip to content

Upd. Scan. Improve Surface flow to count files. #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
svfcode merged 4 commits into from
May 4, 2026
Merged

Upd. Scan. Improve Surface flow to count files. #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58b11af
Upd. Scan. Improve Surface flow to count files.
svfcode Apr 30, 2026
3ccddf8
Upd. Scan. Improve Surface flow to count files.
svfcode Apr 30, 2026
a419b58
Upd. Scan. Improve Surface flow to count files.
svfcode Apr 30, 2026
de234f5
Upd. Scan. Improve Surface flow to count files.
svfcode Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/CleantalkSP/SpbctWP/Scanner/ScannerQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,6 +1552,9 @@ public function signature_analysis($status = 'UNKNOWN,MODIFIED,OK,INFECTED,ERROR
}
}

if ( ! isset($spbc->data['scanner']['scanned_total']) ) {
$spbc->data['scanner']['scanned_total'] = 0;
}
$spbc->data['scanner']['scanned_total'] += $scanned;
$spbc->save('data');

Expand Down
39 changes: 18 additions & 21 deletions lib/CleantalkSP/SpbctWP/Scanner/Surface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,26 +601,25 @@ public function getFileStructure($main_path, $iterator_result, $is_root_dir)
return $iterator_result;
}

try {
$it = new \FilesystemIterator(
$main_path,
\FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::KEY_AS_FILENAME
);
if ( ! is_readable($main_path) ) {
return $iterator_result;
}

if (!$is_root_dir) {
$iterator_last_dir_offset = 0;
try {
$scan = @scandir($main_path, SCANDIR_SORT_NONE);
if ( $scan === false ) {
return $iterator_result;
}
sort($scan, SORT_STRING);

foreach ( $it as $file_name => $path ) {
if ( ! $path ) {
continue;
}
$iterator_last_dir_offset = 0;

if ( $file_name === ".." || $file_name === "." ) {
foreach ( $scan as $file_name ) {
if ( $file_name === '..' || $file_name === '.' ) {
continue;
}

$path = (string) $path;
$path = $main_path . DIRECTORY_SEPARATOR . $file_name;

if ( is_file($path) && !is_link($path) ) {
// Extensions filter
Expand Down Expand Up @@ -658,21 +657,19 @@ public function getFileStructure($main_path, $iterator_result, $is_root_dir)

$this->output_counter_files++;

// Skip if start is not reached for inner last dir
if ( !$is_root_dir ) {
$iterator_last_dir_offset++;
if ( $it->getPath() === $this->last_dir_on_exit && $iterator_last_dir_offset - 1 < $this->output_files_offset ) {
continue;
}
// Resume in this directory (root or subdir): skip first on_exit_dir_offset matching files.
$iterator_last_dir_offset++;
if ( $main_path === $this->last_dir_on_exit && $iterator_last_dir_offset - 1 < $this->output_files_offset ) {
continue;
}

$this->output_files[]['path'] = $path;

// Return if file limit is reached
if ($this->output_counter_files >= $this->output_files_maximum ) {
$iterator_result->max_files_interrupt = true;
$iterator_result->on_exit_dir_path = $it->getPath();
$iterator_result->on_exit_dir_offset = isset($iterator_last_dir_offset) ? $iterator_last_dir_offset : 0;
$iterator_result->on_exit_dir_path = $main_path;
$iterator_result->on_exit_dir_offset = $iterator_last_dir_offset;
return $iterator_result;
}
} elseif ( is_dir($path) && !is_link($path) ) {
Expand Down
Loading