Added webp and other misc helper function, improved CURL api calls

Author: gdarko

src/Http/BaseClient.php

@@ -141,6 +141,8 @@ public static function download( $url, $save_filepath ) {
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 		curl_setopt( $ch, CURLOPT_BINARYTRANSFER, 1 );
 		curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+		curl_setopt( $ch, CURLOPT_HTTPHEADER, array( "Accept" => "application/json" ) );
+		curl_setopt( $ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
 		$response = curl_exec( $ch );
 		if ( false === $response ) {
 			$curl_error = curl_error( $ch );
@@ -184,6 +186,7 @@ public static function get_user_agent() {
 
 	/**
 	 * Set the user agent
+	 *
 	 * @param $user_agent
 	 */
 	public static function set_user_agent( $user_agent ) {

src/Http/Client.php

@@ -79,13 +79,14 @@ public static function _get( $url, $api_key = null ) {
 		curl_setopt( $ch, CURLOPT_FAILONERROR, 0 );
 		curl_setopt( $ch, CURLOPT_TIMEOUT, self::TIMEOUT );
 		curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+		curl_setopt( $ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+
+		// Setup headers
+		$headers = array( 'Accept: application/json' );
 		if ( ! is_null( $api_key ) ) {
-			curl_setopt(
-				$ch, CURLOPT_HTTPHEADER, array(
-					self::AUTH_HEADER . ': ' . $api_key
-				)
-			);
+			array_push( $headers, self::AUTH_HEADER . ': ' . $api_key );
 		}
+		curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
 
 		$response = curl_exec( $ch );
 		curl_close( $ch );
@@ -127,13 +128,15 @@ public static function _post( $url, $data, $files = array(), $api_key = null ) {
 		curl_setopt( $ch, CURLOPT_FAILONERROR, 0 );
 		curl_setopt( $ch, CURLOPT_TIMEOUT, self::TIMEOUT );
 		curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+		curl_setopt( $ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+
+		// Setup headers
+		$headers = array( 'Accept: application/json' );
 		if ( ! is_null( $api_key ) ) {
-			curl_setopt(
-				$ch, CURLOPT_HTTPHEADER, array(
-					self::AUTH_HEADER . ': ' . $api_key
-				)
-			);
+			array_push( $headers, self::AUTH_HEADER . ': ' . $api_key );
 		}
+		curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
+
 		$response = curl_exec( $ch );
 		if ( false === $response ) {
 			$curl_error = curl_error( $ch );

src/Optimizer.php

@@ -39,7 +39,7 @@ class Optimizer {
 	const RESOURCE_FILES = 'files';
 	const MAX_ALLOWED_RESOURCES = 5;
 
-	const VERSION = '1.0.3';
+	const VERSION = '1.0.4';
 	/**
 	 * @var string
 	 */
@@ -305,4 +305,19 @@ public function get_user_info() {
 		return $this->service->get_user_info();
 	}
 
+
+	/**
+	 * Is valid compression level?
+	 *
+	 * @param $level
+	 *
+	 * @return bool
+	 */
+	public static function valid_compression_level($level) {
+		return in_array($level, array(
+			self::COMPRESSION_LOSSLESS,
+			self::COMPRESSION_INTELLIGENT,
+			self::COMPRESSION_ULTRA,
+		));
+	}
 }

src/Responses/Response.php

@@ -230,4 +230,19 @@ public function getRawResponse() {
 	public function getProcessId() {
 		return $this->process_id;
 	}
+
+	/**
+	 * Returns the result by file name
+	 * @param $file_name
+	 *
+	 * @return Result|mixed|null
+	 */
+	public function getResultByFileName($file_name) {
+		foreach($this->result as $result) {
+			if($result->getFileName() === $file_name) {
+				return $result;
+			}
+		}
+		return null;
+	}
 }

src/Responses/Result.php

@@ -62,6 +62,12 @@ class Result implements IFile {
 	 */
 	private $webp;
 
+	/**
+	 * If image optimization saved percent is equal or less than 5% it wont count so this will be 0.
+	 * @var int
+	 */
+	private $success;
+
 	/**
 	 * The local file
 	 * If this is not null it means a file by path was optimized and this is it's local path.
@@ -97,6 +103,9 @@ public function __construct( $result ) {
 		if ( isset( $result->url ) ) {
 			$this->url = $result->url;
 		}
+		if ( isset( $result->success ) ) {
+			$this->success = intval($result->success);
+		}
 		if ( isset( $result->webp ) ) {
 			$this->webp = new ResultWebP($result);
 		}
@@ -168,6 +177,21 @@ public function getWebP() {
 		return $this->webp;
 	}
 
+	/**
+	 * Check if the attachment was optimized.
+	 * @return bool
+	 */
+	public function isSuccessfullyOptimized() {
+		return $this->success == 1;
+	}
+
+	/**
+	 * Check if the attachment was already optimized.
+	 * @return bool
+	 */
+	public function isAlreadyOptimized() {
+		return $this->success == 0;
+	}
 
 	/**
 	 * Overwrite the local file with the optimized file

src/Responses/ResultWebP.php

@@ -20,6 +20,9 @@
 
 namespace MegaOptim\Responses;
 
+use MegaOptim\Tools\FileSystem;
+use MegaOptim\Http\Client;
+
 class ResultWebP {
 	public $url;
 	public $optimized_size;
@@ -34,4 +37,32 @@ public function __construct($response) {
 			$this->saved_percent = $response->webp->saved_percent;
 		}
 	}
+
+	/**
+	 * Save the optimized file to the full path
+	 *
+	 * @param $path
+	 *
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	public function saveAsFile( $path ) {
+		if(is_null($this->url)) {
+			return false;
+		}
+		FileSystem::maybe_prepare_output_dir( $path );
+		if ( ! Client::download( $this->url, $path ) ) {
+			throw new \Exception( 'Unable to overwrite the local file.' );
+		}
+		return $path;
+
+	}
+
+	/**
+	 * Return the saved bytes
+	 * @return mixed
+	 */
+	public function getSavedBytes() {
+		return $this->saved_bytes;
+	}
 }