Added option to ignore files/folders on remote side

readme.md

@@ -79,6 +79,9 @@ ignore = "
  !temp/.htaccess
 "
 
+; if no, ignore section will be taken into account on remote side (default is yes)
+ignoreRemote = yes
+
 ; explicit list of files and directories to include (by default includes all files and directories)
 include = "
  /app

src/Deployment/CliRunner.php

@@ -21,6 +21,7 @@ class CliRunner
  'passivemode' => true,
  'include' => '',
  'ignore' => '',
+ 'ignoreremote' => true,
  'allowdelete' => true,
  'purge' => '',
  'before' => '',
@@ -169,6 +170,7 @@ private function createDeployer(array $config): Deployer
  ? $deployment->deploymentFile
  : $config['deploymentfile'];
  $deployment->allowDelete = (bool) $config['allowdelete'];
+ $deployment->ignoreRemote = (bool) $config['ignoreremote'];
  $deployment->toPurge = self::toArray($config['purge'], true);
  $deployment->runBefore = self::toArray($config['before'], true);
  $deployment->runAfterUpload = self::toArray($config['afterupload'], true);

src/Deployment/Deployer.php

@@ -26,6 +26,8 @@ class Deployer
  /** @var string[] */
  public array $ignoreMasks = [];
 
+ public bool $ignoreRemote = true;
+
  public bool $testMode = false;
 
  public bool $allowDelete = false;
@@ -227,7 +229,13 @@ private function loadDeploymentFile(): ?array
  $res = [];
  foreach (explode("\n", $content) as $item) {
  if (count($item = explode('=', $item, 2)) === 2) {
- $res[$item[1]] = $item[0] === '1' ? true : $item[0];
+ if ($this->ignoreRemote === true) {
+ $res[$item[1]] = $item[0] === '1' ? true : $item[0];
+ }else {
+ if (Helpers::matchMask($item[1], $this->ignoreMasks, is_dir("$this->remoteDir/$item[1]")) === false) {
+ $res[$item[1]] = $item[0] === '1' ? true : $item[0];
+ }
+ }
  }
  }
  return $res;