From 27a948737450a37d00a8438702e495a2921169ee Mon Sep 17 00:00:00 2001 From: Paul Kirby Date: Mon, 28 Jan 2019 16:32:15 -0600 Subject: [PATCH 1/3] Updated parser and speech upload single images and add necessary query params for spee.ch side cropping --- classes/LBRY_Speech.php | 36 ++++---- classes/LBRY_Speech_Media.php | 40 ++++----- classes/LBRY_Speech_Parser.php | 150 +++++++++++---------------------- 3 files changed, 88 insertions(+), 138 deletions(-) diff --git a/classes/LBRY_Speech.php b/classes/LBRY_Speech.php index f88929b..93d44a7 100644 --- a/classes/LBRY_Speech.php +++ b/classes/LBRY_Speech.php @@ -22,6 +22,7 @@ class LBRY_Speech if (is_admin()) { add_action('save_post', array($this, 'upload_media'), 10, 2); } + // Replace the image srcsets add_filter('wp_calculate_image_srcset', array($this->parser, 'replace_image_srcset'), 10, 5); // Core filter for lots of image source calls @@ -51,7 +52,7 @@ class LBRY_Speech $all_media = $this->find_media($post_id); - // error_log(print_r($all_media, true)); + error_log(print_r($all_media, true)); // IDEA: Notify user if post save time will take a while if ($all_media) { @@ -92,6 +93,9 @@ class LBRY_Speech curl_multi_add_handle($mh, $request['request']); } + // return; + + // Execute all requests simultaneously $running = null; do { @@ -123,19 +127,19 @@ class LBRY_Speech // Update image meta if ($result && $result->success) { $meta = wp_get_attachment_metadata($media->id); - if ($media->image_size) { - $meta['sizes'][$media->image_size][LBRY_SPEECH_ASSET_URL] = $result->data->serveUrl; - } else { - $meta[LBRY_SPEECH_ASSET_URL] = $result->data->serveUrl; - } + // if ($media->image_size) { + // $meta['sizes'][$media->image_size][LBRY_SPEECH_ASSET_URL] = $result->data->serveUrl; + // } else { + $meta[LBRY_SPEECH_ASSET_URL] = $result->data->serveUrl; + // } wp_update_attachment_metadata($media->id, $meta); } else { // Something unhandled happened here throw new \Exception("Unknown Speech Upload issue for asset"); } } catch (\Exception $e) { - $image_size = $media->image_size ? $media->image_size : 'full'; - error_log('Failed to upload asset with ID ' . $media->id . ' for size ' . $image_size . ' to supplied speech URL.'); - LBRY()->daemon->logger->log('Speech Upload', 'Failed to upload asset with ID ' . $media->id . ' for size ' . $image_size . ' to supplied speech URL. Message | ' . $e->getMessage()); + // $image_size = $media->image_size ? $media->image_size : 'full'; + error_log('Failed to upload asset with ID ' . $media->id . ' to supplied speech URL.'); + LBRY()->daemon->logger->log('Speech Upload', 'Failed to upload asset with ID ' . $media->id . ' to supplied speech URL. Message | ' . $e->getMessage()); error_log($e->getMessage()); } } @@ -186,13 +190,13 @@ class LBRY_Speech // COMBAK: find a way to make this more efficient? // Create a media object for each image size // Get images sizes for this attachment, as not all image sizes implemented - $image_sizes = wp_get_attachment_metadata($attachment_id)['sizes']; - - foreach ($image_sizes as $size => $meta) { - if (!$this->is_published($meta)) { - $all_media[] = new LBRY_Speech_Media($attachment_id, array('image_size' => $size)); - } - } + // $image_sizes = wp_get_attachment_metadata($attachment_id)['sizes']; + // + // foreach ($image_sizes as $size => $meta) { + // if (!$this->is_published($meta)) { + // $all_media[] = new LBRY_Speech_Media($attachment_id, array('image_size' => $size)); + // } + // } } $videos = $this->parser->scrape_videos($content); diff --git a/classes/LBRY_Speech_Media.php b/classes/LBRY_Speech_Media.php index f38b0a8..97b512c 100644 --- a/classes/LBRY_Speech_Media.php +++ b/classes/LBRY_Speech_Media.php @@ -27,7 +27,7 @@ class LBRY_Speech_Media public $thumbnail; - public $image_size = false; + // public $image_size = false; public function __construct(int $attachment_id, $args = array()) { @@ -38,7 +38,7 @@ class LBRY_Speech_Media 'license' => null, 'description' => null, 'thumbnail' => null, - 'image_size' => false, + // 'image_size' => false, ); $settings = array_merge($default, array_intersect_key($args, $default)); @@ -55,24 +55,24 @@ class LBRY_Speech_Media $path = get_attached_file($this->id); // Apply data dependent on whether this is an image 'size' or not - if ($this->image_size) { - $meta = wp_get_attachment_metadata($this->id)['sizes'][$this->image_size]; - $pathinfo = pathinfo($meta['file']); - $ext = '.' . $pathinfo['extension']; - $new_ext = '-' . $meta['width'] . 'x' . $meta['height'] . $ext; - $path = str_replace($ext, $new_ext, $path); - $filename = $pathinfo['basename']; - // COMBAK: Probably wont need this underscore check with Daemon V3 - $this->name = str_replace('_', '-', $pathinfo['filename']); - $this->type = $meta['mime-type']; - $this->title = $pathinfo['filename']; - } else { - $attachment = get_post($this->id); - $filename = wp_basename($path); - $this->name = str_replace('_', '-', $attachment->post_name); - $this->type = $attachment->post_mime_type; - $this->title = $attachment->post_title; - } + // if ($this->image_size) { + // $meta = wp_get_attachment_metadata($this->id)['sizes'][$this->image_size]; + // $pathinfo = pathinfo($meta['file']); + // $ext = '.' . $pathinfo['extension']; + // $new_ext = '-' . $meta['width'] . 'x' . $meta['height'] . $ext; + // $path = str_replace($ext, $new_ext, $path); + // $filename = $pathinfo['basename']; + // // COMBAK: Probably wont need this underscore check with Daemon V3 + // $this->name = str_replace('_', '-', $pathinfo['filename']); + // $this->type = $meta['mime-type']; + // $this->title = $pathinfo['filename']; + // } else { + $attachment = get_post($this->id); + $filename = wp_basename($path); + $this->name = str_replace('_', '-', $attachment->post_name); + $this->type = $attachment->post_mime_type; + $this->title = $attachment->post_title; + // } $this->file = new CURLFile($path, $this->type, $filename); } diff --git a/classes/LBRY_Speech_Parser.php b/classes/LBRY_Speech_Parser.php index 1f86ecf..b8b69cf 100644 --- a/classes/LBRY_Speech_Parser.php +++ b/classes/LBRY_Speech_Parser.php @@ -7,28 +7,23 @@ class LBRY_Speech_Parser { + // COMBAK: May not need this, as replace_attachment_image_src may cover all use cases /** * Replace img srcset attributes with Spee.ch urls * Check https://developer.wordpress.org/reference/functions/wp_calculate_image_srcset/ hook for details */ public function replace_image_srcset($sources, $size_array, $image_src, $image_meta, $attachment_id) { + // If we don't have a speech URL, bail + if (!LBRY()->speech->is_published($image_meta)) { + return; + } + $new_sources = $sources; - $sizes = $image_meta['sizes']; - $base_image = pathinfo($image_src)['basename']; foreach ($sources as $width => $source) { - // Check to see if it is using base image first - if ($image_src == $source['url'] && key_exists(LBRY_SPEECH_ASSET_URL, $image_meta)) { - $new_sources[$width]['url'] = $image_meta[LBRY_SPEECH_ASSET_URL]; - continue; - } - - // Otherwise, find the corresponding size - $speech_url = $this->find_speech_url_by_width($sizes, $width); - - if ($speech_url) { - $new_sources[$width]['url'] = $speech_url; + if ($cropped_url = $this->get_speech_crop_url($source['url'], $image_meta)) { + $new_sources[$width]['url'] = $cropped_url; } } return $new_sources; @@ -44,48 +39,16 @@ class LBRY_Speech_Parser return $image; } - // Die if we don't have a speech_asset_url $image_meta = wp_get_attachment_metadata($attachment_id); + // Die if we don't have a speech_asset_url if (!LBRY()->speech->is_published($image_meta)) { return $image; } $new_image = $image; - - // If the image is the same as the base image, return the base spee.ch url - if (pathinfo($image[0])['basename'] == pathinfo($image_meta['file'])['basename']) { - $new_image[0] = $image_meta[LBRY_SPEECH_ASSET_URL]; - return $new_image; - } - - $sizes = $image_meta['sizes']; - - // If we have a given size, then use that immediately - if (is_string($size)) { - switch ($size) { - case 'full': - $new_image[0] = $image_meta[LBRY_SPEECH_ASSET_URL]; - break; - case 'post-thumbnail': - if (LBRY()->speech->is_published($sizes['thumbnail'])) { - $new_image[0] = $sizes['thumbnail'][LBRY_SPEECH_ASSET_URL]; - } - break; - default: - if (key_exists($size, $sizes) && LBRY()->speech->is_published($sizes[$size])) { - $new_image[0] = $sizes[$size][LBRY_SPEECH_ASSET_URL]; - } - break; - } - return $new_image; - } - - // Otherwise, we can find it by the url provided - $speech_url = $this->find_speech_url_by_file_url($image_meta, $image[0]); - if ($speech_url) { - $new_image[0] = $speech_url; - } + $cropped_url = $this->get_speech_crop_url($image[0], $image_meta); + $new_image[0] = $cropped_url; return $new_image; } @@ -123,13 +86,48 @@ class LBRY_Speech_Parser $id = $this->rigid_attachment_url_to_postid($asset); $meta = wp_get_attachment_metadata($id); - if ($meta && LBRY()->speech->is_published($meta) && $speech_url = $this->find_speech_url_by_file_url($meta, $asset)) { - $new_content = str_replace($asset, $speech_url, $new_content); + + if ($meta && LBRY()->speech->is_published($meta)) { + // If its a video, handle accordingly + if (!key_exists('file', $meta) && key_exists('mime_type', $meta) && $meta['mime_type'] == 'video/mp4') { + $speech_url = $meta[LBRY_SPEECH_ASSET_URL]; + } else { + $speech_url = $this->get_speech_crop_url($asset, $meta); + } + + if ($speech_url) { + $new_content = str_replace($asset, $speech_url, $new_content); + } } } return $new_content; } + /** + * Calculates the crop url for Spee.ch to deliver responsive images + * @param string $image_src The src of the image that needs a spee.ch url + * @param array $image_meta The meta for the attachment that needs a spee.ch url + * @return string The proper Spee.ch URL, false if none found + */ + private function get_speech_crop_url($image_src, $image_meta) + { + $base_url = wp_get_upload_dir()['baseurl']; + $image_file_info = pathinfo($image_meta['file']); + + // If this is the base image, just return it as is + if ($image_file_info['basename'] == pathinfo($image_src)['basename']) { + return $image_meta[LBRY_SPEECH_ASSET_URL]; + } + + // Otherwise, find the crop size + $comparable_url = $base_url . '/' . $image_file_info['dirname'] . '/' . $image_file_info['filename']; + $crop_size = str_replace($comparable_url, '', $image_src); + if (preg_match('/-(\d+)x(\d+)\..+/', $crop_size, $matches)) { + return $image_meta[LBRY_SPEECH_ASSET_URL] . '?w=' . $matches[1] . '&h=' . $matches[2] . '&t=crop'; + } + + return false; + } /** * Scrapes all image tags from content @@ -230,58 +228,6 @@ class LBRY_Speech_Parser return false; } - /** - * Retrieves a speech_asset_url based sizes meta provided - * @param array $sizes Image sizes meta array - * @param string $width The width to look for - * @return string An asset url if found, false if not - */ - private function find_speech_url_by_width($sizes, $width) - { - foreach ($sizes as $key => $size) { - if ($size['width'] == $width && key_exists(LBRY_SPEECH_ASSET_URL, $size)) { - return $size[LBRY_SPEECH_ASSET_URL]; - } - } - - return false; - } - - /** - * Retrieves a speech_asset_url based on a passed url - * @param array $meta The attachment meta data for the asset - * @param string $url The URL of the asset being exchanged - * @return string The URL of the Speech Asset - */ - private function find_speech_url_by_file_url($meta, $url) - { - // See if this looks like video meta - if (!key_exists('file', $meta) && key_exists('mime_type', $meta) && $meta['mime_type'] == 'video/mp4') { - return $meta[LBRY_SPEECH_ASSET_URL]; - } - - $pathinfo = pathinfo($url); - $basename = $pathinfo['basename']; - - // Check main file or if $meta is just a url (video) first - if (key_exists('file', $meta) && $basename == wp_basename($meta['file'])) { - return $meta[LBRY_SPEECH_ASSET_URL]; - } - - // Check to see if we have a meta option here - if (key_exists('sizes', $meta)) { - // Then check sizes - foreach ($meta['sizes'] as $size => $meta) { - if ($basename == $meta['file'] && key_exists(LBRY_SPEECH_ASSET_URL, $meta)) { - return $meta[LBRY_SPEECH_ASSET_URL]; - } - } - } - - // Couldn't make a match - return false; - } - /** * Checks to see if a url is local to this installation * @param string $url From b78cd0a2fc820debf566334e34a436b5703b014a Mon Sep 17 00:00:00 2001 From: Paul Kirby Date: Mon, 28 Jan 2019 16:35:04 -0600 Subject: [PATCH 2/3] Removed error_logs from debugging --- classes/LBRY_Speech.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/classes/LBRY_Speech.php b/classes/LBRY_Speech.php index 93d44a7..3616a36 100644 --- a/classes/LBRY_Speech.php +++ b/classes/LBRY_Speech.php @@ -52,8 +52,6 @@ class LBRY_Speech $all_media = $this->find_media($post_id); - error_log(print_r($all_media, true)); - // IDEA: Notify user if post save time will take a while if ($all_media) { $requests = array(); @@ -73,9 +71,6 @@ class LBRY_Speech if (!empty($speech_channel) && !empty($speech_pw)) { $params['channelName'] = '@' . $speech_channel; $params['channelPassword'] = $speech_pw; - - error_log($params['channelName']); - error_log($params['channelPassword']); } $ch = $this->build_request('publish', $params); From 063478a8250b3dfcb982f196a7bbe451099acbff Mon Sep 17 00:00:00 2001 From: Paul Kirby Date: Mon, 28 Jan 2019 16:36:34 -0600 Subject: [PATCH 3/3] Removed debugging comments --- classes/LBRY_Speech.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/classes/LBRY_Speech.php b/classes/LBRY_Speech.php index 3616a36..665448d 100644 --- a/classes/LBRY_Speech.php +++ b/classes/LBRY_Speech.php @@ -88,9 +88,6 @@ class LBRY_Speech curl_multi_add_handle($mh, $request['request']); } - // return; - - // Execute all requests simultaneously $running = null; do { @@ -122,17 +119,12 @@ class LBRY_Speech // Update image meta if ($result && $result->success) { $meta = wp_get_attachment_metadata($media->id); - // if ($media->image_size) { - // $meta['sizes'][$media->image_size][LBRY_SPEECH_ASSET_URL] = $result->data->serveUrl; - // } else { $meta[LBRY_SPEECH_ASSET_URL] = $result->data->serveUrl; - // } wp_update_attachment_metadata($media->id, $meta); } else { // Something unhandled happened here throw new \Exception("Unknown Speech Upload issue for asset"); } } catch (\Exception $e) { - // $image_size = $media->image_size ? $media->image_size : 'full'; error_log('Failed to upload asset with ID ' . $media->id . ' to supplied speech URL.'); LBRY()->daemon->logger->log('Speech Upload', 'Failed to upload asset with ID ' . $media->id . ' to supplied speech URL. Message | ' . $e->getMessage()); error_log($e->getMessage());