← All changes | admin/class-image-optimizer.php +170 -20 4.1.1 → 4.1.2 View file →

		@@ -559,11 +559,43 @@
559	559	}
560	560
561	561	/**
562	562	* Get the unoptimized media ids
	563	+ *
	564	+ * @param int $limit Maximum number of media IDs to retrieve.
	565	+ * @return int[]
563	566	*/
564		- public function get_unoptimized_media_ids() {
	567	+ public function get_unoptimized_media_ids( $limit = 5 ) {
	568	+ $query_args = $this->get_unoptimized_media_query_args();
	569	+ $query_args['posts_per_page'] = max( 1, absint( $limit ) );
	570	+ $query_args['fields'] = 'ids';
	571	+ $query_args['no_found_rows'] = true;
565	572
	573	+ return get_posts( $query_args );
	574	+ }
	575	+
	576	+ /**
	577	+ * Count unoptimized media.
	578	+ *
	579	+ * @return int
	580	+ */
	581	+ public function get_unoptimized_media_count() {
	582	+ $query_args = $this->get_unoptimized_media_query_args();
	583	+ $query_args['posts_per_page'] = 1;
	584	+ $query_args['fields'] = 'ids';
	585	+
	586	+ $query = new WP_Query( $query_args );
	587	+
	588	+ return absint( $query->found_posts );
	589	+ }
	590	+
	591	+ /**
	592	+ * Get the shared query arguments for unoptimized media.
	593	+ *
	594	+ * @return array
	595	+ */
	596	+ private function get_unoptimized_media_query_args() {
	597	+
566	598	$settings = $this->get_settings();
567	599	$mode_enabled = $settings['quickwebp_settings_conversion'];
568	600	$ignore_same_format = is_array( $settings['quickwebp_settings_conversion_ignore_webp'] ) ? $settings['quickwebp_settings_conversion_ignore_webp'] : array();
569	601
		@@ -609,14 +641,12 @@
609	641	'value' => '2',
610	642	);
611	643	}
612	644
613		- $media_ids = get_posts( array(
	645	+ return array(
614	646	'post_type' => 'attachment',
615	647	'post_mime_type' => $allowed_mime_types,
616	648	'post_status' => array_keys( $statuses ),
617		- 'posts_per_page' => -1,
618		- 'fields' => 'ids',
619	649	// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
620	650	'meta_query' => array(
621	651	'relation' => 'AND',
622	652	array(
		@@ -624,11 +654,9 @@
624	654	'compare' => 'NOT EXISTS'
625	655	),
626	656	$meta_query_already_optimized,
627	657	),
628		- ) );
629		-
630		- return $media_ids;
	658	+ );
631	659	}
632	660
633	661	/**
634	662	* Get the list of media files
		@@ -740,17 +768,35 @@
740	768	*
741	769	* @param array $optimized_sizes Optimization results for the attachment sizes.
742	770	*/
743	771	public function record_attachment_optimization_stats( $optimized_sizes ) {
744		- $size_before = 0;
745		- $size_after = 0;
	772	+ $stats = $this->get_attachment_optimization_stats( $optimized_sizes );
	773	+ $this->record_optimization_stats( $stats['bytes_before'], $stats['bytes_after'], $stats['images_optimized'] );
	774	+ }
746	775
	776	+ /**
	777	+ * Calculate optimization statistics for attachment sizes without persisting them.
	778	+ *
	779	+ * @param array $optimized_sizes Optimization results for the attachment sizes.
	780	+ * @return array
	781	+ */
	782	+ public function get_attachment_optimization_stats( $optimized_sizes ) {
	783	+ $stats = array(
	784	+ 'images_optimized' => 0,
	785	+ 'bytes_before' => 0,
	786	+ 'bytes_after' => 0,
	787	+ );
	788	+
747	789	foreach ( $optimized_sizes as $optimized_size ) {
748		- $size_before += absint( $optimized_size['original_size'] ?? 0 );
749		- $size_after += absint( $optimized_size['optimized_size'] ?? 0 );
	790	+ $stats['bytes_before'] += absint( $optimized_size['original_size'] ?? 0 );
	791	+ $stats['bytes_after'] += absint( $optimized_size['optimized_size'] ?? 0 );
750	792	}
751	793
752		- $this->record_optimization_stats( $size_before, $size_after );
	794	+ if ( $stats['bytes_before'] && $stats['bytes_after'] ) {
	795	+ $stats['images_optimized'] = 1;
	796	+ }
	797	+
	798	+ return $stats;
753	799	}
754	800
755	801	/**
756	802	* Record local cumulative optimization statistics.
		@@ -755,18 +801,26 @@
755	801	/**
756	802	* Record local cumulative optimization statistics.
757	803	*
758	804	* @param int $size_before File size before optimization in bytes.
759		- * @param int $size_after File size after optimization in bytes.
	805	+ * @param int $size_after File size after optimization in bytes.
	806	+ * @param int $images_optimized Number of optimized attachments.
760	807	*/
761		- public function record_optimization_stats( $size_before, $size_after ) {
762		- $size_before = absint( $size_before );
763		- $size_after = absint( $size_after );
	808	+ public function record_optimization_stats( $size_before, $size_after, $images_optimized = 1 ) {
	809	+ $size_before = absint( $size_before );
	810	+ $size_after = absint( $size_after );
	811	+ $images_optimized = absint( $images_optimized );
764	812
765		- if ( ! $size_before || ! $size_after ) {
	813	+ if ( ! $size_before || ! $size_after || ! $images_optimized ) {
766	814	return;
767	815	}
768	816
	817	+ $lock_token = $this->acquire_optimization_stats_lock();
	818	+ if ( ! $lock_token ) {
	819	+ $this->queue_optimization_stats_delta( $size_before, $size_after, $images_optimized );
	820	+ return;
	821	+ }
	822	+
769	823	$stats = get_option( 'quickwebp_optimization_stats', array() );
770	824	$stats = wp_parse_args(
771	825	is_array( $stats ) ? $stats : array(),
772	826	array(
		@@ -775,15 +829,111 @@
775	829	'bytes_after' => 0,
776	830	'bytes_saved' => 0,
777	831	)
778	832	);
	833	+ $pending_stats = $this->consume_optimization_stats_deltas();
779	834
780		- $stats['images_optimized'] = absint( $stats['images_optimized'] ) + 1;
781		- $stats['bytes_before'] = absint( $stats['bytes_before'] ) + $size_before;
782		- $stats['bytes_after'] = absint( $stats['bytes_after'] ) + $size_after;
	835	+ $stats['images_optimized'] = absint( $stats['images_optimized'] ) + $images_optimized + $pending_stats['images_optimized'];
	836	+ $stats['bytes_before'] = absint( $stats['bytes_before'] ) + $size_before + $pending_stats['bytes_before'];
	837	+ $stats['bytes_after'] = absint( $stats['bytes_after'] ) + $size_after + $pending_stats['bytes_after'];
783	838	$stats['bytes_saved'] = max( 0, $stats['bytes_before'] - $stats['bytes_after'] );
784	839
785	840	update_option( 'quickwebp_optimization_stats', $stats, false );
	841	+ $this->release_optimization_stats_lock( $lock_token );
	842	+ }
	843	+
	844	+ /**
	845	+ * Queue a statistics delta when another request owns the update lock.
	846	+ *
	847	+ * @param int $size_before File size before optimization in bytes.
	848	+ * @param int $size_after File size after optimization in bytes.
	849	+ * @param int $images_optimized Number of optimized attachments.
	850	+ */
	851	+ private function queue_optimization_stats_delta( $size_before, $size_after, $images_optimized ) {
	852	+ $option_name = 'quickwebp_optimization_stats_delta_' . str_replace( '-', '', wp_generate_uuid4() );
	853	+ add_option(
	854	+ $option_name,
	855	+ array(
	856	+ 'images_optimized' => $images_optimized,
	857	+ 'bytes_before' => $size_before,
	858	+ 'bytes_after' => $size_after,
	859	+ ),
	860	+ '',
	861	+ false
	862	+ );
	863	+ }
	864	+
	865	+ /**
	866	+ * Consume queued statistics deltas while holding the update lock.
	867	+ *
	868	+ * @return array
	869	+ */
	870	+ private function consume_optimization_stats_deltas() {
	871	+ global $wpdb;
	872	+
	873	+ $pending_stats = array(
	874	+ 'images_optimized' => 0,
	875	+ 'bytes_before' => 0,
	876	+ 'bytes_after' => 0,
	877	+ );
	878	+ $option_prefix = 'quickwebp_optimization_stats_delta_';
	879	+ $option_names = $wpdb->get_col(
	880	+ $wpdb->prepare(
	881	+ "SELECT option_name FROM {$wpdb->options} WHERE option_name LIKE %s",
	882	+ $wpdb->esc_like( $option_prefix ) . '%'
	883	+ )
	884	+ );
	885	+
	886	+ foreach ( $option_names as $option_name ) {
	887	+ $delta = get_option( $option_name, array() );
	888	+ if ( is_array( $delta ) ) {
	889	+ $pending_stats['images_optimized'] += absint( $delta['images_optimized'] ?? 0 );
	890	+ $pending_stats['bytes_before'] += absint( $delta['bytes_before'] ?? 0 );
	891	+ $pending_stats['bytes_after'] += absint( $delta['bytes_after'] ?? 0 );
	892	+ }
	893	+ delete_option( $option_name );
	894	+ }
	895	+
	896	+ return $pending_stats;
	897	+ }
	898	+
	899	+ /**
	900	+ * Acquire an expiring lock for cumulative statistics updates.
	901	+ *
	902	+ * @return string|false
	903	+ */
	904	+ private function acquire_optimization_stats_lock() {
	905	+ $lock_token = wp_generate_uuid4();
	906	+ $lock = array(
	907	+ 'token' => $lock_token,
	908	+ 'expires' => time() + MINUTE_IN_SECONDS,
	909	+ );
	910	+
	911	+ if ( add_option( 'quickwebp_optimization_stats_lock', $lock, '', false ) ) {
	912	+ return $lock_token;
	913	+ }
	914	+
	915	+ $existing_lock = get_option( 'quickwebp_optimization_stats_lock', array() );
	916	+ if ( is_array( $existing_lock ) && absint( $existing_lock['expires'] ?? 0 ) < time() ) {
	917	+ delete_option( 'quickwebp_optimization_stats_lock' );
	918	+ if ( add_option( 'quickwebp_optimization_stats_lock', $lock, '', false ) ) {
	919	+ return $lock_token;
	920	+ }
	921	+ }
	922	+
	923	+ return false;
	924	+ }
	925	+
	926	+ /**
	927	+ * Release the statistics lock owned by this process.
	928	+ *
	929	+ * @param string $lock_token Lock ownership token.
	930	+ */
	931	+ private function release_optimization_stats_lock( $lock_token ) {
	932	+ $lock = get_option( 'quickwebp_optimization_stats_lock', array() );
	933	+ if ( is_array( $lock ) && hash_equals( (string) ( $lock['token'] ?? '' ), $lock_token ) ) {
	934	+ delete_option( 'quickwebp_optimization_stats_lock' );
	935	+ }
786	936	}
787	937
788	938	/**
789	939	* Remove the related files of an optimized attachment