Split pronamic_cloudflare_purge_cache action in pronamic_cloudflare_purge_cache_tags and pronamic_cloudflare_purge_cache_everything.

Author: rvdsteege

php/Plugin.php

@@ -62,7 +62,8 @@ public function __construct() {
 	 */
 	public function setup() {
 		\add_action( 'admin_bar_menu', [ $this, 'admin_bar_menu' ], 500 );
-		\add_action( 'pronamic_cloudflare_purge_cache', [ $this, 'purge_cache' ] );
+		\add_action( 'pronamic_cloudflare_purge_cache_tags', $this->request_purge_cache_tags( ... ) );
+		\add_action( 'pronamic_cloudflare_purge_everything', $this->request_purge_everything( ... ) );
 
 		// Post actions.
 		\add_action( 'save_post', $this->purge_cache_by_post( ... ), 10, 1 );
@@ -115,7 +116,7 @@ public function admin_bar_menu( WP_Admin_Bar $admin_bar ) {
 		$url = \add_query_arg(
 			[
 				'page' => 'action-scheduler',
-				's'    => 'pronamic_cloudflare_purge_cache',
+				's'    => 'pronamic_cloudflare_purge',
 			],
 			\admin_url( 'tools.php' )
 		);
@@ -162,7 +163,6 @@ private function count_actions() {
 
 		$number = $store->query_actions(
 			[ 
-				'hook'   => 'pronamic_cloudflare_purge_cache',
 				'group'  => 'pronamic-cloudflare',
 				'status' => ActionScheduler_Store::STATUS_PENDING,
 			],
@@ -271,7 +271,7 @@ public function get_current_cache_tags(): array {
 	 * @return void
 	 * @throws \Exception Throws exception if purge cache action fails.
 	 */
-	public function purge_cache( $args ) {
+	private function send_request( $args ) {
 		$api_email = (string) \get_option( 'pronamic_cloudflare_api_email' );
 		$api_key   = (string) \get_option( 'pronamic_cloudflare_api_key' );
 		$zone_id   = (string) \get_option( 'pronamic_cloudflare_zone_id' );
@@ -318,6 +318,33 @@ public function purge_cache( $args ) {
 		}
 	}
 
+	/**
+	 * Request purge cache tags.
+	 *
+	 * @param string[] $tags Tags to purge.
+	 * @return void
+	 */
+	private function request_purge_cache_tags( array $tags ): void {
+		$args = [
+			'tags' => $tags,
+		];
+
+		$this->send_request( $args );
+	}
+
+	/**
+	 * Request purge everything.
+	 *
+	 * @return void
+	 */
+	private function request_purge_everything(): void {
+		$args = [
+			'purge_everything' => true,
+		];
+
+		$this->send_request( $args );
+	}
+
 	/**
 	 * Purge cache by post.
 	 *
@@ -702,63 +729,44 @@ private function purge_by_tags( $tags ) {
 		}
 	}
 
-	/**
-	 * Schedule purge cache action.
-	 *
-	 * @param array $args Arguments for purge cache action.
-	 * @return void
-	 */
-	private function schedule_purge_cache_action( $args ): void {
-		if ( 0 === count( $args ) ) {
-			return;
-		}
-
-		$args = [ $args ];
-
-		$scheduled = \as_has_scheduled_action(
-			'pronamic_cloudflare_purge_cache',
-			$args,
-			'pronamic-cloudflare',
-		);
-
-		if ( $scheduled ) {
-			return;
-		}
-
-		\as_enqueue_async_action(
-			'pronamic_cloudflare_purge_cache',
-			$args,
-			'pronamic-cloudflare',
-			false
-		);
-	}
-
 	/**
 	 * Schedule purge cache action on shutdown.
 	 *
 	 * @return void
 	 */
 	private function shutdown(): void {
-		if ( 0 === count( $this->purge_tags ) && false === $this->purge_everything ) {
-			return;
-		}
-
-		$args = [
-			'tags' => $this->purge_tags,
-		];
-
+		// Purge everything.
 		if ( true === $this->purge_everything ) {
-			$args = [
-				'purge_everything' => true,
-			];
-
+			// Remove all scheduled purge cache tags actions
+			// as purge everything action will purge everything.
 			\as_unschedule_all_actions(
-				'pronamic_cloudflare_purge_cache',
+				'pronamic_cloudflare_purge_cache_tags',
 				null,
 				'pronamic-cloudflare'
 			);
+
+			\as_enqueue_async_action(
+				'pronamic_cloudflare_purge_everything',
+				[],
+				'pronamic-cloudflare',
+				true
+			);
+		}
+
+		// Purge tags.
+		if ( 0 === count( $this->purge_tags ) || true === $this->purge_everything ) {
+			return;
 		}
 
-		$this->schedule_purge_cache_action( $args );
+		$args = [
+			$this->purge_tags,
+		];
+
+		\as_enqueue_async_action(
+			'pronamic_cloudflare_purge_cache_tags',
+			$args,
+			'pronamic-cloudflare',
+			true
+		);
 	}
 }