nextcloud / server

lib/private/Files/ObjectStore/S3ObjectTrait.php

Indentation +81 added lines, -81 removed lines

@@ -35,93 +35,93 @@
 const S3_UPLOAD_PART_SIZE = 524288000; // 500MB
 
 trait S3ObjectTrait {
-	/**
-	 * Returns the connection
-	 *
-	 * @return S3Client connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	abstract protected function getConnection();
+    /**
+     * Returns the connection
+     *
+     * @return S3Client connected client
+     * @throws \Exception if connection could not be made
+     */
+    abstract protected function getConnection();
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception when something goes wrong, message will be logged
-	 * @since 7.0.0
-	 */
-	function readObject($urn) {
-		return SeekableHttpStream::open(function ($range) use ($urn) {
-			$command = $this->getConnection()->getCommand('GetObject', [
-				'Bucket' => $this->bucket,
-				'Key' => $urn,
-				'Range' => 'bytes=' . $range,
-			]);
-			$request = \Aws\serialize($command);
-			$headers = [];
-			foreach ($request->getHeaders() as $key => $values) {
-				foreach ($values as $value) {
-					$headers[] = "$key: $value";
-				}
-			}
-			$opts = [
-				'http' => [
-					'protocol_version' => 1.1,
-					'header' => $headers,
-				],
-			];
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception when something goes wrong, message will be logged
+     * @since 7.0.0
+     */
+    function readObject($urn) {
+        return SeekableHttpStream::open(function ($range) use ($urn) {
+            $command = $this->getConnection()->getCommand('GetObject', [
+                'Bucket' => $this->bucket,
+                'Key' => $urn,
+                'Range' => 'bytes=' . $range,
+            ]);
+            $request = \Aws\serialize($command);
+            $headers = [];
+            foreach ($request->getHeaders() as $key => $values) {
+                foreach ($values as $value) {
+                    $headers[] = "$key: $value";
+                }
+            }
+            $opts = [
+                'http' => [
+                    'protocol_version' => 1.1,
+                    'header' => $headers,
+                ],
+            ];
 
-			$context = stream_context_create($opts);
-			return fopen($request->getUri(), 'r', false, $context);
-		});
-	}
+            $context = stream_context_create($opts);
+            return fopen($request->getUri(), 'r', false, $context);
+        });
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @throws \Exception when something goes wrong, message will be logged
-	 * @since 7.0.0
-	 */
-	function writeObject($urn, $stream) {
-		$count = 0;
-		$countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) {
-			$count += $read;
-		});
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @throws \Exception when something goes wrong, message will be logged
+     * @since 7.0.0
+     */
+    function writeObject($urn, $stream) {
+        $count = 0;
+        $countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) {
+            $count += $read;
+        });
 
-		$uploader = new MultipartUploader($this->getConnection(), $countStream, [
-			'bucket' => $this->bucket,
-			'key' => $urn,
-			'part_size' => S3_UPLOAD_PART_SIZE,
-		]);
+        $uploader = new MultipartUploader($this->getConnection(), $countStream, [
+            'bucket' => $this->bucket,
+            'key' => $urn,
+            'part_size' => S3_UPLOAD_PART_SIZE,
+        ]);
 
-		try {
-			$uploader->upload();
-		} catch (S3MultipartUploadException $e) {
-			// This is an empty file so just touch it then
-			if ($count === 0 && feof($countStream)) {
-				$uploader = new ObjectUploader($this->getConnection(), $this->bucket, $urn, '');
-				$uploader->upload();
-			} else {
-				throw $e;
-			}
-		}
+        try {
+            $uploader->upload();
+        } catch (S3MultipartUploadException $e) {
+            // This is an empty file so just touch it then
+            if ($count === 0 && feof($countStream)) {
+                $uploader = new ObjectUploader($this->getConnection(), $this->bucket, $urn, '');
+                $uploader->upload();
+            } else {
+                throw $e;
+            }
+        }
 
-		fclose($countStream);
-	}
+        fclose($countStream);
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return void
-	 * @throws \Exception when something goes wrong, message will be logged
-	 * @since 7.0.0
-	 */
-	function deleteObject($urn) {
-		$this->getConnection()->deleteObject([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-		]);
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return void
+     * @throws \Exception when something goes wrong, message will be logged
+     * @since 7.0.0
+     */
+    function deleteObject($urn) {
+        $this->getConnection()->deleteObject([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+        ]);
+    }
 
-	public function objectExists($urn) {
-		return $this->getConnection()->doesObjectExist($this->bucket, $urn);
-	}
+    public function objectExists($urn) {
+        return $this->getConnection()->doesObjectExist($this->bucket, $urn);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -50,11 +50,11 @@ 
 	 * @since 7.0.0
 	 */
 	function readObject($urn) {
-		return SeekableHttpStream::open(function ($range) use ($urn) {
+		return SeekableHttpStream::open(function($range) use ($urn) {
 			$command = $this->getConnection()->getCommand('GetObject', [
 				'Bucket' => $this->bucket,
 				'Key' => $urn,
-				'Range' => 'bytes=' . $range,
+				'Range' => 'bytes='.$range,
 			]);
 			$request = \Aws\serialize($command);
 			$headers = [];
@@ -83,7 +83,7 @@ 
 	 */
 	function writeObject($urn, $stream) {
 		$count = 0;
-		$countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) {
+		$countStream = CallbackWrapper::wrap($stream, function($read) use (&$count) {
 			$count += $read;
 		});
 

lib/private/Files/Stream/SeekableHttpStream.php

Indentation +151 added lines, -151 removed lines

@@ -28,155 +28,155 @@
  * A stream wrapper that uses http range requests to provide a seekable stream for http reading
  */
 class SeekableHttpStream implements File {
-	private const PROTOCOL = 'httpseek';
-
-	private static $registered = false;
-
-	/**
-	 * Registers the stream wrapper using the `httpseek://` url scheme
-	 * $return void
-	 */
-	private static function registerIfNeeded() {
-		if (!self::$registered) {
-			stream_wrapper_register(
-				self::PROTOCOL,
-				self::class
-			);
-			self::$registered = true;
-		}
-	}
-
-	/**
-	 * Open a readonly-seekable http stream
-	 *
-	 * The provided callback will be called with byte range and should return an http stream for the requested range
-	 *
-	 * @param callable $callback
-	 * @return false|resource
-	 */
-	public static function open(callable $callback) {
-		$context = stream_context_create([
-			SeekableHttpStream::PROTOCOL => [
-				'callback' => $callback
-			],
-		]);
-
-		SeekableHttpStream::registerIfNeeded();
-		return fopen(SeekableHttpStream::PROTOCOL . '://', 'r', false, $context);
-	}
-
-	/** @var resource */
-	public $context;
-
-	/** @var callable */
-	private $openCallback;
-
-	/** @var resource */
-	private $current;
-	/** @var int */
-	private $offset = 0;
-
-	private function reconnect(int $start) {
-		$range = $start . '-';
-		if ($this->current != null) {
-			fclose($this->current);
-		}
-
-		$this->current = ($this->openCallback)($range);
-
-		if ($this->current === false) {
-			return false;
-		}
-
-		$responseHead = stream_get_meta_data($this->current)['wrapper_data'];
-		$rangeHeaders = array_values(array_filter($responseHead, function ($v) {
-			return preg_match('#^content-range:#i', $v) === 1;
-		}));
-		if (!$rangeHeaders) {
-			return false;
-		}
-		$contentRange = $rangeHeaders[0];
-
-		$content = trim(explode(':', $contentRange)[1]);
-		$range = trim(explode(' ', $content)[1]);
-		$begin = intval(explode('-', $range)[0]);
-
-		if ($begin !== $start) {
-			return false;
-		}
-
-		$this->offset = $begin;
-
-		return true;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$options = stream_context_get_options($this->context)[self::PROTOCOL];
-		$this->openCallback = $options['callback'];
-
-		return $this->reconnect(0);
-	}
-
-	public function stream_read($count) {
-		if (!$this->current) {
-			return false;
-		}
-		$ret = fread($this->current, $count);
-		$this->offset += strlen($ret);
-		return $ret;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		switch ($whence) {
-			case SEEK_SET:
-				if ($offset === $this->offset) {
-					return true;
-				}
-				return $this->reconnect($offset);
-			case SEEK_CUR:
-				if ($offset === 0) {
-					return true;
-				}
-				return $this->reconnect($this->offset + $offset);
-			case SEEK_END:
-				return false;
-		}
-		return false;
-	}
-
-	public function stream_tell() {
-		return $this->offset;
-	}
-
-	public function stream_stat() {
-		return fstat($this->current);
-	}
-
-	public function stream_eof() {
-		return feof($this->current);
-	}
-
-	public function stream_close() {
-		fclose($this->current);
-	}
-
-	public function stream_write($data) {
-		return false;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		return; //noop because readonly stream
-	}
+    private const PROTOCOL = 'httpseek';
+
+    private static $registered = false;
+
+    /**
+     * Registers the stream wrapper using the `httpseek://` url scheme
+     * $return void
+     */
+    private static function registerIfNeeded() {
+        if (!self::$registered) {
+            stream_wrapper_register(
+                self::PROTOCOL,
+                self::class
+            );
+            self::$registered = true;
+        }
+    }
+
+    /**
+     * Open a readonly-seekable http stream
+     *
+     * The provided callback will be called with byte range and should return an http stream for the requested range
+     *
+     * @param callable $callback
+     * @return false|resource
+     */
+    public static function open(callable $callback) {
+        $context = stream_context_create([
+            SeekableHttpStream::PROTOCOL => [
+                'callback' => $callback
+            ],
+        ]);
+
+        SeekableHttpStream::registerIfNeeded();
+        return fopen(SeekableHttpStream::PROTOCOL . '://', 'r', false, $context);
+    }
+
+    /** @var resource */
+    public $context;
+
+    /** @var callable */
+    private $openCallback;
+
+    /** @var resource */
+    private $current;
+    /** @var int */
+    private $offset = 0;
+
+    private function reconnect(int $start) {
+        $range = $start . '-';
+        if ($this->current != null) {
+            fclose($this->current);
+        }
+
+        $this->current = ($this->openCallback)($range);
+
+        if ($this->current === false) {
+            return false;
+        }
+
+        $responseHead = stream_get_meta_data($this->current)['wrapper_data'];
+        $rangeHeaders = array_values(array_filter($responseHead, function ($v) {
+            return preg_match('#^content-range:#i', $v) === 1;
+        }));
+        if (!$rangeHeaders) {
+            return false;
+        }
+        $contentRange = $rangeHeaders[0];
+
+        $content = trim(explode(':', $contentRange)[1]);
+        $range = trim(explode(' ', $content)[1]);
+        $begin = intval(explode('-', $range)[0]);
+
+        if ($begin !== $start) {
+            return false;
+        }
+
+        $this->offset = $begin;
+
+        return true;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $options = stream_context_get_options($this->context)[self::PROTOCOL];
+        $this->openCallback = $options['callback'];
+
+        return $this->reconnect(0);
+    }
+
+    public function stream_read($count) {
+        if (!$this->current) {
+            return false;
+        }
+        $ret = fread($this->current, $count);
+        $this->offset += strlen($ret);
+        return $ret;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        switch ($whence) {
+            case SEEK_SET:
+                if ($offset === $this->offset) {
+                    return true;
+                }
+                return $this->reconnect($offset);
+            case SEEK_CUR:
+                if ($offset === 0) {
+                    return true;
+                }
+                return $this->reconnect($this->offset + $offset);
+            case SEEK_END:
+                return false;
+        }
+        return false;
+    }
+
+    public function stream_tell() {
+        return $this->offset;
+    }
+
+    public function stream_stat() {
+        return fstat($this->current);
+    }
+
+    public function stream_eof() {
+        return feof($this->current);
+    }
+
+    public function stream_close() {
+        fclose($this->current);
+    }
+
+    public function stream_write($data) {
+        return false;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        return; //noop because readonly stream
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 		]);
 
 		SeekableHttpStream::registerIfNeeded();
-		return fopen(SeekableHttpStream::PROTOCOL . '://', 'r', false, $context);
+		return fopen(SeekableHttpStream::PROTOCOL.'://', 'r', false, $context);
 	}
 
 	/** @var resource */
@@ -77,7 +77,7 @@ 
 	private $offset = 0;
 
 	private function reconnect(int $start) {
-		$range = $start . '-';
+		$range = $start.'-';
 		if ($this->current != null) {
 			fclose($this->current);
 		}
@@ -89,7 +89,7 @@ 
 		}
 
 		$responseHead = stream_get_meta_data($this->current)['wrapper_data'];
-		$rangeHeaders = array_values(array_filter($responseHead, function ($v) {
+		$rangeHeaders = array_values(array_filter($responseHead, function($v) {
 			return preg_match('#^content-range:#i', $v) === 1;
 		}));
 		if (!$rangeHeaders) {