Recursively lock folder contents

1 files changed, 27 insertions, 6 deletions

diff --git a/lib/private/files.php b/lib/private/files.php
index af3a8ac574d..099602d56b0 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -40,6 +40,7 @@
  *
  */
 
+use OC\Files\View;
 use OC\Streamer;
 use OCP\Lock\ILockingProvider;
 
@@ -123,14 +124,10 @@ class OC_Files {
 				$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 			}
 			if ($getType === self::ZIP_FILES) {
-				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
-					$view->lockFile($file, ILockingProvider::LOCK_SHARED);
-				}
+				self::lockFiles($view, $dir, $files);
 			}
 			if ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
-				$view->lockFile($file, ILockingProvider::LOCK_SHARED);
+				self::lockFiles($view, $dir, $files);
 			}
 
 			if ($streamer) {
@@ -190,6 +187,30 @@ class OC_Files {
 	}
 
 	/**
+	 * @param View $view
+	 * @param $dir
+	 * @param string[]|string $files
+	 */
+	public static function lockFiles($view, $dir, $files) {
+		if (!is_array($files)) {
+			$file = $dir . '/' . $files;
+			$files = [$file];
+		}
+		foreach ($files as $file) {
+			$file = $dir . '/' . $file;
+			$view->lockFile($file, ILockingProvider::LOCK_SHARED);
+			if ($view->is_dir($file)) {
+				$contents = $view->getDirectoryContent($file);
+				$contents = array_map(function($fileInfo) use ($file) {
+					/** @var \OCP\Files\FileInfo $fileInfo */
+					return $file . '/' . $fileInfo->getName();
+				}, $contents);
+				self::lockFiles($view, $dir, $contents);
+			}
+		}
+	}
+
+	/**
 	 * set the maximum upload size limit for apache hosts using .htaccess
 	 *
 	 * @param int $size file size in bytes