up: update the dir copy and file tree build

Author: inhere

src/Directory.php

@@ -265,10 +265,18 @@ public static function mkSubDirs(string $parentDir, array $subDirs, int $mode =
     /**
      * Copy dir files, contains sub-dir.
      *
-     * @param string $oldDir
-     * @param string $newDir
+     * ### $options
+     *
+     * - skipExist: bool, whether skip exist file.
+     * - filterFn: callback func on handle each file.
+     * - beforeFn: callback func on before copy file.
+     * - afterFn: callback func on after copy file.
+     *
+     * @param string $oldDir source directory path.
+     * @param string $newDir target directory path.
      * @param array $options = [
      *     'skipExist' => true,
+     *     'filterFn' => function (string $old): bool { },
      *     'beforeFn' => function (string $old, string $new): bool { },
      *     'afterFn' => function (string $new): void { },
      * ]
@@ -278,11 +286,12 @@ public static function mkSubDirs(string $parentDir, array $subDirs, int $mode =
     public static function copy(string $oldDir, string $newDir, array $options = []): bool
     {
         if (!is_dir($oldDir)) {
-            throw new FileNotFoundException('copy failed：' . $oldDir . ' does not exist！');
+            throw new FileNotFoundException("copy error：source dir does not exist！path: $oldDir");
         }
 
         self::doCopy($oldDir, $newDir, array_merge([
             'skipExist' => true,
+            'filterFn'  => null,
             'beforeFn'  => null,
             'afterFn'   => null,
         ], $options));
@@ -301,6 +310,7 @@ private static function doCopy(string $oldDir, string $newDir, array $options):
     {
         self::create($newDir);
         $beforeFn = $options['beforeFn'];
+        $filterFn = $options['filterFn'];
 
         // use '{,.}*' match hidden files
         foreach (glob($oldDir . '/{,.}*', GLOB_BRACE) as $old) {
@@ -316,6 +326,11 @@ private static function doCopy(string $oldDir, string $newDir, array $options):
                 continue;
             }
 
+            // return false to skip copy
+            if ($filterFn && !$filterFn($old)) {
+                continue;
+            }
+
             // return false to skip copy
             if ($beforeFn && !$beforeFn($old, $new)) {
                 continue;

src/Extra/FileTreeBuilder.php

@@ -144,18 +144,17 @@ public function copyDir(string $srcDir, string $dstDir, array $options = []): se
         $this->printMsg("copy dir $srcDir to $dstDir");
 
         Dir::copy($srcDir, $dstDir, [
-            'beforeFn' => function (string $oldFile) use ($options): bool {
-                if ($this->dryRun) {
-                    $this->printMsgf('- copy file %s', $oldFile);
-                    return false;
-                }
-
+            'filterFn' => function (string $oldFile) use ($options): bool {
                 if ($options['include']) {
                     return File::isInclude($oldFile, $options['include']);
                 }
-
                 return !File::isExclude($oldFile, $options['exclude']);
             },
+            'beforeFn' => function (string $oldFile, string $newFile): bool {
+                $this->printMsgf('- copy file %s to %s', $oldFile, $newFile);
+
+                return !$this->dryRun;
+            },
             'afterFn'  => function (string $newFile) use ($options) {
                 if ($fn = $options['afterFn']) {
                     $fn($newFile);