* Copyright (C) 2006 the VideoLAN team
* $Id$
*
- * Authors: Rafaël Carré <rafael -dot- carre -at- gmail -dot- com>
+ * Authors: Rafaël Carré <funman at videolan org>
* Kenneth Ostby <kenneo -at- idi -dot- ntnu -dot- no>
*
* This program is free software; you can redistribute it and/or modify
#define _GNU_SOURCE
#include <string.h>
-#if !defined( strlwr ) && !defined( WIN32 )
-#include <ctype.h>
-#endif
-
#if defined( WIN32 )
#include <time.h>
#endif
/*
* TODO :
- * review/replace :
- * hexa()
- * md5 to char[]
+ * implement musicbrainz unique track identifier in p_meta
+ * check meta_engine's state, and remove delaying of metadata reading
+ * check md5 operations on BIGENDIAN and 64 bits architectures
*/
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc_stream.h>
#include <vlc_url.h>
#include <network.h>
+#include <vlc_interaction.h>
/*****************************************************************************
* Local prototypes
char *psz_t; /* track title */
char *psz_b; /* track album */
int i_l; /* track length */
-/* vlc can't retrieve musicbrainz id, so let's ignore it */
-/* int i_m; */ /* musicbrainz id */
+ char *psz_m; /* musicbrainz id */
char *psz_i; /* date */
time_t time_playing; /* date (epoch) */
} audioscrobbler_song_t;
char *psz_response_md5; /* md5 response to use */
/* data about input elements */
- input_thread_t *p_input; /* previous p_input */
audioscrobbler_song_t *p_current_song; /* song being played */
time_t time_pause; /* time when vlc paused */
time_t time_total_pauses; /* sum of time in pause */
vlc_bool_t b_queued; /* has it been queud ? */
vlc_bool_t b_metadata_read; /* did we read metadata ? */
vlc_bool_t b_paused; /* are we playing ? */
+ vlc_bool_t b_waiting_meta; /* we need fetched data? */
};
-intf_sys_t *p_sys_global; /* for use same p_sys in all threads */
+intf_sys_t *p_sys_global; /* to retrieve p_sys in Run() thread */
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static int AddToQueue ( intf_thread_t *p_this );
static int Handshake ( intf_thread_t *p_sd );
static int ReadMetaData ( intf_thread_t *p_this );
+static int ReadLocalMetaData( intf_thread_t *p_this, input_thread_t *p_input );
void DeleteQueue( audioscrobbler_queue_t *p_queue );
-char *hexa( short int i );
-
-#if !defined(strlwr) && !defined( WIN32 )
-char* strlwr(char *psz_string);
-#endif
/*****************************************************************************
* Module descriptor
#define APPLICATION_NAME "VLC media player"
#define USERNAME_TEXT N_("Username")
-#define USERNAME_LONGTEXT N_("Audioscrobbler username")
+#define USERNAME_LONGTEXT N_("The username of your last.fm account")
#define PASSWORD_TEXT N_("Password")
-#define PASSWORD_LONGTEXT N_("Audioscrobbler password")
+#define PASSWORD_LONGTEXT N_("The password of your last.fm account")
+
+/* if something goes wrong, we wait at least one minute before trying again */
#define DEFAULT_INTERVAL 60
+/* last.fm client identifier */
#define CLIENT_NAME PACKAGE
#define CLIENT_VERSION VERSION
/* data to submit */
#define POST_DATA "u=%s&s=%s&a%%5B%d%%5D=%s&t%%5B%d%%5D=%s" \
- "&b%%5B%d%%5D=%s&m%%5B%d%%5D=&l%%5B%d%%5D=%d&i%%5B%d%%5D=%s"
+ "&b%%5B%d%%5D=%s&m%%5B%d%%5D=%s&l%%5B%d%%5D=%d&i%%5B%d%%5D=%s"
vlc_module_begin();
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
set_shortname( N_( "Audioscrobbler" ) );
- set_description( _("Audioscrobbler submission Plugin") );
+ set_description( N_("Audioscrobbler submission Plugin") );
add_string( "lastfm-username", "", NULL,
- USERNAME_TEXT, USERNAME_LONGTEXT, VLC_TRUE );
+ USERNAME_TEXT, USERNAME_LONGTEXT, VLC_FALSE );
add_string( "lastfm-password", "", NULL,
- PASSWORD_TEXT, PASSWORD_LONGTEXT, VLC_TRUE );
+ PASSWORD_TEXT, PASSWORD_LONGTEXT, VLC_FALSE );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
static int Open( vlc_object_t *p_this )
{
- intf_thread_t *p_intf;
- intf_sys_t *p_sys;
playlist_t *p_playlist;
- p_intf = ( intf_thread_t* ) p_this;
- p_sys = malloc( sizeof( intf_sys_t ) );
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
+ intf_sys_t *p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_sys )
{
goto error;
}
-
vlc_mutex_init( p_this, &p_sys->lock );
p_sys_global = p_sys;
p_sys->i_interval = 0;
p_sys->time_last_interval = time( NULL );
p_sys->psz_username = NULL;
- p_sys->p_input = NULL;
p_sys->b_paused = VLC_FALSE;
/* md5 response is 32 chars, + final \0 */
static void Close( vlc_object_t *p_this )
{
audioscrobbler_queue_t *p_current_queue, *p_next_queue;
+ playlist_t *p_playlist;
input_thread_t *p_input;
- intf_thread_t *p_intf = (intf_thread_t* ) p_this;
- intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
- p_playlist = pl_Yield( p_intf );
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ p_playlist = pl_Yield( p_intf );
PL_LOCK;
p_input = p_playlist->p_input;
- if( p_input ) vlc_object_yield( p_input );
- PL_UNLOCK;
+ var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- if( p_input )
+ if ( p_input )
{
+ vlc_object_yield( p_input );
var_DelCallback( p_input, "state", PlayingChange, p_intf );
+ vlc_object_release( p_input );
}
+ PL_UNLOCK;
pl_Release( p_playlist );
vlc_mutex_lock ( &p_sys->lock );
free( p_current_queue );
vlc_mutex_lock ( &p_sys->lock );
- if ( p_sys->psz_username )
- {
- free( p_sys->psz_username );
- }
-
+ free( p_sys->psz_username );
free( p_sys->p_current_song );
vlc_mutex_unlock ( &p_sys->lock );
vlc_mutex_destroy( &p_sys->lock );
static void Run( intf_thread_t *p_this )
{
char *psz_submit_string = NULL;
- int i_handshake;
- int i_netprintf;
+ int i_net_ret;
int i_song;
playlist_t *p_playlist;
uint8_t *p_buffer = NULL;
char *p_buffer_pos = NULL;
- time_t played_time;
audioscrobbler_queue_t *p_first_queue;
- intf_sys_t *p_sys;
+ /* TODO: remove when meta_engine works */
+ time_t played_time;
p_this->p_sys = p_sys_global;
- p_sys = p_this->p_sys;
+ intf_sys_t *p_sys = p_this->p_sys;
+
+ /* main loop */
while( !p_this->b_die )
{
- if( p_sys->b_handshaked == VLC_FALSE )
+ /* verify if there is data to submit
+ * and if waiting interval is finished */
+ if ( ( p_sys->p_first_queue->i_songs_nb > 0 ) &&
+ ( time( NULL ) >=
+ ( p_sys->time_last_interval + p_sys->i_interval ) ) )
{
- if ( time( NULL ) >=
- ( p_sys->time_last_interval + p_sys->i_interval ) )
+ /* handshake if needed */
+ if( p_sys->b_handshaked == VLC_FALSE )
{
msg_Dbg( p_this, "Handshaking with last.fm ..." );
- i_handshake = Handshake( p_this );
-
- if( i_handshake == VLC_ENOMEM )
+
+ switch( Handshake( p_this ) )
{
- msg_Err( p_this, "Out of memory" );
- return;
+ case VLC_ENOMEM:
+ msg_Err( p_this, "Out of memory" );
+ return;
+ break;
+
+ case VLC_ENOVAR:
+ /* username not set */
+ vlc_mutex_unlock ( &p_sys->lock );
+ intf_UserFatal( p_this, VLC_FALSE,
+ _("last.fm username not set"),
+ _("You have to set a username,"
+ " and then restart VLC.\n"
+ "Visit https://www.last.fm/join/"
+ " if you don't have one.")
+ );
+ return;
+ break;
+
+ case VLC_SUCCESS:
+ msg_Dbg( p_this, "Handshake successfull :)" );
+ vlc_mutex_lock ( &p_sys->lock );
+ p_sys->b_handshaked = VLC_TRUE;
+ vlc_mutex_unlock ( &p_sys->lock );
+ break;
+
+ case VLC_EGENERIC:
+ default:
+ /* VLC_EGENERIC : we'll try later */
+ vlc_mutex_lock ( &p_sys->lock );
+ p_sys->i_interval = DEFAULT_INTERVAL;
+ time( &p_sys->time_last_interval );
+ vlc_mutex_unlock ( &p_sys->lock );
+ break;
}
+ }
- else if( i_handshake == VLC_ENOVAR )
- /* username not set */
- {
- msg_Dbg( p_this, "Set an username then restart vlc" );
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
+ msg_Dbg( p_this, "Going to submit some data..." );
+ vlc_mutex_lock ( &p_sys->lock );
+ psz_submit_string = malloc( 2048 * sizeof( char ) );
- else if( i_handshake == VLC_SUCCESS )
- {
- msg_Dbg( p_this, "Handshake successfull :)" );
- vlc_mutex_lock ( &p_sys->lock );
- p_sys->b_handshaked = VLC_TRUE;
- vlc_mutex_unlock ( &p_sys->lock );
- }
-
- else
- {
- vlc_mutex_lock ( &p_sys->lock );
- p_sys->i_interval = DEFAULT_INTERVAL;
- time( &p_sys->time_last_interval );
- vlc_mutex_unlock ( &p_sys->lock );
- }
+ if (!psz_submit_string)
+ {
+ msg_Err( p_this, "Out of memory" );
+ vlc_mutex_unlock ( &p_sys->lock );
+ return;
}
- }
- else
- {
- if ( ( p_sys->p_first_queue->i_songs_nb > 0 ) &&
- ( time( NULL ) >=
- ( p_sys->time_last_interval + p_sys->i_interval ) ) )
+ /* forge the HTTP POST request */
+ for (i_song = 0; i_song < p_sys->p_first_queue->i_songs_nb ;
+ i_song++ )
{
- msg_Dbg( p_this, "Going to submit some data..." );
- vlc_mutex_lock ( &p_sys->lock );
- psz_submit_string = malloc( 2048 * sizeof( char ) );
-
- if (!psz_submit_string)
- {
- msg_Err( p_this, "Out of memory" );
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
-
- for (i_song = 0; i_song < p_sys->p_first_queue->i_songs_nb ;
- i_song++ )
- {
- snprintf( psz_submit_string, 2048, POST_DATA,
- p_sys->psz_username, p_sys->psz_response_md5,
- i_song, p_sys->p_first_queue->p_queue[i_song]->psz_a,
- i_song, p_sys->p_first_queue->p_queue[i_song]->psz_t,
- i_song, p_sys->p_first_queue->p_queue[i_song]->psz_b,
- i_song,
- i_song, p_sys->p_first_queue->p_queue[i_song]->i_l,
- i_song, p_sys->p_first_queue->p_queue[i_song]->psz_i
- );
- }
+ snprintf( psz_submit_string, 2048, POST_DATA,
+ p_sys->psz_username, p_sys->psz_response_md5,
+ i_song, p_sys->p_first_queue->p_queue[i_song]->psz_a,
+ i_song, p_sys->p_first_queue->p_queue[i_song]->psz_t,
+ i_song, p_sys->p_first_queue->p_queue[i_song]->psz_b,
+ i_song, p_sys->p_first_queue->p_queue[i_song]->psz_m,
+ i_song, p_sys->p_first_queue->p_queue[i_song]->i_l,
+ i_song, p_sys->p_first_queue->p_queue[i_song]->psz_i
+ );
+ }
- p_sys->i_post_socket = net_ConnectTCP( p_this,
- p_sys->psz_submit_host, p_sys->i_submit_port);
+ p_sys->i_post_socket = net_ConnectTCP( p_this,
+ p_sys->psz_submit_host, p_sys->i_submit_port);
- i_netprintf = net_Printf(
- VLC_OBJECT(p_this), p_sys->i_post_socket, NULL,
- POST_REQUEST, p_sys->psz_submit_file,
- strlen( psz_submit_string), p_sys->psz_submit_file,
- VERSION, psz_submit_string
- );
+ /* we transmit the data */
+ i_net_ret = net_Printf(
+ VLC_OBJECT(p_this), p_sys->i_post_socket, NULL,
+ POST_REQUEST, p_sys->psz_submit_file,
+ strlen( psz_submit_string), p_sys->psz_submit_file,
+ VERSION, psz_submit_string
+ );
- if ( i_netprintf == -1 )
- {
+ if ( i_net_ret == -1 )
+ {
/* If connection fails, we assume we must handshake again */
- p_sys->i_interval = DEFAULT_INTERVAL;
- time( &p_sys->time_last_interval );
- p_sys->b_handshaked = VLC_FALSE;
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
-
- p_buffer = ( uint8_t* ) calloc( 1, 1024 );
- if ( !p_buffer )
- {
- msg_Err( p_this, "Out of memory" );
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
+ p_sys->i_interval = DEFAULT_INTERVAL;
+ time( &p_sys->time_last_interval );
+ p_sys->b_handshaked = VLC_FALSE;
+ vlc_mutex_unlock( &p_sys->lock );
+ continue;
+ }
- net_Read( p_this, p_sys->i_post_socket, NULL,
- p_buffer, 1024, VLC_FALSE );
- net_Close( p_sys->i_post_socket );
+ p_buffer = ( uint8_t* ) calloc( 1, 1024 );
+ if ( !p_buffer )
+ {
+ msg_Err( p_this, "Out of memory" );
+ vlc_mutex_unlock ( &p_sys->lock );
+ return;
+ }
- p_buffer_pos = strstr( ( char * ) p_buffer, "INTERVAL" );
+ i_net_ret = net_Read( p_this, p_sys->i_post_socket, NULL,
+ p_buffer, 1024, VLC_FALSE );
+ if ( i_net_ret <= 0 )
+ {
+ /* if we get no answer, something went wrong : try again */
+ vlc_mutex_unlock( &p_sys->lock );
+ continue;
+ }
- if ( p_buffer_pos )
- {
- p_sys->i_interval = atoi( p_buffer_pos +
- strlen( "INTERVAL " ) );
- time( &p_sys->time_last_interval );
- }
+ net_Close( p_sys->i_post_socket );
- p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
+ /* record interval */
+ p_buffer_pos = strstr( ( char * ) p_buffer, "INTERVAL" );
+ if ( p_buffer_pos )
+ {
+ p_sys->i_interval = atoi( p_buffer_pos +
+ strlen( "INTERVAL " ) );
+ time( &p_sys->time_last_interval );
+ }
- if ( p_buffer_pos )
- {
- msg_Err( p_this, p_buffer_pos );
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
+ p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
+ if ( p_buffer_pos )
+ {
+ /* woops, something failed */
+ msg_Dbg( p_this, p_buffer_pos );
+ vlc_mutex_unlock ( &p_sys->lock );
+ continue;
+ }
- p_buffer_pos = strstr( ( char * ) p_buffer, "BADAUTH" );
+ p_buffer_pos = strstr( ( char * ) p_buffer, "BADAUTH" );
+ if ( p_buffer_pos )
+ {
+ /* too much time elapsed after last handshake? */
+ msg_Dbg( p_this, "Authentification failed, handshaking again" );
+ p_sys->b_handshaked = VLC_FALSE;
+ vlc_mutex_unlock ( &p_sys->lock );
+ continue;
+ }
- if ( p_buffer_pos )
+ p_buffer_pos = strstr( ( char * ) p_buffer, "OK" );
+ if ( p_buffer_pos )
+ {
+ if ( p_sys->p_first_queue->i_songs_nb == 10 )
{
- msg_Err( p_this,
- "Authentification failed, handshaking again" );
- p_sys->b_handshaked = VLC_FALSE;
- vlc_mutex_unlock ( &p_sys->lock );
- return;
+ /* if there are more than one queue, delete the 1st */
+ p_first_queue = p_sys->p_first_queue->p_next_queue;
+ DeleteQueue( p_sys->p_first_queue );
+ free( p_sys->p_first_queue );
+ p_sys->p_first_queue = p_first_queue;
}
-
- p_buffer_pos = strstr( ( char * ) p_buffer, "OK" );
-
- if ( p_buffer_pos )
+ else
{
- if ( p_sys->p_first_queue->i_songs_nb == 10 )
- {
- p_first_queue = p_sys->p_first_queue->p_next_queue;
- DeleteQueue( p_sys->p_first_queue );
- free( p_sys->p_first_queue );
- p_sys->p_first_queue = p_first_queue;
- }
- else
- {
- DeleteQueue( p_sys->p_first_queue );
- p_sys->p_first_queue->i_songs_nb = 0;
- }
- msg_Dbg( p_this, "Submission successfull!" );
+ DeleteQueue( p_sys->p_first_queue );
+ p_sys->p_first_queue->i_songs_nb = 0;
}
- vlc_mutex_unlock ( &p_sys->lock );
+ msg_Dbg( p_this, "Submission successfull!" );
}
- }
+ vlc_mutex_unlock ( &p_sys->lock );
+ } /* data transmission finished or skipped */
+
msleep( INTF_IDLE_SLEEP );
p_playlist = pl_Yield( p_this );
if( p_playlist->request.i_status == PLAYLIST_STOPPED )
{
PL_UNLOCK;
+ pl_Release( p_playlist );
/* if we stopped, we won't submit playing song */
vlc_mutex_lock( &p_sys->lock );
p_sys->b_queued = VLC_TRUE;
else
{
PL_UNLOCK;
+ pl_Release( p_playlist );
}
- pl_Release( p_playlist );
vlc_mutex_lock( &p_sys->lock );
-
if( p_sys->b_metadata_read == VLC_FALSE )
{
+ /* we read the metadata of the playing song */
+ /* TODO: remove when meta_engine works */
time( &played_time );
played_time -= p_sys->p_current_song->time_playing;
played_time -= p_sys->time_total_pauses;
-
vlc_mutex_unlock( &p_sys->lock );
- /* ok now we can read meta data */
+ /* TODO: remove when meta_engine works */
if( played_time > 10 )
{
- ReadMetaData( p_this );
+ if ( ReadMetaData( p_this ) == VLC_ENOMEM )
+ {
+ msg_Err( p_this, "Out of memory" );
+ return;
+ }
}
}
else
{
+ /* we add the playing song into the queue */
if( ( p_sys->b_queued == VLC_FALSE )
&& ( p_sys->b_paused == VLC_FALSE ) )
{
static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- intf_thread_t *p_intf;
- intf_sys_t *p_sys;
-
- p_intf = ( intf_thread_t* ) p_data;
- p_sys = p_intf->p_sys;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
(void)p_this; (void)psz_var; (void)oldval;
if( newval.i_int == PLAYING_S )
{
p_sys->time_total_pauses += time( NULL ) - p_sys->time_pause;
- p_sys->b_paused = VLC_TRUE;
+ p_sys->b_paused = VLC_FALSE;
}
vlc_mutex_unlock( &p_sys->lock );
{
playlist_t *p_playlist;
input_thread_t *p_input = NULL;
- intf_thread_t *p_intf;
- intf_sys_t *p_sys;
-
time_t epoch;
struct tm *epoch_tm;
-
char psz_date[20];
(void)p_this; (void)psz_var; (void)oldval; (void)newval;
- p_intf = ( intf_thread_t* ) p_data;
- p_sys = p_intf->p_sys;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
p_playlist = pl_Yield( p_intf );
PL_LOCK;
/* reset pause counter */
p_sys->time_total_pauses = 0;
- /* we save the p_input value to delete the callback later */
- p_sys->p_input = p_input;
-
- /* we'll read after to be sure it's present */
+ /* we'll read metadata when it's present */
p_sys->b_metadata_read = VLC_FALSE;
-
- p_sys->b_queued = VLC_TRUE;
+ p_sys->b_waiting_meta = VLC_FALSE;
time( &epoch );
epoch_tm = gmtime( &epoch );
int i_songs_nb;
time_t played_time;
audioscrobbler_queue_t *p_queue = NULL, *p_next_queue = NULL;
- intf_sys_t *p_sys;
- p_sys = p_this->p_sys;
+ intf_sys_t *p_sys = p_this->p_sys;
+
+ /* wait for the user to listen enough before submitting */
+ time ( &played_time );
+ played_time -= p_sys->p_current_song->time_playing;
+ played_time -= p_sys->time_total_pauses;
- /* has it been queued already ? is it long enough ? */
vlc_mutex_lock( &p_sys->lock );
+ if( ( played_time < 240 )
+ && ( played_time < ( p_sys->p_current_song->i_l / 2 ) ) )
+ {
+ vlc_mutex_unlock ( &p_sys->lock );
+ return VLC_SUCCESS;
+ }
+
if( p_sys->p_current_song->i_l < 30 )
{
msg_Dbg( p_this, "Song too short (< 30s) -> not submitting" );
return VLC_SUCCESS;
}
- /* wait for the user to listen enough before submitting */
- time ( &played_time );
- played_time -= p_sys->p_current_song->time_playing;
- played_time -= p_sys->time_total_pauses;
-
- if( ( played_time < 240 )
- && ( played_time < ( p_sys->p_current_song->i_l / 2 ) ) )
+ if( !*p_sys->p_current_song->psz_a || !*p_sys->p_current_song->psz_t )
{
+ msg_Dbg( p_this, "Missing artist or title -> not submitting" );
+ p_sys->b_queued = VLC_TRUE;
vlc_mutex_unlock ( &p_sys->lock );
return VLC_SUCCESS;
}
msg_Dbg( p_this, "Ok. We'll put it in the queue for submission" );
+ /* go to last queue */
p_queue = p_sys->p_first_queue;
-
while( ( p_queue->i_songs_nb == 10 ) && ( p_queue->p_next_queue != NULL ) )
{
p_queue = p_queue->p_next_queue;
p_queue->p_queue[i_songs_nb]->psz_b =
strdup( p_sys->p_current_song->psz_b );
+ p_queue->p_queue[i_songs_nb]->psz_m =
+ strdup( p_sys->p_current_song->psz_m );
+
p_queue->p_queue[i_songs_nb]->psz_i =
strdup( p_sys->p_current_song->psz_i );
char *psz_url_parser = NULL;
int i_url_pos, i;
- char *b1, *b2, *b3, *b4;
-
- intf_thread_t *p_intf;
- intf_sys_t *p_sys;
-
- p_intf = ( intf_thread_t* ) p_this;
- p_sys = p_this->p_sys;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
+ intf_sys_t *p_sys = p_this->p_sys;
vlc_mutex_lock ( &p_sys->lock );
goto memerror;
}
-
if ( !*p_sys->psz_username )
{
- msg_Info( p_this, "You have to set an username! "
- "Visit https://www.last.fm/join/" );
return VLC_ENOVAR;
}
"http://post.audioscrobbler.com/?hs=true&p=1.1&c=%s&v=%s&u=%s",
CLIENT_NAME, CLIENT_VERSION, p_sys->psz_username );
+ /* send the http handshake request */
p_stream = stream_UrlNew( p_intf, psz_handshake_url);
free( psz_handshake_url );
if( !p_stream )
{
- p_sys->i_interval = DEFAULT_INTERVAL;
- time( &p_sys->time_last_interval );
vlc_mutex_unlock ( &p_sys->lock );
return VLC_EGENERIC;
}
goto memerror;
}
+ /* read answer */
if ( stream_Read( p_stream, p_buffer, 1024 ) == 0 )
{
stream_Delete( p_stream );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
+ goto generic_error;
}
stream_Delete( p_stream );
+ /* record interval before next submission */
p_buffer_pos = strstr( ( char * ) p_buffer, "INTERVAL" );
-
if ( p_buffer_pos )
{
p_sys->i_interval = atoi( p_buffer_pos + strlen( "INTERVAL " ) );
}
p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
-
if ( p_buffer_pos )
{
- msg_Info( p_this, p_buffer_pos );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
+ /* handshake request failed */
+ msg_Dbg( p_this, p_buffer_pos );
+ goto generic_error;
}
p_buffer_pos = strstr( ( char * ) p_buffer, "BADUSER" );
-
if ( p_buffer_pos )
{
- msg_Info( p_intf, "Username is incorrect" );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
+ /* username does not exist */
+ intf_UserFatal( p_this, VLC_FALSE, _("Bad last.fm Username"),
+ _("last.fm username is incorrect, please verify your settings")
+ );
+ goto generic_error;
}
p_buffer_pos = strstr( ( char * ) p_buffer, "UPDATE" );
-
if ( p_buffer_pos )
{
+ /* protocol has been updated, developers need to work :) */
msg_Dbg( p_intf, "Protocol updated" );
msg_Dbg( p_intf, p_buffer_pos );
}
if ( !p_buffer_pos )
{
msg_Dbg( p_intf, "Protocol error" );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
+ goto generic_error;
}
}
p_buffer_pos = ( void* ) strstr( ( char* ) p_buffer, "http://" );
- if ( p_sys->psz_submit_host != NULL )
- {
- free( p_sys->psz_submit_host );
- }
-
- if ( p_sys->psz_submit_file != NULL )
- {
- free( p_sys->psz_submit_file );
- }
+ free( p_sys->psz_submit_host );
+ free( p_sys->psz_submit_file );
psz_url_parser = p_buffer_pos + strlen( "http://" );
goto memerror;
}
+ /* generates a md5 hash of the password */
InitMD5( p_struct_md5 );
AddMD5( p_struct_md5, ( uint8_t* ) psz_password, strlen( psz_password ) );
EndMD5( p_struct_md5 );
for ( i = 0; i < 4; i++ )
{
- /* TODO check that this works on every arch/platform (uint32_t to char) */
- b1 = hexa( p_struct_md5->p_digest[i] % 256 );
- b2 = hexa( ( p_struct_md5->p_digest[i] / 256 ) % 256 );
- b3 = hexa( ( p_struct_md5->p_digest[i] / 65536 ) % 256 );
- b4 = hexa( p_struct_md5->p_digest[i] / 16777216 );
- sprintf( &psz_password_md5[8*i], "%s%s%s%s", b1, b2, b3, b4 );
- free( b1 );
- free( b2 );
- free( b3 );
- free( b4 );
+ sprintf( &psz_password_md5[8*i], "%02x%02x%02x%02x",
+ p_struct_md5->p_digest[i] & 0xff,
+ ( p_struct_md5->p_digest[i] >> 8 ) & 0xff,
+ ( p_struct_md5->p_digest[i] >> 16 ) & 0xff,
+ p_struct_md5->p_digest[i] >> 24
+ );
}
- strlwr( psz_password_md5 );
-
+ /* generates a md5 hash of :
+ * - md5 hash of the password
+ * - md5 challenge sent by last.fm server
+ */
InitMD5( p_struct_md5 );
AddMD5( p_struct_md5, ( uint8_t* ) psz_password_md5, 32 );
AddMD5( p_struct_md5, ( uint8_t* ) ps_challenge_md5, 32 );
for ( i = 0; i < 4; i++ )
{
- b1 = hexa( p_struct_md5->p_digest[i] % 256 );
- b2 = hexa( ( p_struct_md5->p_digest[i] / 256 ) % 256 );
- b3 = hexa( ( p_struct_md5->p_digest[i] / 65536 ) % 256 );
- b4 = hexa( p_struct_md5->p_digest[i] / 16777216 );
- sprintf( &p_sys->psz_response_md5[8*i],"%s%s%s%s", b1, b2, b3, b4 );
- free( b1 );
- free( b2 );
- free( b3 );
- free( b4 );
+ sprintf( &p_sys->psz_response_md5[8*i], "%02x%02x%02x%02x",
+ p_struct_md5->p_digest[i] & 0xff,
+ ( p_struct_md5->p_digest[i] >> 8 ) & 0xff,
+ ( p_struct_md5->p_digest[i] >> 16 ) & 0xff,
+ p_struct_md5->p_digest[i] >> 24
+ );
}
p_sys->psz_response_md5[32] = 0;
- strlwr( p_sys->psz_response_md5 );
-
vlc_mutex_unlock ( &p_sys->lock );
return VLC_SUCCESS;
+generic_error:
+ free( p_buffer );
+ vlc_mutex_unlock( &p_sys->lock );
+ return VLC_EGENERIC;
+
memerror:
free( p_buffer );
free( p_struct_md5 );
free( psz_buffer_substring );
- vlc_mutex_unlock ( &p_sys->lock );
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_ENOMEM;
}
-/*****************************************************************************
- * hexa : Converts a byte to a string in its hexadecimal value
- *****************************************************************************/
-char *hexa( short int i )
-{
- char *res = calloc( 3 , sizeof( char ) );
-
- ((i/16) < 10) ? res[0] = (i / 16) + '0' : ( res[0] = (i/16) + 'a' - 10 );
- ((i%16) < 10) ? res[1] = (i % 16) + '0' : ( res[1] = (i%16) + 'a' - 10 );
-
- return res;
-}
-/*****************************************************************************
- * strlwr : Converts a string to lower case
- *****************************************************************************/
-#if !defined(strlwr) && !defined( WIN32 )
-char* strlwr(char *psz_string)
-{
- while ( *psz_string )
- {
- *psz_string++ = tolower( *psz_string );
- }
- return psz_string;
-}
-#endif
-
/*****************************************************************************
* DeleteQueue : Free all songs from an audioscrobbler_queue_t
*****************************************************************************/
}
/*****************************************************************************
- * ReadMetaData : Puts current song's meta data in p_sys->p_current_song
+ * ReadMetaData : Read meta data when parsed by vlc
+ * or wait for fetching if unavailable
*****************************************************************************/
static int ReadMetaData( intf_thread_t *p_this )
{
playlist_t *p_playlist;
- char *psz_title = NULL;
- char *psz_artist = NULL;
- char *psz_album = NULL;
- int i_length = -1;
input_thread_t *p_input = NULL;
vlc_value_t video_val;
- intf_sys_t *p_sys;
- p_sys = p_this->p_sys;
+ intf_sys_t *p_sys = p_this->p_sys;
+
p_playlist = pl_Yield( p_this );
PL_LOCK;
p_input = p_playlist->p_input;
if( !p_input )
{
- return VLC_SUCCESS;
+ PL_UNLOCK;
+ pl_Release( p_playlist );
+ return( VLC_SUCCESS );
}
vlc_object_yield( p_input );
PL_UNLOCK;
pl_Release( p_playlist );
- if ( p_input->input.p_item->i_type == ITEM_TYPE_NET )
- {
- msg_Dbg( p_this, "We play a stream -> no submission");
- goto no_submission;
- }
-
var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
- if( video_val.i_int > 0 )
+ if( ( video_val.i_int > 0 ) || \
+ ( p_input->input.p_item->i_type == ITEM_TYPE_NET ) )
{
- msg_Dbg( p_this, "We play a video -> no submission");
- goto no_submission;
+ msg_Dbg( p_this, "Not an audio file -> no submission");
+ vlc_object_release( p_input );
+
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->b_queued = VLC_TRUE;
+ p_sys->b_metadata_read = VLC_TRUE;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return VLC_SUCCESS;
}
- if ( p_input->input.p_item->p_meta->psz_artist )
+ return ReadLocalMetaData( p_this, p_input );
+}
+
+/*****************************************************************************
+ * ReadLocalMetaData : Puts current song's meta data in p_sys->p_current_song
+ *****************************************************************************/
+static int ReadLocalMetaData( intf_thread_t *p_this, input_thread_t *p_input )
+{
+ char *psz_title = NULL;
+ char *psz_artist = NULL;
+ char *psz_album = NULL;
+ char *psz_trackid = NULL;
+ int i_length = -1;
+ vlc_bool_t b_waiting;
+ int i_status;
+
+ intf_sys_t *p_sys = p_this->p_sys;
+
+ i_status = p_input->input.p_item->p_meta->i_status;
+
+ vlc_mutex_lock( &p_sys->lock );
+ b_waiting = p_sys->b_waiting_meta;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ /* TODO : remove if (1) when meta_engine works */
+ if ( (1/*( i_status & ITEM_PREPARSED )*/&& ( b_waiting == VLC_FALSE ) ) || \
+ ( ( i_status & ITEM_META_FETCHED ) && ( b_waiting == VLC_TRUE ) ) )
{
- psz_artist = encode_URI_component(
- p_input->input.p_item->p_meta->psz_artist );
- if ( !psz_artist )
+ if ( p_input->input.p_item->p_meta->psz_artist )
{
- goto error;
+ psz_artist = encode_URI_component(
+ p_input->input.p_item->p_meta->psz_artist );
+ if ( !psz_artist )
+ {
+ goto error;
+ }
+ }
+ else
+ {
+ msg_Dbg( p_this, "No artist.." );
+ if ( b_waiting == VLC_TRUE )
+ {
+ psz_artist = calloc( 1, sizeof( char ) );
+ }
+ else
+ {
+ goto waiting_meta_data_fetching;
+ }
+ }
+ if ( p_input->input.p_item->psz_name )
+ {
+ psz_title = encode_URI_component( p_input->input.p_item->psz_name );
+ if ( !psz_title )
+ {
+ goto error;
+ }
+ }
+ else
+ {
+ msg_Dbg( p_this, "No track name.." );
+ if ( b_waiting == VLC_TRUE )
+ {
+ psz_title = calloc( 1, sizeof( char ) );
+ }
+ else
+ {
+ goto waiting_meta_data_fetching;
+ }
}
- }
- else
- {
- msg_Dbg( p_this, "No artist.." );
- goto no_submission;
- }
- if ( p_input->input.p_item->p_meta->psz_album )
- {
- psz_album = encode_URI_component(
- p_input->input.p_item->p_meta->psz_album );
- if ( !psz_album )
+ if ( p_input->input.p_item->p_meta->psz_trackid )
{
- goto error;
+ psz_trackid = strdup( p_input->input.p_item->p_meta->psz_trackid );
+ if ( !psz_trackid )
+ {
+ goto error;
+ }
+ }
+ else
+ {
+ psz_trackid = calloc( 1, sizeof( char ) );
}
- }
- else
- {
- msg_Dbg( p_this, "No album.." );
- goto no_submission;
- }
- if ( p_input->input.p_item->psz_name )
- {
- psz_title = encode_URI_component( p_input->input.p_item->psz_name );
- if ( !psz_title )
+ if ( p_input->input.p_item->p_meta->psz_album )
{
- goto error;
+ psz_album = encode_URI_component(
+ p_input->input.p_item->p_meta->psz_album );
+ if ( !psz_album )
+ {
+ goto error;
+ }
+ }
+ else
+ {
+ psz_album = calloc( 1, sizeof( char ) );
}
- }
- else
- {
- msg_Dbg( p_this, "No track name.." );
- goto no_submission;
- }
- i_length = p_input->input.p_item->i_duration / 1000000;
+ i_length = p_input->input.p_item->i_duration / 1000000;
- vlc_object_release( p_input );
+ vlc_object_release( p_input );
- vlc_mutex_lock ( &p_sys->lock );
+ vlc_mutex_lock ( &p_sys->lock );
- p_sys->p_current_song->psz_a = strdup( psz_artist );
- p_sys->p_current_song->psz_t = strdup( psz_title );
- p_sys->p_current_song->psz_b = strdup( psz_album );
- p_sys->p_current_song->i_l = i_length;
- p_sys->b_queued = VLC_FALSE;
- p_sys->b_metadata_read = VLC_TRUE;
+ p_sys->p_current_song->psz_a = strdup( psz_artist );
+ p_sys->p_current_song->psz_t = strdup( psz_title );
+ p_sys->p_current_song->psz_b = strdup( psz_album );
+ p_sys->p_current_song->psz_m = strdup( psz_trackid );
+ p_sys->p_current_song->i_l = i_length;
+ p_sys->b_queued = VLC_FALSE;
+ p_sys->b_metadata_read = VLC_TRUE;
- vlc_mutex_unlock ( &p_sys->lock );
+ vlc_mutex_unlock ( &p_sys->lock );
- msg_Dbg( p_this, "Meta data registered, waiting to be queued" );
+ msg_Dbg( p_this, "Meta data registered, waiting to be queued" );
- free( psz_title );
- free( psz_artist );
- free( psz_album );
+ free( psz_title );
+ free( psz_artist );
+ free( psz_album );
+ free( psz_trackid );
+ return VLC_SUCCESS;
+ }
+
return VLC_SUCCESS;
-error:
+waiting_meta_data_fetching:
+ vlc_object_release( p_input );
+
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->b_waiting_meta = VLC_TRUE;
+ vlc_mutex_unlock( &p_sys->lock );
+
free( psz_artist );
free( psz_album );
free( psz_title );
- return VLC_ENOMEM;
-no_submission:
+ return VLC_SUCCESS;
+
+error:
vlc_object_release( p_input );
- free( psz_title );
free( psz_artist );
free( psz_album );
-
- vlc_mutex_lock( &p_sys->lock );
- p_sys->b_queued = VLC_TRUE;
- p_sys->b_metadata_read = VLC_TRUE;
- vlc_mutex_unlock( &p_sys->lock );
-
- return VLC_SUCCESS;
+ free( psz_title );
+ free( psz_trackid );
+ return VLC_ENOMEM;
}
projects / vlc / blobdiff