improve cache clearing storage

Author: selul

inc/admin.php

@@ -57,7 +57,7 @@ public function __construct() {
 		add_action( 'admin_notices', [ $this, 'add_notice_conflicts' ] );
 		add_action( 'optml_daily_sync', [ $this, 'daily_sync' ] );
 		add_action( 'admin_init', [ $this, 'redirect_old_dashboard' ] );
-
+		add_action( 'optml_purge_image_cache', [ $this, 'purge_image_cache' ] );
 		if ( $this->settings->is_connected() ) {
 			add_action( 'init', [ $this, 'check_domain_change' ] );
 			add_action( 'optml_pull_image_data_init', [ $this, 'pull_image_data_init' ] );
@@ -100,6 +100,18 @@ public function __construct() {
 		add_filter( 'themeisle-sdk/survey/' . OPTML_PRODUCT_SLUG, [ $this, 'get_survey_metadata' ], 10, 2 );
 	}
 
+	/**
+	 * Function that purges the image cache for a specific file.
+	 *
+	 * @param string $file Path or url of the file to clear.
+	 *
+	 * @return void
+	 */
+	public function purge_image_cache( $file ) {
+		$basename = wp_basename( $file );
+		$settings = new Optml_Settings();
+		$settings->clear_cache( $basename );
+	}
 	/**
 	 * Listen when the file is updated and clear the cache for the file.
 	 *
@@ -109,9 +121,8 @@ public function __construct() {
 	 * @return string The file path.
 	 */
 	public function listen_update_file( $file, $post_id ) {
-		$basename = wp_basename( $file );
-		$settings = new Optml_Settings();
-		$settings->clear_cache( $basename );
+		// Purge the image cache.
+		do_action( 'optml_purge_image_cache', $file );
 		return $file;
 	}
 	/**

inc/settings.php

@@ -16,6 +16,7 @@ class Optml_Settings {
 	const FILTER_TYPE_LAZYLOAD = 'lazyload';
 	const FILTER_TYPE_OPTIMIZE = 'optimize';
 	const OPTML_USER_EMAIL = 'optml_user_email';
+	const INDIVIDUAL_CACHE_TOKENS_KEY = '_optml_cache_tokens_individual';
 	/**
 	 * Holds an array of possible settings to alter via wp cli or wp-config constants.
 	 *
@@ -744,15 +745,16 @@ public function clear_cache( $type = '' ) {
 		$token        = $this->get( 'cache_buster' );
 		$token_images = $this->get( 'cache_buster_images' );
 
+		// here is an individual cache tokens
+		$individual = get_transient( self::INDIVIDUAL_CACHE_TOKENS_KEY ) ?: [];
 		if ( ( empty( $type ) || $type === 'images' ) ) {
 			if ( ! empty( $token_images ) ) {
 				$token = $token_images;
 			}
 		} elseif ( $type === 'assets' ) {
 			$token = $this->get( 'cache_buster_assets' );
 		} else {
-			// here is an individual clear cache based on filename.
-			$token = get_transient( '_file_' . crc32( $type ) ) ?: '';
+			$token = $individual[ crc32( $type ) ] ?? $token_images ?: $token;
 		}
 
 		$request = new Optml_Api();
@@ -776,11 +778,14 @@ public function clear_cache( $type = '' ) {
 		if ( empty( $type ) || $type === 'images' ) {
 			set_transient( 'optml_cache_lock', 'yes', 5 * MINUTE_IN_SECONDS );
 			$this->update( 'cache_buster_images', $data['token'] );
+			// we delete individual cache tokens since this is a global cache clear.
+			delete_transient( self::INDIVIDUAL_CACHE_TOKENS_KEY );
 		} elseif ( $type === 'assets' ) {
 			set_transient( 'optml_cache_lock_assets', 'yes', 5 * MINUTE_IN_SECONDS );
 			$this->update( 'cache_buster_assets', $data['token'] );
 		} else {
-			set_transient( '_file_' . crc32( $type ), $data['token'], 6 * HOUR_IN_SECONDS );
+			$individual[ crc32( $type ) ] = $data['token'];
+			set_transient( self::INDIVIDUAL_CACHE_TOKENS_KEY, $individual, 6 * HOUR_IN_SECONDS );
 		}
 
 		return $data['token'];

inc/url_replacer.php

@@ -284,7 +284,7 @@ private function normalize_image( $url, $original_url, $args, $is_uploaded = fal
 	 * @return string
 	 */
 	public static function get_active_cache_booster( $url, $main_cache_buster ) {
-		return get_transient( '_file_' . crc32( wp_basename( $url ) ) ) ?: $main_cache_buster;
+		return ( get_transient( Optml_Settings::INDIVIDUAL_CACHE_TOKENS_KEY ) ?: [] )[ crc32( wp_basename( $url ) ) ] ?? $main_cache_buster;
 	}
 	/**
 	 * Throw error on object clone