← All changes
|
modules/optimization/components/upload-optimization.php
+16
-6
1.6.0
→
trunk
View file →
| @@ -6,21 +6,26 @@ | ||
| 6 | 6 | Async_Operation, |
| 7 | 7 | Async_Operation_Hook, |
| 8 | 8 | Async_Operation_Queue, |
| 9 | 9 | }; |
| 10 | + | |
| 10 | 11 | use ImageOptimization\Classes\Image\{ |
| 11 | 12 | Exceptions\Invalid_Image_Exception, |
| 12 | 13 | Image_Meta, |
| 13 | 14 | Image_Optimization_Error_Type, |
| 14 | - Image_Status | |
| 15 | + Image_Status, | |
| 15 | 16 | }; |
| 16 | 17 | |
| 18 | +use ImageOptimization\Modules\Optimization\Classes\{ | |
| 19 | + Exceptions\Image_File_Already_Exists_Error, | |
| 20 | + Exceptions\Image_Validation_Error, | |
| 21 | + Optimize_Image, | |
| 22 | + Validate_Image, | |
| 23 | +}; | |
| 24 | + | |
| 17 | 25 | use ImageOptimization\Classes\Logger; |
| 18 | 26 | use ImageOptimization\Classes\Exceptions\Quota_Exceeded_Error; |
| 19 | -use ImageOptimization\Modules\Optimization\Classes\Exceptions\Image_File_Already_Exists_Error; | |
| 20 | -use ImageOptimization\Modules\Optimization\Classes\Exceptions\Image_Validation_Error; | |
| 21 | -use ImageOptimization\Modules\Optimization\Classes\Optimize_Image; | |
| 22 | -use ImageOptimization\Modules\Optimization\Classes\Validate_Image; | |
| 27 | +use ImageOptimization\Modules\Connect\Classes\Exceptions\Connection_Error; | |
| 23 | 28 | use ImageOptimization\Modules\Settings\Classes\Settings; |
| 24 | 29 | |
| 25 | 30 | use Throwable; |
| 26 | 31 | use ImageOptimization\Plugin; |
| @@ -86,8 +91,13 @@ | ||
| 86 | 91 | ( new Image_Meta( $image_id ) ) |
| 87 | 92 | ->set_status( Image_Status::OPTIMIZATION_FAILED ) |
| 88 | 93 | ->set_error_type( Image_Optimization_Error_Type::QUOTA_EXCEEDED ) |
| 89 | 94 | ->save(); |
| 95 | + } catch ( Connection_Error $ce ) { | |
| 96 | + ( new Image_Meta( $image_id ) ) | |
| 97 | + ->set_status( Image_Status::OPTIMIZATION_FAILED ) | |
| 98 | + ->set_error_type( Image_Optimization_Error_Type::CONNECTION_ERROR ) | |
| 99 | + ->save(); | |
| 90 | 100 | } catch ( Image_File_Already_Exists_Error $fe ) { |
| 91 | 101 | ( new Image_Meta( $image_id ) ) |
| 92 | 102 | ->set_status( Image_Status::OPTIMIZATION_FAILED ) |
| 93 | 103 | ->set_error_type( Image_Optimization_Error_Type::FILE_ALREADY_EXISTS ) |
| @@ -92,9 +102,9 @@ | ||
| 92 | 102 | ->set_status( Image_Status::OPTIMIZATION_FAILED ) |
| 93 | 103 | ->set_error_type( Image_Optimization_Error_Type::FILE_ALREADY_EXISTS ) |
| 94 | 104 | ->save(); |
| 95 | 105 | } catch ( Throwable $t ) { |
| 96 | - Logger::log( Logger::LEVEL_ERROR, 'Optimization error. Reason: ' . $t->getMessage() ); | |
| 106 | + Logger::error( 'Upload optimization error. Reason: ' . $t->getMessage() ); | |
| 97 | 107 | |
| 98 | 108 | ( new Image_Meta( $image_id ) ) |
| 99 | 109 | ->set_status( Image_Status::OPTIMIZATION_FAILED ) |
| 100 | 110 | ->set_error_type( Image_Optimization_Error_Type::GENERIC ) |