← All changes | modules/stats/classes/stats.php +29 -26 1.0.1 → 1.7.7 View file →

		@@ -1,21 +1,31 @@
1	1	<?php
2	2
3		-namespace ImageOptimizer\Modules\Stats\Classes;
	3	+namespace ImageOptimization\Modules\Stats\Classes;
4	4
5		-use ImageOptimizer\Classes\Async_Operation\{
	5	+use ImageOptimization\Classes\Async_Operation\{
6	6	Async_Operation,
7	7	Async_Operation_Hook,
8		- Queries\Image_Optimization_Operation_Query,
9	8	Queries\Operation_Query,
10	9	};
11		-use ImageOptimizer\Classes\Image\Image_Query_Builder;
	10	+use ImageOptimization\Classes\Image\Image_Query_Builder;
	11	+use ImageOptimization\Modules\Optimization\Classes\Bulk_Optimization\{
	12	+ Bulk_Optimization_Queue,
	13	+ Bulk_Optimization_Queue_Status,
	14	+ Bulk_Optimization_Queue_Type
	15	+};
12	16
	17	+if ( ! defined( 'ABSPATH' ) ) {
	18	+ exit; // Exit if accessed directly.
	19	+}
	20	+
13	21	class Stats {
14	22	public static function calculate_global_stats(): array {
	23	+ $bulk_optimization_operation_status = self::get_bulk_optimization_status();
	24	+
15	25	return [
16	26	'optimization_stats' => Optimization_Stats::get_image_stats(),
17		- 'bulk_optimization_status' => self::get_bulk_optimization_status(),
	27	+ 'bulk_optimization_status' => $bulk_optimization_operation_status,
18	28	'bulk_restoring_status' => self::get_bulk_restoring_status(),
19	29	'bulk_backup_removing_status' => self::get_bulk_backup_removing_status(),
20	30	'backups_exist' => self::backups_exist(),
21	31	];
		@@ -21,36 +31,29 @@
21	31	];
22	32	}
23	33
24	34	private static function get_bulk_optimization_status(): string {
25		- $active_query = ( new Image_Optimization_Operation_Query() )
26		- ->set_hook( Async_Operation_Hook::OPTIMIZE_BULK )
27		- ->set_status( [
28		- Async_Operation::OPERATION_STATUS_PENDING,
29		- Async_Operation::OPERATION_STATUS_RUNNING,
30		- ] )
31		- ->set_limit( 1 );
	35	+ $queue = new Bulk_Optimization_Queue( Bulk_Optimization_Queue_Type::OPTIMIZATION );
32	36
33		- $active_operations = Async_Operation::get( $active_query );
34		-
35		- if ( empty( $active_operations ) ) {
	37	+ if ( ! $queue->exists() ) {
36	38	return Async_Operation::OPERATION_STATUS_NOT_STARTED;
37	39	}
38	40
39		- $operation_id = $active_operations[0]->get_args()['operation_id'];
40		- $cancelled_query = ( new Image_Optimization_Operation_Query() )
41		- ->set_hook( Async_Operation_Hook::OPTIMIZE_BULK )
42		- ->set_status( Async_Operation::OPERATION_STATUS_CANCELED )
43		- ->set_bulk_operation_id( $operation_id )
44		- ->set_limit( 1 );
	41	+ $queue_status = $queue->get_status();
45	42
46		- $cancelled_operations = Async_Operation::get( $cancelled_query );
	43	+ switch ( $queue_status ) {
	44	+ case Bulk_Optimization_Queue_Status::PROCESSING:
	45	+ case Bulk_Optimization_Queue_Status::PENDING:
	46	+ return Async_Operation::OPERATION_STATUS_RUNNING;
47	47
48		- if ( ! empty( $cancelled_operations ) ) {
49		- return Async_Operation::OPERATION_STATUS_CANCELED;
	48	+ case Bulk_Optimization_Queue_Status::CANCELLED:
	49	+ return Async_Operation::OPERATION_STATUS_CANCELED;
	50	+
	51	+ case Bulk_Optimization_Queue_Status::COMPLETED:
	52	+ case Bulk_Optimization_Queue_Status::FAILED:
	53	+ default:
	54	+ return Async_Operation::OPERATION_STATUS_NOT_STARTED;
50	55	}
51		-
52		- return Async_Operation::OPERATION_STATUS_RUNNING;
53	56	}
54	57
55	58	private static function get_bulk_restoring_status(): string {
56	59	$active_query = ( new Operation_Query() )