Inspection of "Merge pull request #18955 from adrb/swift_upload_l..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 3bf4e7...d5850e )

by Roeland

created 2020-05-06 11:03 UTC

Status

Indentation +112 added lines, -112 removed lines patch added patch discarded remove patch

@@ -36,116 +36,116 @@
 block discarded – undo
 const SWIFT_SEGMENT_SIZE = 1073741824; // 1GB
 
 class Swift implements IObjectStore {
-	/**
-	 * @var array
-	 */
-	private $params;
-
-	/** @var SwiftFactory */
-	private $swiftFactory;
-
-	public function __construct($params, SwiftFactory $connectionFactory = null) {
-		$this->swiftFactory = $connectionFactory ?: new SwiftFactory(
-			\OC::$server->getMemCacheFactory()->createDistributed('swift::'),
-			$params,
-			\OC::$server->getLogger()
-		);
-		$this->params = $params;
-	}
-
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function getContainer() {
-		return $this->swiftFactory->getContainer();
-	}
-
-	/**
-	 * @return string the container name where objects are stored
-	 */
-	public function getStorageId() {
-		if (isset($this->params['bucket'])) {
-			return $this->params['bucket'];
-		}
-
-		return $this->params['container'];
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function writeObject($urn, $stream) {
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
-		file_put_contents($tmpFile, $stream);
-		$handle = fopen($tmpFile, 'rb');
-
-		if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
-			$this->getContainer()->createObject([
-				'name' => $urn,
-				'stream' => stream_for($handle)
-			]);
-		} else {
-			$this->getContainer()->createLargeObject([
-				'name' => $urn,
-				'stream' => stream_for($handle),
-				'segmentSize' => SWIFT_SEGMENT_SIZE
-			]);
-		}
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
-	 * @throws NotFoundException if file does not exist
-	 */
-	public function readObject($urn) {
-		try {
-			$publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
-			$tokenId = $this->swiftFactory->getCachedTokenId();
-
-			$response = (new Client())->request('GET', $publicUri,
-				[
-					'stream' => true,
-					'headers' => [
-						'X-Auth-Token' => $tokenId,
-						'Cache-Control' => 'no-cache'
-					],
-				]
-			);
-		} catch (BadResponseException $e) {
-			if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
-				throw new NotFoundException("object $urn not found in object store");
-			} else {
-				throw $e;
-			}
-		}
-
-		return RetryWrapper::wrap($response->getBody()->detach());
-	}
-
-	/**
-	 * @param string $urn Unified Resource Name
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteObject($urn) {
-		$this->getContainer()->getObject($urn)->delete();
-	}
-
-	/**
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteContainer() {
-		$this->getContainer()->delete();
-	}
-
-	public function objectExists($urn) {
-		return $this->getContainer()->objectExists($urn);
-	}
+    /**
+     * @var array
+     */
+    private $params;
+
+    /** @var SwiftFactory */
+    private $swiftFactory;
+
+    public function __construct($params, SwiftFactory $connectionFactory = null) {
+        $this->swiftFactory = $connectionFactory ?: new SwiftFactory(
+            \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
+            $params,
+            \OC::$server->getLogger()
+        );
+        $this->params = $params;
+    }
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function getContainer() {
+        return $this->swiftFactory->getContainer();
+    }
+
+    /**
+     * @return string the container name where objects are stored
+     */
+    public function getStorageId() {
+        if (isset($this->params['bucket'])) {
+            return $this->params['bucket'];
+        }
+
+        return $this->params['container'];
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function writeObject($urn, $stream) {
+        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
+        file_put_contents($tmpFile, $stream);
+        $handle = fopen($tmpFile, 'rb');
+
+        if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
+            $this->getContainer()->createObject([
+                'name' => $urn,
+                'stream' => stream_for($handle)
+            ]);
+        } else {
+            $this->getContainer()->createLargeObject([
+                'name' => $urn,
+                'stream' => stream_for($handle),
+                'segmentSize' => SWIFT_SEGMENT_SIZE
+            ]);
+        }
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
+     * @throws NotFoundException if file does not exist
+     */
+    public function readObject($urn) {
+        try {
+            $publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
+            $tokenId = $this->swiftFactory->getCachedTokenId();
+
+            $response = (new Client())->request('GET', $publicUri,
+                [
+                    'stream' => true,
+                    'headers' => [
+                        'X-Auth-Token' => $tokenId,
+                        'Cache-Control' => 'no-cache'
+                    ],
+                ]
+            );
+        } catch (BadResponseException $e) {
+            if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
+                throw new NotFoundException("object $urn not found in object store");
+            } else {
+                throw $e;
+            }
+        }
+
+        return RetryWrapper::wrap($response->getBody()->detach());
+    }
+
+    /**
+     * @param string $urn Unified Resource Name
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteObject($urn) {
+        $this->getContainer()->getObject($urn)->delete();
+    }
+
+    /**
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteContainer() {
+        $this->getContainer()->delete();
+    }
+
+    public function objectExists($urn) {
+        return $this->getContainer()->objectExists($urn);
+    }
 }

Please login to merge, or discard this patch.

		@@ -36,116 +36,116 @@
		block discarded – undo
36	36	const SWIFT_SEGMENT_SIZE = 1073741824; // 1GB
37	37
38	38	class Swift implements IObjectStore {
39		- /**
40		- * @var array
41		- */
42		- private $params;
43		-
44		- /** @var SwiftFactory */
45		- private $swiftFactory;
46		-
47		- public function __construct($params, SwiftFactory $connectionFactory = null) {
48		- $this->swiftFactory = $connectionFactory ?: new SwiftFactory(
49		- \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
50		- $params,
51		- \OC::$server->getLogger()
52		- );
53		- $this->params = $params;
54		- }
55		-
56		- /**
57		- * @return \OpenStack\ObjectStore\v1\Models\Container
58		- * @throws StorageAuthException
59		- * @throws \OCP\Files\StorageNotAvailableException
60		- */
61		- private function getContainer() {
62		- return $this->swiftFactory->getContainer();
63		- }
64		-
65		- /**
66		- * @return string the container name where objects are stored
67		- */
68		- public function getStorageId() {
69		- if (isset($this->params['bucket'])) {
70		- return $this->params['bucket'];
71		- }
72		-
73		- return $this->params['container'];
74		- }
75		-
76		- /**
77		- * @param string $urn the unified resource name used to identify the object
78		- * @param resource $stream stream with the data to write
79		- * @throws \Exception from openstack lib when something goes wrong
80		- */
81		- public function writeObject($urn, $stream) {
82		- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
83		- file_put_contents($tmpFile, $stream);
84		- $handle = fopen($tmpFile, 'rb');
85		-
86		- if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
87		- $this->getContainer()->createObject([
88		- 'name' => $urn,
89		- 'stream' => stream_for($handle)
90		- ]);
91		- } else {
92		- $this->getContainer()->createLargeObject([
93		- 'name' => $urn,
94		- 'stream' => stream_for($handle),
95		- 'segmentSize' => SWIFT_SEGMENT_SIZE
96		- ]);
97		- }
98		- }
99		-
100		- /**
101		- * @param string $urn the unified resource name used to identify the object
102		- * @return resource stream with the read data
103		- * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
104		- * @throws NotFoundException if file does not exist
105		- */
106		- public function readObject($urn) {
107		- try {
108		- $publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
109		- $tokenId = $this->swiftFactory->getCachedTokenId();
110		-
111		- $response = (new Client())->request('GET', $publicUri,
112		- [
113		- 'stream' => true,
114		- 'headers' => [
115		- 'X-Auth-Token' => $tokenId,
116		- 'Cache-Control' => 'no-cache'
117		- ],
118		- ]
119		- );
120		- } catch (BadResponseException $e) {
121		- if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
122		- throw new NotFoundException("object $urn not found in object store");
123		- } else {
124		- throw $e;
125		- }
126		- }
127		-
128		- return RetryWrapper::wrap($response->getBody()->detach());
129		- }
130		-
131		- /**
132		- * @param string $urn Unified Resource Name
133		- * @return void
134		- * @throws \Exception from openstack lib when something goes wrong
135		- */
136		- public function deleteObject($urn) {
137		- $this->getContainer()->getObject($urn)->delete();
138		- }
139		-
140		- /**
141		- * @return void
142		- * @throws \Exception from openstack lib when something goes wrong
143		- */
144		- public function deleteContainer() {
145		- $this->getContainer()->delete();
146		- }
147		-
148		- public function objectExists($urn) {
149		- return $this->getContainer()->objectExists($urn);
150		- }
	39	+ /**
	40	+ * @var array
	41	+ */
	42	+ private $params;
	43	+
	44	+ /** @var SwiftFactory */
	45	+ private $swiftFactory;
	46	+
	47	+ public function __construct($params, SwiftFactory $connectionFactory = null) {
	48	+ $this->swiftFactory = $connectionFactory ?: new SwiftFactory(
	49	+ \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
	50	+ $params,
	51	+ \OC::$server->getLogger()
	52	+ );
	53	+ $this->params = $params;
	54	+ }
	55	+
	56	+ /**
	57	+ * @return \OpenStack\ObjectStore\v1\Models\Container
	58	+ * @throws StorageAuthException
	59	+ * @throws \OCP\Files\StorageNotAvailableException
	60	+ */
	61	+ private function getContainer() {
	62	+ return $this->swiftFactory->getContainer();
	63	+ }
	64	+
	65	+ /**
	66	+ * @return string the container name where objects are stored
	67	+ */
	68	+ public function getStorageId() {
	69	+ if (isset($this->params['bucket'])) {
	70	+ return $this->params['bucket'];
	71	+ }
	72	+
	73	+ return $this->params['container'];
	74	+ }
	75	+
	76	+ /**
	77	+ * @param string $urn the unified resource name used to identify the object
	78	+ * @param resource $stream stream with the data to write
	79	+ * @throws \Exception from openstack lib when something goes wrong
	80	+ */
	81	+ public function writeObject($urn, $stream) {
	82	+ $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
	83	+ file_put_contents($tmpFile, $stream);
	84	+ $handle = fopen($tmpFile, 'rb');
	85	+
	86	+ if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
	87	+ $this->getContainer()->createObject([
	88	+ 'name' => $urn,
	89	+ 'stream' => stream_for($handle)
	90	+ ]);
	91	+ } else {
	92	+ $this->getContainer()->createLargeObject([
	93	+ 'name' => $urn,
	94	+ 'stream' => stream_for($handle),
	95	+ 'segmentSize' => SWIFT_SEGMENT_SIZE
	96	+ ]);
	97	+ }
	98	+ }
	99	+
	100	+ /**
	101	+ * @param string $urn the unified resource name used to identify the object
	102	+ * @return resource stream with the read data
	103	+ * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
	104	+ * @throws NotFoundException if file does not exist
	105	+ */
	106	+ public function readObject($urn) {
	107	+ try {
	108	+ $publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
	109	+ $tokenId = $this->swiftFactory->getCachedTokenId();
	110	+
	111	+ $response = (new Client())->request('GET', $publicUri,
	112	+ [
	113	+ 'stream' => true,
	114	+ 'headers' => [
	115	+ 'X-Auth-Token' => $tokenId,
	116	+ 'Cache-Control' => 'no-cache'
	117	+ ],
	118	+ ]
	119	+ );
	120	+ } catch (BadResponseException $e) {
	121	+ if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
	122	+ throw new NotFoundException("object $urn not found in object store");
	123	+ } else {
	124	+ throw $e;
	125	+ }
	126	+ }
	127	+
	128	+ return RetryWrapper::wrap($response->getBody()->detach());
	129	+ }
	130	+
	131	+ /**
	132	+ * @param string $urn Unified Resource Name
	133	+ * @return void
	134	+ * @throws \Exception from openstack lib when something goes wrong
	135	+ */
	136	+ public function deleteObject($urn) {
	137	+ $this->getContainer()->getObject($urn)->delete();
	138	+ }
	139	+
	140	+ /**
	141	+ * @return void
	142	+ * @throws \Exception from openstack lib when something goes wrong
	143	+ */
	144	+ public function deleteContainer() {
	145	+ $this->getContainer()->delete();
	146	+ }
	147	+
	148	+ public function objectExists($urn) {
	149	+ return $this->getContainer()->objectExists($urn);
	150	+ }
151	151	}

nextcloud / server

Push — master ( 3bf4e7...d5850e )

Status

Category

Indentation +112 added lines, -112 removed lines patch added patch discarded remove patch