Add preserveModifiedTime option

YouweGit · Apr 2, 2020 · f506902 · f506902
1 parent 2a52eff
commit f506902
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+.idea/
+composer.lock
+vendor/
+composer.phar
diff --git a/src/Command/TransferFileCommand.php b/src/Command/TransferFileCommand.php
@@ -66,6 +66,13 @@ protected function configure()
                 InputOption::VALUE_OPTIONAL,
                 "Determine if the service retrieve files or push it to the server. Options: put,get",
                 self::OPERATION_UPLOAD
+            )
+            ->addOption(
+                'preservemodifiedtime',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'If source is a directory, preserve the modified time of its containing files',
+                false
             );
     }
 
@@ -75,11 +82,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $target = $input->getArgument('targetfile');
         $serverId = $input->getArgument('targetserverid');
         $method = $input->getOption('method');
+        $preserveModifiedTime = $input->getOption('preservemodifiedtime');
 
         $ftp = $this->ftpServiceBuilder->login($serverId);
 
         if ($method === self::OPERATION_DOWNLOAD) {
-            $ftp->download($source, $target);
+            $ftp->download($source, $target, $preserveModifiedTime);
         } elseif ($method === self::OPERATION_UPLOAD) {
             $ftp->upload($source, $target);
         }

diff --git a/src/Service/FTPService.php b/src/Service/FTPService.php
@@ -21,7 +21,7 @@ public function __construct(SFTP $ftp)
         $this->ftp = $ftp;
     }
 
-    public function download(string $remotePath, string $localPath): void
+    public function download(string $remotePath, string $localPath, bool $preserveModifiedTime): void
     {
         $remoteFiles = (array)$remotePath;
         if ($this->ftp->is_dir($remotePath)) {
@@ -30,14 +30,19 @@ public function download(string $remotePath, string $localPath): void
 
         foreach ($remoteFiles as $remoteFile) {
             if ($this->ftp->is_dir($remoteFile)) {
-                $this->download($remoteFile, rtrim($localPath, DIRECTORY_SEPARATOR) . $remoteFile);
+                $this->download(
+                    $remoteFile,
+                    rtrim($localPath, DIRECTORY_SEPARATOR) . $remoteFile,
+                    $preserveModifiedTime
+                );
             } else {
                 $realLocalPath = str_replace(
                     rtrim($remotePath, DIRECTORY_SEPARATOR),
                     rtrim($localPath, DIRECTORY_SEPARATOR),
                     $remoteFile
                 );
                 $localDirectory = dirname($realLocalPath);
+
                 if (!file_exists($localDirectory)) {
                     try {
                         ErrorHandler::start();
@@ -57,6 +62,11 @@ public function download(string $remotePath, string $localPath): void
                         $this->ftp->getLastError()
                     );
                 }
+
+                if ($preserveModifiedTime) {
+                    $originalFileModifiedTime = $this->ftp->filemtime($remoteFile);
+                    touch($realLocalPath, $originalFileModifiedTime);
+                }
             }
         }
     }

diff --git a/src/Service/FTPServiceInterface.php b/src/Service/FTPServiceInterface.php
@@ -10,10 +10,11 @@ interface FTPServiceInterface
     /**
      * @param string $remotePath
      * @param string $localPath
+     * @param bool $preserveModifiedTime
      * @throws FTPCommandFailed
      * @throws FTPTransferFileFailed
      */
-    public function download(string $remotePath, string $localPath): void;
+    public function download(string $remotePath, string $localPath, bool $preserveModifiedTime): void;
 
     /**
      * @param string $localPath
@@ -22,4 +23,4 @@ public function download(string $remotePath, string $localPath): void;
      * @throws FTPTransferFileFailed
      */
     public function upload(string $localPath, string $remotePath): void;
-}
+}