NextCloud: Heroku: Install: Apply S3 Patch to NextCloud - Revision history

Ewanchic: /* Apply the Patch */

2019-09-17T04:52:38Z

‎Apply the Patch

Ewanchic: /* Code Block 5 */

2019-09-17T04:23:26Z

‎Code Block 5

Ewanchic at 04:20, 17 September 2019

2019-09-17T04:20:23Z

Ewanchic: /* Manually Applying Code */

2019-09-17T04:19:25Z

‎Manually Applying Code

Ewanchic: /* Code Block 4 */

2019-09-17T04:15:46Z

‎Code Block 4

Ewanchic: /* Code Block 6 */

2019-09-17T04:15:22Z

‎Code Block 6

Ewanchic: /* Code Block 7 */

2019-09-17T04:14:46Z

‎Code Block 7

Ewanchic: /* Code Block 8 */

2019-09-17T04:14:20Z

‎Code Block 8

Ewanchic: /* Code Block 8 */

2019-09-17T04:13:08Z

‎Code Block 8

Ewanchic: /* Code Block 7 */

2019-09-17T04:11:12Z

‎Code Block 7

@@ Line 136: / Line 136: @@
   git add .
-  git commit -m "Apply S3 Patch".
+  git commit -m "Apply S3 Patch."
 == Return ==

@@ Line 52: / Line 52: @@
+      }
-      /**
+      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>/**</span>
-       * Return true if directory exists
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* Return true if directory exists</span>
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>*</span>
-       * There are no folders in s3. A folder like structure could be archived
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* There are no folders in s3. A folder like structure could be archived</span>
-       * by prefixing files with the folder name.
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* by prefixing files with the folder name.</span>
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>*</span>
-       * Implementation from flysystem-aws-s3-v3:
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* Implementation from flysystem-aws-s3-v3:</span>
-       * https://github.com/thephpleague/flysystem-aws-s3-v3/blob/8241e9cc5b28f981e0d24cdaf9867f14c7498ae4/src/AwsS3Adapter.php#L670-L694
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* https://github.com/thephpleague/flysystem-aws-s3-v3/blob/8241e9cc5b28f981e0d24cdaf9867f14c7498ae4/src/AwsS3Adapter.php#L670-L694</span>
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>*</span>
-       * @param $path
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* @param $path</span>
-       * @return bool
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* @return bool</span>
-       * @throws \Exception
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>* @throws \Exception</span>
-       */
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>*/</span>
-      private function doesDirectoryExist($path) {
+      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>private function doesDirectoryExist($path) {</span>
-          if (!isset($this->directoryCache[$path])) {
+          <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>if (!isset($this->directoryCache[$path])) {</span>
-              // Maybe this isn't an actual key, but a prefix.
+              <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>// Maybe this isn't an actual key, but a prefix.</span>
-              // Do a prefix listing of objects to determine.
+              <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>// Do a prefix listing of objects to determine.</span>
-              try {
+              <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>try {</span>
-                  $result = $this->getConnection()->listObjects([
+                  <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>$result = $this->getConnection()->listObjects([</span>
-                      'Bucket' => $this->bucket,
+                      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>'Bucket' => $this->bucket,</span>
-                      'Prefix' => rtrim($path, '/') . '/',
+                      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>'Prefix' => rtrim($path, '/') . '/',</span>
-                      'MaxKeys' => 1,
+                      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>'MaxKeys' => 1,</span>
-                  ]);
+                  <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>]);</span>
-                  $this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes'];
+                  <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>$this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes'];</span>
-              } catch (S3Exception $e) {
+              <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>} catch (S3Exception $e) {</span>
-                  if ($e->getStatusCode() === 403) {
+                  <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>if ($e->getStatusCode() === 403) {</span>
-                      $this->directoryCache[$path] = false;
+                      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>$this->directoryCache[$path] = false;</span>
+                  <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>}</span>
-                  throw $e;
+                  <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>throw $e;</span>
+              <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>}</span>
+          <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>}</span>
-          return $this->directoryCache[$path];
+          <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>return $this->directoryCache[$path];</span>
+       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>}</span>
        /**
         * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
         * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
 === Code Block 6 ===

← Older revision		Revision as of 04:20, 17 September 2019
Line 133:		Line 133:


		+	== Apply the Patch ==

−		+	Save the code changes, and commit to git.
−	~~Need~~ to ~~apply the patch~~.

	git add .		git add .

← Older revision		Revision as of 04:19, 17 September 2019
Line 4:		Line 4:

	== Manually Applying Code ==		== Manually Applying Code ==
		+	# Bring up this file inside an editor.
		+	# In each Block Section of Code:
		+	## Navigate to the specified line number
		+	## <span style='background-color: #fbe9eb; border: #f44256 4px solid;'>Remove any line of code highlighted in RED</span>
		+	## <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>Add any new line of code highlighted in GREEN<span>

	=== Code Block 1 ===		=== Code Block 1 ===

@@ Line 38: / Line 38: @@
+          }
+      }
-      unset($this->filesCache[$key]);
+      <span style='background-color: #fbe9eb; border: #f44256 4px solid;'>unset($this->filesCache[$key]);</span>
       <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>unset($this->directoryCache[$key], $this->filesCache[$key]);</span>
+  }

@@ Line 93: / Line 93: @@
   if (is_array($result['CommonPrefixes'])) {
       foreach ($result['CommonPrefixes'] as $prefix) {
-          $files[] = substr(trim($prefix['Prefix'], '/'), strlen($path));
+          <span style='background-color: #fbe9eb; border: #f44256 4px solid;'>$files[] = substr(trim($prefix['Prefix'], '/'), strlen($path));</span>
           <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>$directoryName = trim($prefix['Prefix'], '/');</span>
           <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>$files[] = substr($directoryName, strlen($path));</span>

@@ Line 110: / Line 110: @@
       try {
-          return $this->isRoot($path) || $this->headObject($path . '/');
+          <span style='background-color: #fbe9eb; border: #f44256 4px solid;'>return $this->isRoot($path) || $this->headObject($path . '/');</span>
           <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>return $this->isRoot($path) || $this->doesDirectoryExist($path);</span>
       } catch (S3Exception $e) {

@@ Line 121: / Line 121: @@
           return 'file';
+      }
-      if (<span style='background-color: #fbe9eb; border: #f44256 4px solid;'>$this->headObject($path . '/')</span>) {
+      <span style='background-color: #fbe9eb; border: #f44256 4px solid;'>if ($this->headObject($path . '/')) {</span>
-      if (<span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>$this->doesDirectoryExist($path)</span>) {
+      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>if ($this->doesDirectoryExist($path)) {</span>
           return 'dir';
+      }

@@ Line 105: / Line 105: @@
       $path = $this->normalizePath($path);
-      if (isset($this->filesCache[$path])) {
+      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>if (isset($this->filesCache[$path])) {</span>
-          return false;
+          <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>return false;</span>
+      <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>}</span>
       try {
           return $this->isRoot($path) || $this->headObject($path . '/');
-          return $this->isRoot($path) || $this->doesDirectoryExist($path);
+          <span style='background-color: #ecfdf0; border: #5bfb81 4px solid;'>return $this->isRoot($path) || $this->doesDirectoryExist($path);</span>
       } catch (S3Exception $e) {
           \OC::$server->getLogger()->logException($e, ['app' => 'files_external']);