Merge pull request JorgenPhi#25 from hisham-albeik/identify_compression

Identify compression

Author: JorgenPhi

src/snapchat.php

@@ -665,6 +665,11 @@ public function unblock($username) {
 	 *
 	 * @return mixed
 	 *   The snap data or FALSE on failure.
+	 *     Snap data can returned as an Array of more than one file.
+	 * 	array(
+	 * 		overlay~zip-CE6F660A-4A9F-4BD6-8183-245C9C75B8A0    => overlay_file_data,
+	 *		media~zip-CE6F660A-4A9F-4BD6-8183-245C9C75B8A0	    => m4v_file_data
+	 * 	)
 	 */
 	public function getMedia($id) {
 		// Make sure we're logged in and have a valid access token.
@@ -695,6 +700,18 @@ public function getMedia($id) {
 			if (parent::isMedia(substr($result, 0, 2))) {
 				return $result;
 			}
+			
+			//When a snapchat video is sent with "text" or overlay
+			//the overlay is a transparent PNG file Zipped together
+			//with the M4V file.
+			//First two bytes are "PK" x50x4B; thus the previous media check
+			//will fail and would've returned a FALSE on an available media.
+			if (parent::isCompressed(substr($result, 0, 2))) {
+				//Uncompress
+				$result = parent::unCompress($result);
+				//Return Media and Overlay
+				return $result;
+			}
 		}
 
 		return FALSE;

src/snapchat_agent.php

@@ -189,6 +189,59 @@ function isMedia($data) {
 		return FALSE;
 	}
 
+	/**
+	 * Checks to see if a blob looks like a compressed file.
+	 *
+	 * @param data $data
+	 *   The blob data (or just the header).
+	 *
+	 * @return bool
+	 *   TRUE if the blob looks like a compressed file, FALSE otherwise.
+	 */
+	function isCompressed($data) {
+		// Check for a PK header.
+		if ($data[0] == chr(0x50) && $data[1] == chr(0x4B)) {
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Uncompress the blob and put the data into an Array.
+	 * 	Array(
+	 * 		overlay~zip-CE6F660A-4A9F-4BD6-8183-245C9C75B8A0	=> overlay_file_data,
+	 *		media~zip-CE6F660A-4A9F-4BD6-8183-245C9C75B8A0		=> m4v_file_data
+	 * 	)
+	 *
+	 * @param data $data
+	 *   The blob data (or just the header).
+	 *
+	 * @return array
+	 *   Array containing both file contents, or FALSE if couldn't extract.
+	 */
+	function unCompress($data) {
+		if (!file_put_contents("./temp", $data)) {
+			exit('Should have write access to own folder');
+		}
+		$resource = zip_open("./temp");
+		$result = FALSE;
+		if (is_resource($resource)) {
+			while($zip_entry = zip_read($resource)) {
+				$filename = zip_entry_name($zip_entry);
+				if (zip_entry_open($resource, $zip_entry, "r")) {
+					$result[$filename] = zip_entry_read($zip_entry, zip_entry_filesize($zip_entry));
+					zip_entry_close($zip_entry);
+				} else {
+					return FALSE;
+				}
+			}
+			zip_close($resource);
+		}
+		
+		return $result;
+	}
+
 	/**
 	 * Performs a GET request. Currently only used for story blobs.
 	 *