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

* Upd. Scan. Improve Surface flow to count files.

* Upd. Scan. Improve Surface flow to count files.

* Upd. Scan. Improve Surface flow to count files.

* Upd. Scan. Improve Surface flow to count files.

Author: svfcode

lib/CleantalkSP/SpbctWP/Scanner/ScannerQueue.php

@@ -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');
 

lib/CleantalkSP/SpbctWP/Scanner/Surface.php

@@ -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
@@ -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) ) {