Skip to content

Commit

Permalink
:shipit: release 1.8.4
Browse files Browse the repository at this point in the history 
Solve Auphonic performance issue (mainly by caching cURL requests that
are only needed in the settings screen)
  • Loading branch information
@eteubert
eteubert committed Jul 27, 2013
1 parent 5ea8062 commit a7a7d3d
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 38 deletions.
123 changes: 86 additions & 37 deletions lib/modules/auphonic/auphonic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,17 @@ public function load() {
. __( 'You need to allow Podlove Publisher to access your Auphonic account. You will be redirected to this page once the auth process completed.', 'podlove' )
. '<br><a href="' . $auth_url . '" class="button button-primary">' . __( 'Authorize now', 'podlove' ) . '</a>';
$this->register_option( 'auphonic_api_key', 'hidden', array(
'label' => __( 'Authorization', 'podlove' ),
'description' => $description,
'html' => array( 'class' => 'regular-text' )
'label' => __( 'Authorization', 'podlove' ),
'description' => $description,
'html' => array( 'class' => 'regular-text' )
) );
} else {
$ch = curl_init('https://auphonic.com/api/user.json');
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
curl_setopt($ch, CURLOPT_USERAGENT, \Podlove\Http\Curl::user_agent());
curl_setopt($ch, CURLOPT_HTTPHEADER, array(
'Content-type: application/json',
'Authorization: Bearer '.$this->get_module_option('auphonic_api_key'))
);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

$decoded_user_information = json_decode(curl_exec($ch));

if(isset($decoded_user_information) AND $decoded_user_information !== "") {
$user = $this->fetch_authorized_user();
if( isset($user) AND $user !== "" ) {
$description = '<i class="podlove-icon-ok"></i> '
. sprintf(
__( 'You are logged in as <strong>'.$decoded_user_information->data->username.'</strong>. If you want to logout, click %shere%s.', 'podlove' ),
__( 'You are logged in as %s. If you want to logout, click %shere%s.', 'podlove' ),
'<strong>' . $user->data->username . '</strong>',
'<a href="' . admin_url( 'admin.php?page=podlove_settings_modules_handle&reset_auphonic_auth_code=1' ) . '">',
'</a>'
);
Expand All @@ -60,44 +51,100 @@ public function load() {
__( 'Something went wrong with the Auphonic connection. Please reset the connection and authorize again. To do so click %shere%s', 'podlove' ),
'<a href="' . admin_url( 'admin.php?page=podlove_settings_modules_handle&reset_auphonic_auth_code=1' ) . '">',
'</a>'
);
);
}

$this->register_option( 'auphonic_api_key', 'hidden', array(
'label' => __( 'Authorization', 'podlove' ),
'description' => $description,
'html' => array( 'class' => 'regular-text' )
'label' => __( 'Authorization', 'podlove' ),
'description' => $description,
'html' => array( 'class' => 'regular-text' )
) );

// Fetch Auphonic presets

$ch = curl_init('https://auphonic.com/api/presets.json');
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
curl_setopt($ch, CURLOPT_USERAGENT, \Podlove\Http\Curl::user_agent());
curl_setopt($ch, CURLOPT_HTTPHEADER, array(
'Content-type: application/json',
'Authorization: Bearer '.$this->get_module_option('auphonic_api_key'))
);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

$decoded_presets = json_decode(curl_exec($ch));
$presets = $this->fetch_presets();
$preset_list = array();

foreach($decoded_presets->data as $preset_id => $preset_information) {
$preset_list[$preset_information->uuid] = $preset_information->preset_name;
foreach( $presets->data as $preset_id => $preset ) {
$preset_list[ $preset->uuid ] = $preset->preset_name;
}

$this->register_option( 'auphonic_production_preset', 'select', array(
'label' => __( 'Auphonic production preset', 'podlove' ),
'description' => 'This preset will be used, if you create Auphonic production from an Episode.',
'html' => array( 'class' => 'regular-text' ),
'options' => $preset_list
'label' => __( 'Auphonic production preset', 'podlove' ),
'description' => 'This preset will be used, if you create Auphonic production from an Episode.',
'html' => array( 'class' => 'regular-text' ),
'options' => $preset_list
) );

}

add_action( 'save_post', array( $this, 'save_post' ) );
}

/**
* Fetch name of logged in user via Auphonic API.
*
* Cached in transient "podlove_auphonic_user".
*
* @return string
*/
public function fetch_authorized_user() {
$cache_key = 'podlove_auphonic_user';

if ( ( $user = get_transient( $cache_key ) ) !== FALSE ) {
return $user;
} else {
if ( ! ( $token = $this->get_module_option('auphonic_api_key') ) )
return "";

$ch = curl_init( 'https://auphonic.com/api/user.json' );
curl_setopt( $ch, CURLOPT_CUSTOMREQUEST, "GET" );
curl_setopt( $ch, CURLOPT_USERAGENT, \Podlove\Http\Curl::user_agent() );
curl_setopt( $ch, CURLOPT_HTTPHEADER, array(
'Content-type: application/json',
'Authorization: Bearer ' . $this->get_module_option('auphonic_api_key') )
);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
$decoded_user = json_decode( curl_exec( $ch ) );

$user = $decoded_user ? $decoded_user : FALSE;
set_transient( $cache_key, $user, 60*60*24*365 ); // 1 year, we devalidate manually
return $user;
}
}

/**
* Fetch list of presets via Auphonic APU.
*
* Cached in transient "podlove_auphonic_presets".
*
* @return string
*/
public function fetch_presets() {
$cache_key = 'podlove_auphonic_presets';

if ( ( $presets = get_transient( $cache_key ) ) !== FALSE ) {
return $presets;
} else {
if ( ! ( $token = $this->get_module_option('auphonic_api_key') ) )
return "";

$ch = curl_init( 'https://auphonic.com/api/presets.json' );
curl_setopt( $ch, CURLOPT_CUSTOMREQUEST, "GET" );
curl_setopt( $ch, CURLOPT_USERAGENT, \Podlove\Http\Curl::user_agent() );
curl_setopt( $ch, CURLOPT_HTTPHEADER, array(
'Content-type: application/json',
'Authorization: Bearer ' . $this->get_module_option('auphonic_api_key') )
);
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );

$decoded_presets = json_decode( curl_exec( $ch ) );

$presets = $decoded_presets ? $decoded_presets : FALSE;
set_transient( $cache_key, $presets, 60*60*24*365 ); // 1 year, we devalidate manually
return $presets;
}
}

public function save_post( $post_id ) {

if ( get_post_type( $post_id ) !== 'podcast' )
Expand Down Expand Up @@ -297,6 +344,8 @@ public function check_code() {

if ( isset( $_GET["reset_auphonic_auth_code"] ) && $_GET["reset_auphonic_auth_code"] == "1" ) {
$this->update_module_option('auphonic_api_key', "");
delete_transient('podlove_auphonic_user');
delete_transient('podlove_auphonic_presets');
header('Location: '.get_site_url().'/wp-admin/admin.php?page=podlove_settings_modules_handle');
}

Expand Down
2 changes: 1 addition & 1 deletion podlove.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Podlove Podcast Publisher
* Plugin URI: http://wordpress.org/extend/plugins/podlove-podcasting-plugin-for-wordpress/
* Description: The one and only next generation podcast feed generator. Seriously. It's magical and sparkles a lot.
* Version: 1.8.3-alpha
* Version: 1.8.4-alpha
* Author: eteubert
* Author URI: [email protected]
* License: MIT
Expand Down
3 changes: 3 additions & 0 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ Find the setting Flattr > Advanced Settings > Flattrable content > Post Types an

== Changelog ==

= 1.8.4 (2013-07-27) =
* Fix: Performance issue in Auphonic plugin

= 1.8.3 (2013-07-27) =
* Enhancement: dates with leading zeros in Auphonic module
* Enhancement: Auphonic UI smoothifications
Expand Down

0 comments on commit a7a7d3d

Please sign in to comment.