Merge pull request #1075 from cloudinary/optimize/find_attachments

Improve unknown URLs search

Author: aatanasov-cloudinary

php/class-delivery.php

@@ -896,6 +896,7 @@ public function find_attachment_size_urls() {
 		$dirs    = wp_get_upload_dir();
 		$baseurl = Utils::clean_url( $dirs['baseurl'] );
 		$search  = array();
+
 		foreach ( $this->unknown as $url ) {
 			$url      = ltrim( str_replace( $baseurl, '', $url ), '/' );
 			$search[] = $url;
@@ -913,6 +914,7 @@ public function find_attachment_size_urls() {
 		$key       = md5( $sql );
 		$cached    = wp_cache_get( $key );
 		$auto_sync = $this->sync->is_auto_sync_enabled();
+
 		if ( false === $cached ) {
 			$cached  = array();
 			$results = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.PreparedSQL.NotPrepared
@@ -930,12 +932,14 @@ public function find_attachment_size_urls() {
 					 * @return {int}
 					 */
 					$post_id = apply_filters( 'cloudinary_contextualized_post_id', $result->post_id );
+
 					if ( ! $this->is_deliverable( $post_id ) ) {
 						continue;
 					}
 					// If we are here, it means that an attachment in the media library doesn't have a delivery for the url.
 					// Reset the signature for delivery and add to sync, to update it.
 					$this->create_delivery( $post_id );
+
 					if ( true === $auto_sync ) {
 						$this->sync->add_to_sync( $post_id );
 					}
@@ -1933,7 +1937,70 @@ public function prepare_delivery( $content ) {
 			$this->set_usability( $result, $auto_sync );
 		}
 		// Set unknowns.
-		$this->unknown = array_diff( $urls, array_keys( $this->known ) );
+		$this->unknown = $this->filter_unknown_urls( $urls );
+	}
+
+	/**
+	 * Filter URLs to determine which are truly unknown, considering image size variations.
+	 *
+	 * This method treats image size variations (e.g., example-300x224.png) as "known"
+	 * if their base image (e.g., example.png) exists in the known URLs, while still
+	 * catching genuinely unknown URLs.
+	 *
+	 * @param array $urls All URLs found in content.
+	 *
+	 * @return array Array of genuinely unknown URLs.
+	 */
+	protected function filter_unknown_urls( $urls ) {
+		$known_keys = array_keys( $this->known );
+
+		if ( empty( $known_keys ) ) {
+			return $urls;
+		}
+
+		$known_lookup = array_flip( $known_keys );
+		$potential_unknown = array_diff( $urls, $known_keys );
+
+		if ( empty( $potential_unknown ) ) {
+			return array();
+		}
+
+		$truly_unknown = array();
+
+		foreach ( $potential_unknown as $url ) {
+			// Check if this might be a sized variation of a known image.
+			$base_url = $this->maybe_unsize_url( $url );
+
+			// If base image is known, skip this variation.
+			if ( isset( $known_lookup[ $base_url ] ) ) {
+				continue;
+			}
+
+			// Check scaled version if base wasn't found and URL was actually "unsized".
+			if ( $base_url !== $url ) {
+				$scaled_url = Utils::make_scaled_url( $base_url );
+				if ( isset( $known_lookup[ $scaled_url ] ) ) {
+					continue; // Scaled version is known, skip this variation.
+				}
+			}
+
+			// This URL is genuinely unknown.
+			$truly_unknown[] = $url;
+		}
+
+		/**
+		 * Filter the list of truly unknown URLs after filtering out image size variations.
+		 *
+		 * @hook   cloudinary_filter_unknown_urls
+		 * @since  3.2.12
+		 *
+		 * @param array $truly_unknown The filtered list of unknown URLs.
+		 * @param array $urls          The original list of all URLs.
+		 * @param array $known_keys    The list of known URL keys.
+		 *
+		 * @return array The filtered list of unknown URLs.
+		 */
+		return apply_filters( 'cloudinary_filter_unknown_urls', $truly_unknown, $urls, $known_keys );
 	}
 
 	/**