Changeset 1859904

Timestamp:

04/17/2018 05:32:12 PM (8 years ago)

Author:

octify

Message:

Fix timeout. Bump version.

Location:

octify/trunk

Files:

• Libs/OctifyApi.php (modified) (4 diffs)
• Octify.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

octify/trunk/Libs/OctifyApi.php

@@ -220 +220 @@
 
             $imageMeta             = wp_get_attachment_metadata( $id );
-            $imageUrl              = $uploadDirs['baseurl'] . '/' . $imageMeta['file'];
+            $imageUrl              = wp_get_attachment_image_url( $id, 'full' );
             $imagePath             = $uploadDirs['basedir'] . '/' . $imageMeta['file'];
             $imageToProcess[ $id ] = array(
@@ -237 +237 @@
         $imageToProcess = array_filter( $imageToProcess );
         if ( count( $imageToProcess ) ) {
-            $request = wp_remote_post( self::API_ENDPOINT . 'v1/image/bulk_compress2', array(
-                'body'    => array(
-                    'images' => json_encode( $imageToProcess )
-                ),
-                'timeout' => 30
-            ) );
-            if ( is_wp_error( $request ) ) {
-                return $request;
-            }
-            $body = wp_remote_retrieve_body( $request );
-            $body = json_decode( $body, true );
-            if ( ! is_array( $body ) ) {
-                return new \WP_Error( 'invalid_response', 'Please try again' );
-            }
-            if ( $body['status'] == 1 ) {
-                return array(
-                    'success' => array_keys( $imageToProcess ),
-                    'fail'    => array()
-                );
-            } else {
-                //get the error and success
-                $success = array_keys( $imageToProcess );
-                $fail    = array();
-                foreach ( $body['error'] as $error ) {
-                    unset( $success[ $error['meta'] ] );
-                    $fail[] = array(
-                        'id'    => $error['meta'],
-                        'error' => $error['error'],
-                        'code'  => $error['errorCode']
-                    );
-                    if ( $error['errorCode'] == 'expired' ) {
-                        $license              = get_option( self::LICENSE_NAME, false );
-                        $license['isExpired'] = true;
-                        update_option( self::LICENSE_NAME, $license );
+            $chunks = array_chunk( $imageToProcess, 10 );
+            $data   = array(
+                'success' => array(),
+                'fail'    => array()
+            );
+            foreach ( $chunks as $chunk ) {
+                $request = wp_remote_post( self::API_ENDPOINT . 'v1/image/bulk_compress2', array(
+                    'body'    => array(
+                        'images' => json_encode( $chunk )
+                    ),
+                    'timeout' => 60
+                ) );
+
+                if ( is_wp_error( $request ) ) {
+                    return $request;
+                }
+                $body = wp_remote_retrieve_body( $request );
+                $body = json_decode( $body, true );
+                if ( ! is_array( $body ) ) {
+
+                    return new \WP_Error( 'invalid_response', 'Please try again' );
+                }
+                if ( $body['status'] == 1 ) {
+                    $data['success'] = array_merge( $data['success'], array_keys( $imageToProcess ) );
+                } else {
+                    //get the error and success
+                    $success = array_keys( $imageToProcess );
+                    $fail    = array();
+                    foreach ( $body['error'] as $error ) {
+                        unset( $success[ $error['meta'] ] );
+                        $fail[] = array(
+                            'id'    => $error['meta'],
+                            'error' => $error['error'],
+                            'code'  => $error['errorCode']
+                        );
+                        if ( $error['errorCode'] == 'expired' ) {
+                            $license              = get_option( self::LICENSE_NAME, false );
+                            $license['isExpired'] = true;
+                            update_option( self::LICENSE_NAME, $license );
+                        }
                     }
+                    $data['success'] = array_merge( $data['success'], $success );
+                    $data['fail']    = array_merge( $data['fail'], $fail );
                 }
-
-                return array(
-                    'success' => $success,
-                    'fail'    => $fail
-                );
-            }
+            }
+
+            return $data;
         } else {
             return false;
@@ -313 +318 @@
             return;
         }
-        file_put_contents( __DIR__ . '/test', var_export( $data, true ) . PHP_EOL, FILE_APPEND );
         $comparedHmac = $data['hmac'];
         unset( $data['hmac'] );
@@ -347 +351 @@
             }
             $tmp = download_url( $data['image_url'] );
-
             if ( is_wp_error( $tmp ) ) {
                 update_post_meta( $attachmentId, self::META_STATUS, 'error' );

octify/trunk/Octify.php

@@ -4 +4 @@
  * Plugin URI: https://octify.io
  * Description: Octify Image Compression for WordPress.
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: Octify
  * Author URI: https://octify.io

octify/trunk/readme.txt

@@ -1 +1 @@
 === WordPress Image Compression Plugin - Octify ===
 Plugin Name: Octify
-Version: 1.1.1
+Version: 1.1.3
 Author: Octify
 Author URI: https://octify.io/
@@ -7 +7 @@
 Tags: Image Compression, Image Optimisation, resize, optimise, performance, optimize, compress images, optimize images, optimise images, image optimization.
 Tested up to: 4.9.5 
-Stable tag: 1.1.2
+Stable tag: 1.1.3
 Requires PHP: 5.2.4
 License: GPLv2
@@ -141 +141 @@
 == Changelog ==
 
+== 1.1.3 == 
+
+* Fix issue with sending images to API timing out
+* Improve chunked data
+
+== 1.1.2 ==
+
+* Small fixes
+
 == 1.1.1 ==
 * Add top level menu link