use transients instead of wp cache api

Author: gregdev

.gitignore

@@ -21,7 +21,7 @@
 			A <strong><a href="https://hmn.md/">Human Made</a></strong> project. Maintained by @joehoyle.
 		</td>
 		<td align="center">
-			<img src="https://hmn.md/content/themes/hmnmd/assets/images/hm-logo.svg" width="100" />
+			<img src="https://humanmade.com/content/themes/hmnmd/assets/images/hm-logo.svg" width="100" />
 		</td>
 	</tr>
 </table>

.travis.yml

@@ -18,7 +18,7 @@ class Cache_Layer implements \Aws\CacheInterface, \Countable {
 	 * @return mixed|null
 	 */
 	public function get( $key ) {
-		return wp_cache_get( $key, 's3-uploads-cache' );
+		return get_transient("offload_s3/{$key}");
 	}
 
 	/**
@@ -30,8 +30,8 @@ public function get( $key ) {
 	 *
 	 * @return mixed
 	 */
-	public function set( $key, $value, $ttl = 0 ) {
-		wp_cache_set( $key, $value, 's3-uploads-cache', $ttl );
+	public function set( $key, $value, $ttl = WEEK_IN_SECONDS ) {
+		set_transient("offload_s3/{$key}", $value, $ttl);
 	}
 
 	/**
@@ -42,16 +42,16 @@ public function set( $key, $value, $ttl = 0 ) {
 	 * @return mixed
 	 */
 	public function remove( $key ) {
-		wp_cache_delete( $key, 's3-uploads-cache' );
+		delete_transient("offload_s3/{$key}");
 	}
 
 	/**
 	 * Function provided here only for the compatibility with original \Aws\LruArrayCache example.
 	 *
 	 * @return int
 	 */
-	public function count():int {
+	public function count(): int {
 		return 0;
 	}
 
-}
+}

README.md

@@ -512,7 +512,7 @@ public function url_stat( $uri, $flags ) {
 	 */
 	public function dir_opendir( $uri, $options ) {
 		$this->uri = $uri;
-		$this->handle = opendir( pathinfo($this->getLocalPath(), PATHINFO_DIRNAME) );
+		$this->handle = opendir( $this->getLocalPath() );
 
 		return (bool) $this->handle;
 	}

inc/class-cache-layer.php

@@ -146,7 +146,7 @@ public function register_stream_wrapper() {
 		if ( defined( 'S3_UPLOADS_USE_LOCAL' ) && S3_UPLOADS_USE_LOCAL ) {
 			stream_wrapper_register( 's3', 'S3_Uploads\Local_Stream_Wrapper', STREAM_IS_URL );
 		} else {
-			Stream_Wrapper::register( $this, 's3', new Cache_Layer() );
+			Stream_Wrapper::register( $this );
 			$acl = defined( 'S3_UPLOADS_OBJECT_ACL' ) ? S3_UPLOADS_OBJECT_ACL : 'public-read';
 			stream_context_set_option( stream_context_get_default(), 's3', 'ACL', $acl );
 		}
@@ -157,7 +157,7 @@ public function register_stream_wrapper() {
 	/**
 	 * Get the s3:// path for the bucket.
 	 */
-	public function get_s3_path() {
+	public function get_s3_path() : string {
 		return 's3://' . $this->bucket;
 	}
 
@@ -184,12 +184,6 @@ public function filter_upload_dir( array $dirs ) : array {
 			} else {
 				$dirs['url']     = str_replace( $s3_path, $this->get_s3_url(), $dirs['path'] );
 				$dirs['baseurl'] = str_replace( $s3_path, $this->get_s3_url(), $dirs['basedir'] );
-
-				// The s3:// protocol is not needed when displaying the media library and slows things down in some cases.
-				if ( isset( $_POST['action'] ) && 'query-attachments' === $_POST['action'] ) {
-					$dirs['path']    = $this->original_upload_dir['path'];
-					$dirs['basedir'] = $this->original_upload_dir['basedir'];
-				}
 			}
 		}
 

inc/class-local-stream-wrapper.php

@@ -29,6 +29,10 @@ function init() {
 		wp_die( 'S3_UPLOADS_REGION constant is required. Please define it in your wp-config.php' );
 	}
 
+	if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		\WP_CLI::add_command( 's3-uploads', 'S3_Uploads\\WP_CLI_Command' );
+	}
+
 	$instance = Plugin::get_instance();
 	$instance->setup();
 
@@ -132,7 +136,7 @@ function after_export_personal_data() {
  *
  * We don't want to use the default uploads folder location, as with S3 Uploads this is
  * going to the a s3:// custom URL handler, which is going to fail with the use of ZipArchive.
- * Instead we set to to sys_get_temp_dir and move the fail in the wp_privacy_personal_data_export_file_created
+ * Instead we set to to WP's get_temp_dir and move the fail in the wp_privacy_personal_data_export_file_created
  * hook.
  *
  * @param string $dir
@@ -142,7 +146,7 @@ function set_wp_privacy_exports_dir( string $dir ) {
 	if ( strpos( $dir, 's3://' ) !== 0 ) {
 		return $dir;
 	}
-	$dir = sys_get_temp_dir() . '/wp_privacy_exports_dir/';
+	$dir = get_temp_dir() . 'wp_privacy_exports_dir/';
 	if ( ! is_dir( $dir ) ) {
 		mkdir( $dir );
 		file_put_contents( $dir . 'index.html', '' ); // @codingStandardsIgnoreLine FS write is ok.
@@ -158,7 +162,7 @@ function set_wp_privacy_exports_dir( string $dir ) {
  * the "natural" Core URL is going to be pointing to.
  */
 function move_temp_personal_data_to_s3( string $archive_pathname ) {
-	if ( strpos( $archive_pathname, sys_get_temp_dir() ) !== 0 ) {
+	if ( strpos( $archive_pathname, get_temp_dir() ) !== 0 ) {
 		return;
 	}
 	$upload_dir = wp_upload_dir();

inc/class-plugin.php

@@ -1,11 +1,13 @@
 <?php
 
-/**
- * @method Imagick clone() (PECL imagick 2.0.0)<br/>Makes an exact copy of the Imagick object
- * @link https://php.net/manual/en/class.imagick.php
- */
-class Imagick implements Iterator, Countable {
+namespace {
+	/**
+	 * @method Imagick clone() (PECL imagick 2.0.0)<br/>Makes an exact copy of the Imagick object
+	 * @link https://php.net/manual/en/class.imagick.php
+	 */
+	class Imagick implements Iterator, Countable {
 
+	}
 }
 
 namespace WP_CLI {

inc/namespace.php

@@ -4,14 +4,10 @@
 Plugin Name: S3 Uploads
 Description: Store uploads in S3
 Author: Human Made Limited
-Version: 3.0.3
+Version: 3.0.8
 Author URI: https://hmn.md
 */
 
 require_once __DIR__ . '/inc/namespace.php';
 
 add_action( 'plugins_loaded', 'S3_Uploads\\init', 0 );
-
-if ( defined( 'WP_CLI' ) && WP_CLI ) {
-	WP_CLI::add_command( 's3-uploads', 'S3_Uploads\\WP_CLI_Command' );
-}