/*****************************************************************************
* audioscrobbler.c : audioscrobbler submission plugin
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
- * Authors: Rafaël Carré <rafael -dot- carre -at- gmail -dot- com>
- * Kenneth Ostby <kenneo -at- idi -dot- ntnu -dot- no>
+ * Author: Rafaël Carré <funman at videolanorg>
+ * Ilkka Ollakka <ileoo at videolan org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+/* audioscrobbler protocol version: 1.2
+ * http://www.audioscrobbler.net/development/protocol/
+ *
+ * TODO: "Now Playing" feature (not mandatory)
+ * Update to new API? http://www.lastfm.fr/api
+ */
/*****************************************************************************
* Preamble
*****************************************************************************/
-#define _GNU_SOURCE
-#include <string.h>
+#if defined( WIN32 )
+#include <time.h>
+#endif
-#if !defined( strlwr ) && !defined( WIN32 )
-#include <ctype.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#if defined( WIN32 )
-#include <time.h>
-#endif
-/*
- * TODO :
- * review/replace :
- * hexa()
- * md5 to char[]
- */
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_interface.h>
+#include <vlc_dialog.h>
#include <vlc_meta.h>
#include <vlc_md5.h>
-#include <vlc_block.h>
#include <vlc_stream.h>
#include <vlc_url.h>
-#include <network.h>
+#include <vlc_network.h>
+#include <vlc_playlist.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-/* Keeps track of metadata to be submitted, and if song has been submitted */
+#define QUEUE_MAX 50
+
+/* Keeps track of metadata to be submitted */
typedef struct audioscrobbler_song_t
{
- char *psz_a; /* track artist */
- 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_i; /* date */
- time_t time_playing; /* date (epoch) */
+ char *psz_a; /**< track artist */
+ char *psz_t; /**< track title */
+ char *psz_b; /**< track album */
+ char *psz_n; /**< track number */
+ int i_l; /**< track length */
+ char *psz_m; /**< musicbrainz id */
+ time_t date; /**< date since epoch */
+ mtime_t i_start; /**< playing start */
} audioscrobbler_song_t;
-
-/* Queue to be submitted to server, 10 songs max */
-typedef struct audioscrobbler_queue_t
-{
- audioscrobbler_song_t **p_queue; /* contains up to 10 songs */
- int i_songs_nb; /* number of songs */
- void *p_next_queue; /* if queue full, pointer to next */
-} audioscrobbler_queue_t;
-
struct intf_sys_t
{
- audioscrobbler_queue_t *p_first_queue; /* 1st queue */
- vlc_mutex_t lock; /* p_sys mutex */
-
-/* data about audioscrobbler session */
- int i_interval; /* last interval recorded */
- time_t time_last_interval; /* when was it recorded ? */
- char *psz_submit_host; /* where to submit data ? */
- int i_submit_port; /* at which port ? */
- char *psz_submit_file; /* in which file ? */
- char *psz_username; /* last.fm username */
- vlc_bool_t b_handshaked; /* did we handshake ? */
- int i_post_socket; /* socket for submission */
- char *psz_response_md5; /* md5 response to use */
-
-/* data about input elements */
- 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 ? */
+ audioscrobbler_song_t p_queue[QUEUE_MAX]; /**< songs not submitted yet*/
+ int i_songs; /**< number of songs */
+
+ vlc_mutex_t lock; /**< p_sys mutex */
+ vlc_cond_t wait; /**< song to submit event */
+
+ /* data about audioscrobbler session */
+ mtime_t next_exchange; /**< when can we send data */
+ unsigned int i_interval; /**< waiting interval (secs)*/
+
+ /* submission of played songs */
+ char *psz_submit_host; /**< where to submit data */
+ int i_submit_port; /**< port to which submit */
+ char *psz_submit_file; /**< file to which submit */
+
+ /* submission of playing song */
+#if 0 //NOT USED
+ char *psz_nowp_host; /**< where to submit data */
+ int i_nowp_port; /**< port to which submit */
+ char *psz_nowp_file; /**< file to which submit */
+#endif
+ bool b_handshaked; /**< are we authenticated ? */
+ char psz_auth_token[33]; /**< Authentication token */
+
+ /* data about song currently playing */
+ audioscrobbler_song_t p_current_song; /**< song being played */
+
+ mtime_t time_pause; /**< time when vlc paused */
+ mtime_t time_total_pauses; /**< total time in pause */
+
+ bool b_submit; /**< do we have to submit ? */
+
+ bool b_state_cb; /**< if we registered the
+ * "state" callback */
+
+ bool b_meta_read; /**< if we read the song's
+ * metadata already */
};
-intf_sys_t *p_sys_global; /* for use same p_sys in all threads */
-
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-static void Run ( intf_thread_t * );
-static int ItemChange ( vlc_object_t *, const char *,
- vlc_value_t, vlc_value_t, void * );
-static int PlayingChange( vlc_object_t *, const char *,
- vlc_value_t, vlc_value_t, void * );
-static int AddToQueue ( intf_thread_t *p_this );
-static int Handshake ( intf_thread_t *p_sd );
-static int ReadMetaData ( intf_thread_t *p_this );
-void DeleteQueue( audioscrobbler_queue_t *p_queue );
-char *hexa( short int i );
-
-#if !defined(strlwr) && !defined( WIN32 )
-char* strlwr(char *psz_string);
-#endif
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
+static void Run ( intf_thread_t * );
+
+static int ItemChange ( vlc_object_t *, const char *, vlc_value_t,
+ vlc_value_t, void * );
+static int PlayingChange ( vlc_object_t *, const char *, vlc_value_t,
+ vlc_value_t, void * );
+
+static void AddToQueue ( intf_thread_t * );
+static int Handshake ( intf_thread_t * );
+static int ReadMetaData ( intf_thread_t * );
+static void DeleteSong ( audioscrobbler_song_t* );
+static int ParseURL ( char *, char **, char **, int * );
+static void HandleInterval ( mtime_t *, unsigned int * );
/*****************************************************************************
* Module descriptor
****************************************************************************/
+#define USERNAME_TEXT N_("Username")
+#define USERNAME_LONGTEXT N_("The username of your last.fm account")
+#define PASSWORD_TEXT N_("Password")
+#define PASSWORD_LONGTEXT N_("The password of your last.fm account")
+#define URL_TEXT N_("Scrobbler URL")
+#define URL_LONGTEXT N_("The URL set for an alternative scrobbler engine")
+
+/* This error value is used when last.fm plugin has to be unloaded. */
+#define VLC_AUDIOSCROBBLER_EFATAL -69
-#define APPLICATION_NAME "VLC media player"
-#define USERNAME_TEXT N_("Username")
-#define USERNAME_LONGTEXT N_("Audioscrobbler username")
-#define PASSWORD_TEXT N_("Password")
-#define PASSWORD_LONGTEXT N_("Audioscrobbler password")
-#define DEFAULT_INTERVAL 60
+/* last.fm client identifier */
#define CLIENT_NAME PACKAGE
#define CLIENT_VERSION VERSION
/* HTTP POST request : to submit data */
#define POST_REQUEST "POST /%s HTTP/1.1\n" \
"Accept-Encoding: identity\n" \
- "Content-length: %d\n" \
+ "Content-length: %u\n" \
"Connection: close\n" \
"Content-type: application/x-www-form-urlencoded\n" \
"Host: %s\n" \
- "User-agent: VLC Media Player/%s\r\n" \
+ "User-agent: VLC media player/%s\r\n" \
"\r\n" \
"%s\r\n" \
"\r\n"
-/* 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"
-
-vlc_module_begin();
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_shortname( N_( "Audioscrobbler" ) );
- set_description( _("Audioscrobbler submission Plugin") );
+vlc_module_begin ()
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_CONTROL )
+ set_shortname( N_( "Audioscrobbler" ) )
+ set_description( N_("Submission of played songs to last.fm") )
add_string( "lastfm-username", "", NULL,
- USERNAME_TEXT, USERNAME_LONGTEXT, VLC_TRUE );
- add_string( "lastfm-password", "", NULL,
- PASSWORD_TEXT, PASSWORD_LONGTEXT, VLC_TRUE );
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+ USERNAME_TEXT, USERNAME_LONGTEXT, false )
+ add_password( "lastfm-password", "", NULL,
+ PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
+ add_string( "scrobbler-url", "post.audioscrobbler.com", NULL,
+ URL_TEXT, URL_LONGTEXT, false )
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
-
static int Open( vlc_object_t *p_this )
{
- playlist_t *p_playlist;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
+ intf_sys_t *p_sys = calloc( 1, 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 );
+ return VLC_ENOMEM;
- p_sys_global = p_sys;
- p_sys->psz_submit_host = NULL;
- p_sys->psz_submit_file = NULL;
- p_sys->b_handshaked = VLC_FALSE;
- p_sys->i_interval = 0;
- p_sys->time_last_interval = time( NULL );
- p_sys->psz_username = NULL;
- p_sys->b_paused = VLC_FALSE;
-
- /* md5 response is 32 chars, + final \0 */
- p_sys->psz_response_md5 = malloc( sizeof( char ) * 33 );
- if( !p_sys->psz_response_md5 )
- {
- vlc_mutex_destroy ( &p_sys->lock );
- goto error;
- }
+ p_intf->p_sys = p_sys;
- p_sys->p_first_queue = malloc( sizeof( audioscrobbler_queue_t ) );
- if( !p_sys->p_first_queue )
- {
- vlc_mutex_destroy( &p_sys->lock );
- goto error;
- }
+ vlc_mutex_init( &p_sys->lock );
+ vlc_cond_init( &p_sys->wait );
- p_sys->p_current_song = malloc( sizeof( audioscrobbler_song_t ) );
- if( !p_sys->p_current_song )
- {
- vlc_mutex_destroy( &p_sys->lock );
- goto error;
- }
-
- /* queues can't contain more than 10 songs */
- p_sys->p_first_queue->p_queue =
- malloc( 10 * sizeof( audioscrobbler_song_t ) );
- if( !p_sys->p_current_song )
- {
- vlc_mutex_destroy( &p_sys->lock );
- goto error;
- }
-
- p_sys->p_first_queue->i_songs_nb = 0;
- p_sys->p_first_queue->p_next_queue = NULL;
-
- p_playlist = pl_Yield( p_intf );
- var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- pl_Release( p_playlist );
+ var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
p_intf->pf_run = Run;
return VLC_SUCCESS;
-
-error:
- free( p_sys->p_current_song );
- free( p_sys->p_first_queue );
- free( p_sys->psz_response_md5 );
- free( p_sys );
-
- return VLC_ENOMEM;
}
/*****************************************************************************
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- audioscrobbler_queue_t *p_current_queue, *p_next_queue;
- playlist_t *p_playlist;
+ playlist_t *p_playlist = pl_Get( p_this );
input_thread_t *p_input;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- 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;
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
if ( p_input )
{
- vlc_object_yield( p_input );
- var_DelCallback( p_input, "state", PlayingChange, p_intf );
+ if( p_sys->b_state_cb )
+ var_DelCallback( p_input, "intf-event", PlayingChange, p_intf );
vlc_object_release( p_input );
}
- PL_UNLOCK;
- pl_Release( p_playlist );
-
- vlc_mutex_lock ( &p_sys->lock );
- p_current_queue = p_sys->p_first_queue;
- vlc_mutex_unlock ( &p_sys->lock );
-
- while( ( p_current_queue->i_songs_nb == 10 ) &&
- ( p_current_queue->p_next_queue != NULL ) )
- {
- p_next_queue = p_current_queue->p_next_queue;
- DeleteQueue( p_current_queue );
- free( p_current_queue );
- p_current_queue = p_next_queue;
- }
-
- DeleteQueue( p_current_queue );
- free( p_current_queue );
-
- vlc_mutex_lock ( &p_sys->lock );
- if ( p_sys->psz_username )
- {
- free( p_sys->psz_username );
- }
-
- free( p_sys->p_current_song );
- vlc_mutex_unlock ( &p_sys->lock );
+ int i;
+ for( i = 0; i < p_sys->i_songs; i++ )
+ DeleteSong( &p_sys->p_queue[i] );
+ free( p_sys->psz_submit_host );
+ free( p_sys->psz_submit_file );
+#if 0 //NOT USED
+ free( p_sys->psz_nowp_host );
+ free( p_sys->psz_nowp_file );
+#endif
+ vlc_cond_destroy( &p_sys->wait );
vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
}
+
/*****************************************************************************
- * Run : Handshake with audioscrobbler, then submit songs
+ * Run : call Handshake() then submit songs
*****************************************************************************/
-static void Run( intf_thread_t *p_this )
+static void Run( intf_thread_t *p_intf )
{
- char *psz_submit_string = NULL;
- int i_handshake;
- int i_netprintf;
+ char *psz_submit, *psz_submit_song, *psz_submit_tmp;
+ 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;
+ uint8_t p_buffer[1024];
+ char *p_buffer_pos;
+ int i_post_socket;
+ int canc = vlc_savecancel();
- p_this->p_sys = p_sys_global;
- intf_sys_t *p_sys = p_this->p_sys;
+ intf_sys_t *p_sys = p_intf->p_sys;
- while( !p_this->b_die )
+ /* main loop */
+ for( ;; )
{
- if( p_sys->b_handshaked == VLC_FALSE )
- {
- if ( time( NULL ) >=
- ( p_sys->time_last_interval + p_sys->i_interval ) )
- {
- msg_Dbg( p_this, "Handshaking with last.fm ..." );
- i_handshake = Handshake( p_this );
+ bool b_wait = false;
- if( i_handshake == VLC_ENOMEM )
- {
- msg_Err( p_this, "Out of memory" );
- return;
- }
- 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;
- }
-
- 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 );
- }
- }
- }
+ vlc_restorecancel( canc );
+ vlc_mutex_lock( &p_sys->lock );
+ mutex_cleanup_push( &p_sys->lock );
+ if( mdate() < p_sys->next_exchange )
+ /* wait until we can resubmit, i.e. */
+ b_wait = vlc_cond_timedwait( &p_sys->wait, &p_sys->lock,
+ p_sys->next_exchange ) == 0;
else
+ /* wait for data to submit */
+ /* we are signaled each time there is a song to submit */
+ vlc_cond_wait( &p_sys->wait, &p_sys->lock );
+ vlc_cleanup_run();
+ canc = vlc_savecancel();
+
+ if( b_wait )
+ continue; /* holding on until next_exchange */
+
+ /* handshake if needed */
+ if( p_sys->b_handshaked == false )
{
- if ( ( p_sys->p_first_queue->i_songs_nb > 0 ) &&
- ( time( NULL ) >=
- ( p_sys->time_last_interval + p_sys->i_interval ) ) )
+ msg_Dbg( p_intf, "Handshaking with last.fm ..." );
+
+ switch( Handshake( p_intf ) )
{
- 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 );
+ case VLC_ENOMEM:
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
+
+ case VLC_ENOVAR:
+ /* username not set */
+ dialog_Fatal( p_intf,
+ _("Last.fm username not set"),
+ "%s", _("Please set a username or disable the "
+ "audioscrobbler plugin, and restart VLC.\n"
+ "Visit http://www.last.fm/join/ to get an account.")
);
- }
-
- 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
- );
-
- if ( i_netprintf == -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 );
+ case VLC_SUCCESS:
+ msg_Dbg( p_intf, "Handshake successfull :)" );
+ p_sys->b_handshaked = true;
+ p_sys->i_interval = 0;
+ p_sys->next_exchange = mdate();
+ break;
+
+ case VLC_AUDIOSCROBBLER_EFATAL:
+ msg_Warn( p_intf, "Exiting..." );
return;
- }
- net_Read( p_this, p_sys->i_post_socket, NULL,
- p_buffer, 1024, VLC_FALSE );
- net_Close( p_sys->i_post_socket );
+ case VLC_EGENERIC:
+ default:
+ /* protocol error : we'll try later */
+ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
+ break;
+ }
+ /* if handshake failed let's restart the loop */
+ if( p_sys->b_handshaked == false )
+ continue;
+ }
- p_buffer_pos = strstr( ( char * ) p_buffer, "INTERVAL" );
+ msg_Dbg( p_intf, "Going to submit some data..." );
- if ( p_buffer_pos )
- {
- p_sys->i_interval = atoi( p_buffer_pos +
- strlen( "INTERVAL " ) );
- time( &p_sys->time_last_interval );
- }
+ /* The session may be invalid if there is a trailing \n */
+ char *psz_ln = strrchr( p_sys->psz_auth_token, '\n' );
+ if( psz_ln )
+ *psz_ln = '\0';
- p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
+ if( !asprintf( &psz_submit, "s=%s", p_sys->psz_auth_token ) )
+ { /* Out of memory */
+ return;
+ }
- if ( p_buffer_pos )
- {
- msg_Err( p_this, p_buffer_pos );
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
+ /* forge the HTTP POST request */
+ vlc_mutex_lock( &p_sys->lock );
+ audioscrobbler_song_t *p_song;
+ for( i_song = 0 ; i_song < p_sys->i_songs ; i_song++ )
+ {
+ p_song = &p_sys->p_queue[i_song];
+ if( !asprintf( &psz_submit_song,
+ "&a%%5B%d%%5D=%s"
+ "&t%%5B%d%%5D=%s"
+ "&i%%5B%d%%5D=%u"
+ "&o%%5B%d%%5D=P"
+ "&r%%5B%d%%5D="
+ "&l%%5B%d%%5D=%d"
+ "&b%%5B%d%%5D=%s"
+ "&n%%5B%d%%5D=%s"
+ "&m%%5B%d%%5D=%s",
+ i_song, p_song->psz_a,
+ i_song, p_song->psz_t,
+ i_song, (unsigned)p_song->date, /* HACK: %ju (uintmax_t) unsupported on Windows */
+ i_song,
+ i_song,
+ i_song, p_song->i_l,
+ i_song, p_song->psz_b,
+ i_song, p_song->psz_n,
+ i_song, p_song->psz_m
+ ) )
+ { /* Out of memory */
+ vlc_mutex_unlock( &p_sys->lock );
+ return;
+ }
+ psz_submit_tmp = psz_submit;
+ if( !asprintf( &psz_submit, "%s%s",
+ psz_submit_tmp, psz_submit_song ) )
+ { /* Out of memory */
+ free( psz_submit_tmp );
+ free( psz_submit_song );
+ vlc_mutex_unlock( &p_sys->lock );
+ return;
+ }
+ free( psz_submit_song );
+ free( psz_submit_tmp );
+ }
+ vlc_mutex_unlock( &p_sys->lock );
- p_buffer_pos = strstr( ( char * ) p_buffer, "BADAUTH" );
+ i_post_socket = net_ConnectTCP( p_intf,
+ p_sys->psz_submit_host, p_sys->i_submit_port );
- if ( p_buffer_pos )
- {
- msg_Err( p_this,
- "Authentification failed, handshaking again" );
- p_sys->b_handshaked = VLC_FALSE;
- vlc_mutex_unlock ( &p_sys->lock );
- return;
- }
-
- p_buffer_pos = strstr( ( char * ) p_buffer, "OK" );
-
- if ( p_buffer_pos )
- {
- 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!" );
- }
- vlc_mutex_unlock ( &p_sys->lock );
- }
+ if ( i_post_socket == -1 )
+ {
+ /* If connection fails, we assume we must handshake again */
+ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
+ p_sys->b_handshaked = false;
+ free( psz_submit );
+ continue;
}
- msleep( INTF_IDLE_SLEEP );
- p_playlist = pl_Yield( p_this );
- PL_LOCK;
- if( p_playlist->request.i_status == PLAYLIST_STOPPED )
+ /* we transmit the data */
+ i_net_ret = net_Printf(
+ p_intf, i_post_socket, NULL,
+ POST_REQUEST, p_sys->psz_submit_file,
+ (unsigned)strlen( psz_submit ), p_sys->psz_submit_host,
+ VERSION, psz_submit
+ );
+
+ free( psz_submit );
+ if ( i_net_ret == -1 )
{
- 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;
- p_sys->b_metadata_read = VLC_TRUE;
- vlc_mutex_unlock( &p_sys->lock );
+ /* If connection fails, we assume we must handshake again */
+ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
+ p_sys->b_handshaked = false;
+ continue;
}
- else
+
+ i_net_ret = net_Read( p_intf, i_post_socket, NULL,
+ p_buffer, 1023, false );
+ if ( i_net_ret <= 0 )
{
- PL_UNLOCK;
- pl_Release( p_playlist );
+ /* if we get no answer, something went wrong : try again */
+ continue;
}
- vlc_mutex_lock( &p_sys->lock );
+ net_Close( i_post_socket );
+ p_buffer[i_net_ret] = '\0';
- if( p_sys->b_metadata_read == VLC_FALSE )
+ p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
+ if ( p_buffer_pos )
{
- time( &played_time );
- played_time -= p_sys->p_current_song->time_playing;
- played_time -= p_sys->time_total_pauses;
-
+ msg_Warn( p_intf, "%s", p_buffer_pos );
+ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
+ continue;
+ }
- vlc_mutex_unlock( &p_sys->lock );
+ p_buffer_pos = strstr( ( char * ) p_buffer, "BADSESSION" );
+ if ( p_buffer_pos )
+ {
+ msg_Err( p_intf, "Authentication failed (BADSESSION), are you connected to last.fm with another program ?" );
+ p_sys->b_handshaked = false;
+ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
+ continue;
+ }
- /* ok now we can read meta data */
- if( played_time > 10 )
- {
- ReadMetaData( p_this );
- }
+ p_buffer_pos = strstr( ( char * ) p_buffer, "OK" );
+ if ( p_buffer_pos )
+ {
+ int i;
+ for( i = 0; i < p_sys->i_songs; i++ )
+ DeleteSong( &p_sys->p_queue[i] );
+ p_sys->i_songs = 0;
+ p_sys->i_interval = 0;
+ p_sys->next_exchange = mdate();
+ msg_Dbg( p_intf, "Submission successful!" );
}
else
{
- if( ( p_sys->b_queued == VLC_FALSE )
- && ( p_sys->b_paused == VLC_FALSE ) )
- {
- vlc_mutex_unlock( &p_sys->lock );
- if( AddToQueue( p_this ) == VLC_ENOMEM )
- {
- msg_Err( p_this, "Out of memory" );
- return;
- }
- }
- else
- {
- vlc_mutex_unlock( &p_sys->lock );
- }
+ msg_Err( p_intf, "Authentication failed, handshaking again (%s)",
+ p_buffer );
+ p_sys->b_handshaked = false;
+ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
+ continue;
}
}
+ vlc_restorecancel( canc );
}
/*****************************************************************************
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_thread_t* ) p_data;
- intf_sys_t *p_sys = p_intf->p_sys;
+ VLC_UNUSED( oldval );
- (void)p_this; (void)psz_var; (void)oldval;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ input_thread_t *p_input = ( input_thread_t* )p_this;
+ vlc_value_t state_value;
- vlc_mutex_lock( &p_sys->lock );
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var );
- if( newval.i_int == PAUSE_S )
+ if( newval.i_int != INPUT_EVENT_STATE ) return VLC_SUCCESS;
+
+ if( var_CountChoices( p_input, "video-es" ) )
{
- time( &p_sys->time_pause );
- p_sys->b_paused = VLC_TRUE;
+ msg_Dbg( p_this, "Not an audio-only input, not submitting");
+ return VLC_SUCCESS;
}
- if( newval.i_int == PLAYING_S )
+ state_value.i_int = 0;
+
+ var_Get( p_input, "state", &state_value );
+
+
+ if( p_sys->b_meta_read == false && state_value.i_int >= PLAYING_S )
{
- p_sys->time_total_pauses += time( NULL ) - p_sys->time_pause;
- p_sys->b_paused = VLC_TRUE;
+ ReadMetaData( p_intf );
+ return VLC_SUCCESS;
}
- vlc_mutex_unlock( &p_sys->lock );
+
+ if( state_value.i_int >= END_S )
+ AddToQueue( p_intf );
+ else if( state_value.i_int == PAUSE_S )
+ p_sys->time_pause = mdate();
+ else if( p_sys->time_pause > 0 && state_value.i_int == PLAYING_S )
+ {
+ p_sys->time_total_pauses += ( mdate() - p_sys->time_pause );
+ p_sys->time_pause = 0;
+ }
return VLC_SUCCESS;
}
static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- playlist_t *p_playlist;
- input_thread_t *p_input = NULL;
- time_t epoch;
- struct tm *epoch_tm;
- char psz_date[20];
+ input_thread_t *p_input;
+ intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ input_item_t *p_item;
- (void)p_this; (void)psz_var; (void)oldval; (void)newval;
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var );
+ VLC_UNUSED( oldval ); VLC_UNUSED( newval );
- intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
- intf_sys_t *p_sys = p_intf->p_sys;
+ p_sys->b_state_cb = false;
+ p_sys->b_meta_read = false;
+ p_sys->b_submit = false;
- p_playlist = pl_Yield( p_intf );
- PL_LOCK;
- p_input = p_playlist->p_input;
+ p_input = playlist_CurrentInput( pl_Get( p_intf ) );
- if( !p_input )
- {
- PL_UNLOCK;
- pl_Release( p_playlist );
- vlc_mutex_lock( &p_sys->lock );
-
- /* we won't read p_input */
- p_sys->b_queued = VLC_TRUE;
- p_sys->b_metadata_read = VLC_TRUE;
+ if( !p_input || p_input->b_dead )
+ return VLC_SUCCESS;
- vlc_mutex_unlock( &p_sys->lock );
+ p_item = input_GetItem( p_input );
+ if( !p_item )
+ {
+ vlc_object_release( p_input );
return VLC_SUCCESS;
}
- vlc_object_yield( p_input );
- PL_UNLOCK;
- pl_Release( p_playlist );
-
- var_AddCallback( p_input, "state", PlayingChange, p_intf );
-
- vlc_mutex_lock ( &p_sys->lock );
+ if( var_CountChoices( p_input, "video-es" ) )
+ {
+ msg_Dbg( p_this, "Not an audio-only input, not submitting");
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
- /* reset pause counter */
p_sys->time_total_pauses = 0;
+ time( &p_sys->p_current_song.date ); /* to be sent to last.fm */
+ p_sys->p_current_song.i_start = mdate(); /* only used locally */
- /* we'll read after to be sure it's present */
- p_sys->b_metadata_read = VLC_FALSE;
-
- p_sys->b_queued = VLC_TRUE;
+ var_AddCallback( p_input, "intf-event", PlayingChange, p_intf );
+ p_sys->b_state_cb = true;
- time( &epoch );
- epoch_tm = gmtime( &epoch );
- snprintf( psz_date, 20, "%.4d-%.2d-%.2d %.2d:%.2d:%.2d",
- epoch_tm->tm_year+1900, epoch_tm->tm_mon+1, epoch_tm->tm_mday,
- epoch_tm->tm_hour, epoch_tm->tm_min, epoch_tm->tm_sec );
-
- p_sys->p_current_song->psz_i = encode_URI_component( psz_date );
- p_sys->p_current_song->time_playing = epoch;
-
- p_sys->b_paused = ( p_input->b_dead || !p_input->input.p_item->psz_name )
- ? VLC_TRUE : VLC_FALSE;
-
- vlc_mutex_unlock( &p_sys->lock );
+ if( input_item_IsPreparsed( p_item ) )
+ ReadMetaData( p_intf );
+ /* if the input item was not preparsed, we'll do it in PlayingChange()
+ * callback, when "state" == PLAYING_S */
vlc_object_release( p_input );
return VLC_SUCCESS;
/*****************************************************************************
* AddToQueue: Add the played song to the queue to be submitted
*****************************************************************************/
-static int AddToQueue ( intf_thread_t *p_this )
+static void AddToQueue ( intf_thread_t *p_this )
{
- int i_songs_nb;
- time_t played_time;
- audioscrobbler_queue_t *p_queue = NULL, *p_next_queue = NULL;
-
- intf_sys_t *p_sys = p_this->p_sys;
+ mtime_t played_time;
+ intf_sys_t *p_sys = p_this->p_sys;
- /* has it been queued already ? is it long enough ? */
vlc_mutex_lock( &p_sys->lock );
- if( p_sys->p_current_song->i_l < 30 )
- {
- msg_Dbg( p_this, "Song too short (< 30s) -> not submitting" );
- p_sys->b_queued = VLC_TRUE;
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_SUCCESS;
- }
+ if( !p_sys->b_submit )
+ goto end;
/* 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;
+ played_time = mdate() - p_sys->p_current_song.i_start -
+ p_sys->time_total_pauses;
+ played_time /= 1000000; /* µs → s */
+
+ /*HACK: it seam that the preparsing sometime fail,
+ so use the playing time as the song length */
+ if( p_sys->p_current_song.i_l == 0 )
+ p_sys->p_current_song.i_l = played_time;
- if( ( played_time < 240 )
- && ( played_time < ( p_sys->p_current_song->i_l / 2 ) ) )
+ /* Don't send song shorter than 30s */
+ if( p_sys->p_current_song.i_l < 30 )
{
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_SUCCESS;
+ msg_Dbg( p_this, "Song too short (< 30s), not submitting" );
+ goto end;
}
- msg_Dbg( p_this, "Ok. We'll put it in the queue for submission" );
-
- p_queue = p_sys->p_first_queue;
-
- while( ( p_queue->i_songs_nb == 10 ) && ( p_queue->p_next_queue != NULL ) )
+ /* Send if the user had listen more than 240s OR half the track length */
+ if( ( played_time < 240 ) &&
+ ( played_time < ( p_sys->p_current_song.i_l / 2 ) ) )
{
- p_queue = p_queue->p_next_queue;
+ msg_Dbg( p_this, "Song not listened long enough, not submitting" );
+ goto end;
}
- i_songs_nb = p_queue->i_songs_nb;
-
- if( i_songs_nb == 10 )
+ /* Check that all meta are present */
+ if( !p_sys->p_current_song.psz_a || !*p_sys->p_current_song.psz_a ||
+ !p_sys->p_current_song.psz_t || !*p_sys->p_current_song.psz_t )
{
- p_next_queue = malloc( sizeof( audioscrobbler_queue_t ) );
- if( !p_next_queue )
- {
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_ENOMEM;
- }
- p_queue->p_next_queue = p_next_queue;
- i_songs_nb = 0;
- p_queue = p_next_queue;
- p_queue->i_songs_nb = i_songs_nb;
+ msg_Dbg( p_this, "Missing artist or title, not submitting" );
+ goto end;
}
- p_queue->p_queue[i_songs_nb] = malloc( sizeof( audioscrobbler_song_t ) );
+ if( p_sys->i_songs >= QUEUE_MAX )
+ {
+ msg_Warn( p_this, "Submission queue is full, not submitting" );
+ goto end;
+ }
- p_queue->p_queue[i_songs_nb]->i_l = p_sys->p_current_song->i_l;
+ msg_Dbg( p_this, "Song will be submitted." );
- p_queue->p_queue[i_songs_nb]->psz_a =
- strdup( p_sys->p_current_song->psz_a );
+#define QUEUE_COPY( a ) \
+ p_sys->p_queue[p_sys->i_songs].a = p_sys->p_current_song.a
- p_queue->p_queue[i_songs_nb]->psz_t =
- strdup( p_sys->p_current_song->psz_t );
+#define QUEUE_COPY_NULL( a ) \
+ QUEUE_COPY( a ); \
+ p_sys->p_current_song.a = NULL
- p_queue->p_queue[i_songs_nb]->psz_b =
- strdup( p_sys->p_current_song->psz_b );
+ QUEUE_COPY( i_l );
+ QUEUE_COPY_NULL( psz_n );
+ QUEUE_COPY_NULL( psz_a );
+ QUEUE_COPY_NULL( psz_t );
+ QUEUE_COPY_NULL( psz_b );
+ QUEUE_COPY_NULL( psz_m );
+ QUEUE_COPY( date );
+#undef QUEUE_COPY_NULL
+#undef QUEUE_COPY
- p_queue->p_queue[i_songs_nb]->psz_i =
- strdup( p_sys->p_current_song->psz_i );
+ p_sys->i_songs++;
- p_queue->i_songs_nb++;
- p_sys->b_queued = VLC_TRUE;
+ /* signal the main loop we have something to submit */
+ vlc_cond_signal( &p_sys->wait );
+end:
+ DeleteSong( &p_sys->p_current_song );
+ p_sys->b_submit = false;
vlc_mutex_unlock( &p_sys->lock );
+}
+
+/*****************************************************************************
+ * ParseURL : Split an http:// URL into host, file, and port
+ *
+ * Example: "62.216.251.205:80/protocol_1.2"
+ * will be split into "62.216.251.205", 80, "protocol_1.2"
+ *
+ * psz_url will be freed before returning
+ * *psz_file & *psz_host will be freed before use
+ *
+ * Return value:
+ * VLC_ENOMEM Out Of Memory
+ * VLC_EGENERIC Invalid url provided
+ * VLC_SUCCESS Success
+ *****************************************************************************/
+static int ParseURL( char *psz_url, char **psz_host, char **psz_file,
+ int *i_port )
+{
+ int i_pos;
+ int i_len = strlen( psz_url );
+ bool b_no_port = false;
+ FREENULL( *psz_host );
+ FREENULL( *psz_file );
+
+ i_pos = strcspn( psz_url, ":" );
+ if( i_pos == i_len )
+ {
+ *i_port = 80;
+ i_pos = strcspn( psz_url, "/" );
+ b_no_port = true;
+ }
+
+ *psz_host = strndup( psz_url, i_pos );
+ if( !*psz_host )
+ return VLC_ENOMEM;
+ if( !b_no_port )
+ {
+ i_pos++; /* skip the ':' */
+ *i_port = atoi( psz_url + i_pos );
+ if( *i_port <= 0 )
+ {
+ FREENULL( *psz_host );
+ return VLC_EGENERIC;
+ }
+
+ i_pos = strcspn( psz_url, "/" );
+ }
+
+ if( i_pos == i_len )
+ return VLC_EGENERIC;
+
+ i_pos++; /* skip the '/' */
+ *psz_file = strdup( psz_url + i_pos );
+ if( !*psz_file )
+ {
+ FREENULL( *psz_host );
+ return VLC_ENOMEM;
+ }
+
+ free( psz_url );
return VLC_SUCCESS;
}
*****************************************************************************/
static int Handshake( intf_thread_t *p_this )
{
- char *psz_password = NULL;
- struct md5_s *p_struct_md5 = NULL;
- char *psz_password_md5 = NULL;
- char *ps_challenge_md5 = NULL;
+ char *psz_username, *psz_password;
+ char *psz_scrobbler_url;
+ time_t timestamp;
+ char psz_timestamp[21];
- stream_t *p_stream;
- char *psz_handshake_url = NULL;
+ struct md5_s p_struct_md5;
- uint8_t *p_buffer = NULL;
- char *p_buffer_pos = NULL;
- char *psz_buffer_substring = NULL;
- char *psz_url_parser = NULL;
- int i_url_pos, i;
+ stream_t *p_stream;
+ char *psz_handshake_url;
+ uint8_t p_buffer[1024];
+ char *p_buffer_pos;
- char *b1, *b2, *b3, *b4;
+ int i_ret;
+ char *psz_url;
- intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
- intf_sys_t *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 );
+ psz_username = var_InheritString( p_this, "lastfm-username" );
+ if( !psz_username )
+ return VLC_ENOMEM;
- p_sys->psz_username = config_GetPsz(p_this, "lastfm-username");
- if ( !p_sys->psz_username )
+ psz_password = var_InheritString( p_this, "lastfm-password" );
+ if( !psz_password )
{
- goto memerror;
+ free( psz_username );
+ return VLC_ENOMEM;
}
-
- if ( !*p_sys->psz_username )
+ /* username or password have not been setup */
+ if ( !*psz_username || !*psz_password )
{
- msg_Info( p_this, "You have to set an username! "
- "Visit https://www.last.fm/join/" );
+ free( psz_username );
+ free( psz_password );
return VLC_ENOVAR;
}
- psz_handshake_url = malloc( 1024 );
- if ( !psz_handshake_url )
- {
- goto memerror;
- }
+ time( ×tamp );
- snprintf( psz_handshake_url, 1024,
- "http://post.audioscrobbler.com/?hs=true&p=1.1&c=%s&v=%s&u=%s",
- CLIENT_NAME, CLIENT_VERSION, p_sys->psz_username );
+ /* 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 );
- p_stream = stream_UrlNew( p_intf, psz_handshake_url);
-
- free( psz_handshake_url );
+ free( psz_password );
- if( !p_stream )
+ char *psz_password_md5 = psz_md5_hash( &p_struct_md5 );
+ if( !psz_password_md5 )
{
- p_sys->i_interval = DEFAULT_INTERVAL;
- time( &p_sys->time_last_interval );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
+ free( psz_username );
+ return VLC_ENOMEM;
}
- p_buffer = ( uint8_t* ) calloc( 1, 1024 );
- if ( !p_buffer )
+ snprintf( psz_timestamp, sizeof( psz_timestamp ), "%"PRIu64,
+ (uint64_t)timestamp );
+
+ /* generates a md5 hash of :
+ * - md5 hash of the password, plus
+ * - timestamp in clear text
+ */
+ InitMD5( &p_struct_md5 );
+ AddMD5( &p_struct_md5, ( uint8_t* ) psz_password_md5, 32 );
+ AddMD5( &p_struct_md5, ( uint8_t* ) psz_timestamp, strlen( psz_timestamp ));
+ EndMD5( &p_struct_md5 );
+ free( psz_password_md5 );
+
+ char *psz_auth_token = psz_md5_hash( &p_struct_md5 );
+ if( !psz_auth_token )
{
- stream_Delete( p_stream );
- goto memerror;
+ free( psz_username );
+ return VLC_ENOMEM;
}
+ strncpy( p_sys->psz_auth_token, psz_auth_token, 33 );
+ free( psz_auth_token );
- if ( stream_Read( p_stream, p_buffer, 1024 ) == 0 )
+ psz_scrobbler_url = var_InheritString( p_this, "scrobbler-url" );
+ if( !psz_scrobbler_url )
{
- stream_Delete( p_stream );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
+ free( psz_username );
+ return VLC_ENOMEM;
}
- stream_Delete( p_stream );
-
- p_buffer_pos = strstr( ( char * ) p_buffer, "INTERVAL" );
-
- if ( p_buffer_pos )
+ if( !asprintf( &psz_handshake_url,
+ "http://%s/?hs=true&p=1.2&c=%s&v=%s&u=%s&t=%s&a=%s", psz_scrobbler_url,
+ CLIENT_NAME, CLIENT_VERSION, psz_username, psz_timestamp,
+ p_sys->psz_auth_token ) )
{
- p_sys->i_interval = atoi( p_buffer_pos + strlen( "INTERVAL " ) );
- time( &p_sys->time_last_interval );
+ free( psz_scrobbler_url );
+ free( psz_username );
+ return VLC_ENOMEM;
}
+ free( psz_scrobbler_url );
+ free( psz_username );
- p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
+ /* send the http handshake request */
+ p_stream = stream_UrlNew( p_intf, psz_handshake_url );
+ free( psz_handshake_url );
- if ( p_buffer_pos )
- {
- msg_Info( p_this, p_buffer_pos );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
+ if( !p_stream )
return VLC_EGENERIC;
- }
- p_buffer_pos = strstr( ( char * ) p_buffer, "BADUSER" );
-
- if ( p_buffer_pos )
+ /* read answer */
+ i_ret = stream_Read( p_stream, p_buffer, 1023 );
+ if( i_ret == 0 )
{
- msg_Info( p_intf, "Username is incorrect" );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
+ stream_Delete( p_stream );
return VLC_EGENERIC;
}
+ p_buffer[i_ret] = '\0';
+ stream_Delete( p_stream );
- p_buffer_pos = strstr( ( char * ) p_buffer, "UPDATE" );
-
+ p_buffer_pos = strstr( ( char* ) p_buffer, "FAILED " );
if ( p_buffer_pos )
{
- msg_Dbg( p_intf, "Protocol updated" );
- msg_Dbg( p_intf, p_buffer_pos );
- }
-
- else
- {
- p_buffer_pos = strstr( ( char * ) p_buffer, "UPTODATE" );
- if ( !p_buffer_pos )
- {
- msg_Dbg( p_intf, "Protocol error" );
- free( p_buffer );
- vlc_mutex_unlock ( &p_sys->lock );
- return VLC_EGENERIC;
- }
+ /* handshake request failed, sorry */
+ msg_Err( p_this, "last.fm handshake failed: %s", p_buffer_pos + 7 );
+ return VLC_EGENERIC;
}
- psz_buffer_substring = strndup( strstr( p_buffer_pos, "\n" ) + 1, 32 );
- if ( !psz_buffer_substring )
+ p_buffer_pos = strstr( ( char* ) p_buffer, "BADAUTH" );
+ if ( p_buffer_pos )
{
- goto memerror;
- }
- else
- {
- ps_challenge_md5 = malloc( sizeof( char ) * 32 );
- if ( !ps_challenge_md5 )
- {
- goto memerror;
- }
- memcpy( ps_challenge_md5, psz_buffer_substring, 32 );
- free( psz_buffer_substring );
+ /* authentication failed, bad username/password combination */
+ dialog_Fatal( p_this,
+ _("last.fm: Authentication failed"),
+ "%s", _("last.fm username or password is incorrect. "
+ "Please verify your settings and relaunch VLC." ) );
+ return VLC_AUDIOSCROBBLER_EFATAL;
}
- p_buffer_pos = ( void* ) strstr( ( char* ) p_buffer, "http://" );
-
- if ( p_sys->psz_submit_host != NULL )
+ p_buffer_pos = strstr( ( char* ) p_buffer, "BANNED" );
+ if ( p_buffer_pos )
{
- free( p_sys->psz_submit_host );
+ /* oops, our version of vlc has been banned by last.fm servers */
+ msg_Err( p_intf, "This version of VLC has been banned by last.fm. "
+ "You should upgrade VLC, or disable the last.fm plugin." );
+ return VLC_AUDIOSCROBBLER_EFATAL;
}
- if ( p_sys->psz_submit_file != NULL )
+ p_buffer_pos = strstr( ( char* ) p_buffer, "BADTIME" );
+ if ( p_buffer_pos )
{
- free( p_sys->psz_submit_file );
+ /* The system clock isn't good */
+ msg_Err( p_intf, "last.fm handshake failed because your clock is too "
+ "much shifted. Please correct it, and relaunch VLC." );
+ return VLC_AUDIOSCROBBLER_EFATAL;
}
- psz_url_parser = p_buffer_pos + strlen( "http://" );
-
- i_url_pos = strcspn( psz_url_parser, ":" );
- p_sys->psz_submit_host = strndup( psz_url_parser, i_url_pos );
-
- p_sys->i_submit_port = atoi( psz_url_parser + i_url_pos + 1 );
-
- psz_url_parser += strcspn( psz_url_parser , "/" ) + 1;
- i_url_pos = strcspn( psz_url_parser, "\n" );
- p_sys->psz_submit_file = strndup( psz_url_parser, i_url_pos );
-
- free(p_buffer);
+ p_buffer_pos = strstr( ( char* ) p_buffer, "OK" );
+ if ( !p_buffer_pos )
+ goto proto;
- p_struct_md5 = malloc( sizeof( struct md5_s ) );
- if( !p_struct_md5 )
- {
- goto memerror;
- }
+ p_buffer_pos = strstr( p_buffer_pos, "\n" );
+ if( !p_buffer_pos || strlen( p_buffer_pos ) < 34 )
+ goto proto;
+ p_buffer_pos++; /* we skip the '\n' */
- psz_password = config_GetPsz(p_this, "lastfm-password");
- if ( !psz_password )
- {
- goto memerror;
- }
+ /* save the session ID */
+ snprintf( p_sys->psz_auth_token, 33, "%s", p_buffer_pos );
- InitMD5( p_struct_md5 );
- AddMD5( p_struct_md5, ( uint8_t* ) psz_password, strlen( psz_password ) );
- EndMD5( p_struct_md5 );
+ p_buffer_pos = strstr( p_buffer_pos, "http://" );
+ if( !p_buffer_pos || strlen( p_buffer_pos ) == 7 )
+ goto proto;
- free( psz_password );
+ /* We need to read the nowplaying url */
+ p_buffer_pos += 7; /* we skip "http://" */
+#if 0 //NOT USED
+ psz_url = strndup( p_buffer_pos, strcspn( p_buffer_pos, "\n" ) );
+ if( !psz_url )
+ goto oom;
- psz_password_md5 = malloc ( 33 * sizeof( char ) );
- if ( !psz_password_md5 )
+ switch( ParseURL( psz_url, &p_sys->psz_nowp_host,
+ &p_sys->psz_nowp_file, &p_sys->i_nowp_port ) )
{
- goto memerror;
+ case VLC_ENOMEM:
+ goto oom;
+ case VLC_EGENERIC:
+ goto proto;
+ case VLC_SUCCESS:
+ default:
+ break;
}
-
- 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 );
- }
-
- strlwr( psz_password_md5 );
-
- InitMD5( p_struct_md5 );
- AddMD5( p_struct_md5, ( uint8_t* ) psz_password_md5, 32 );
- AddMD5( p_struct_md5, ( uint8_t* ) ps_challenge_md5, 32 );
- EndMD5( p_struct_md5 );
-
- free( ps_challenge_md5 );
- free( psz_password_md5 );
-
- for ( i = 0; i < 4; i++ )
+#endif
+ p_buffer_pos = strstr( p_buffer_pos, "http://" );
+ if( !p_buffer_pos || strlen( p_buffer_pos ) == 7 )
+ goto proto;
+
+ /* We need to read the submission url */
+ p_buffer_pos += 7; /* we skip "http://" */
+ psz_url = strndup( p_buffer_pos, strcspn( p_buffer_pos, "\n" ) );
+ if( !psz_url )
+ goto oom;
+
+ switch( ParseURL( psz_url, &p_sys->psz_submit_host,
+ &p_sys->psz_submit_file, &p_sys->i_submit_port ) )
{
- 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 );
+ case VLC_ENOMEM:
+ goto oom;
+ case VLC_EGENERIC:
+ goto proto;
+ case VLC_SUCCESS:
+ default:
+ break;
}
- p_sys->psz_response_md5[32] = 0;
-
- strlwr( p_sys->psz_response_md5 );
-
- vlc_mutex_unlock ( &p_sys->lock );
-
return VLC_SUCCESS;
-memerror:
- free( p_buffer );
- free( p_struct_md5 );
- free( psz_buffer_substring );
-
- vlc_mutex_unlock ( &p_sys->lock );
+oom:
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;
+proto:
+ msg_Err( p_intf, "Handshake: can't recognize server protocol" );
+ return VLC_EGENERIC;
}
-/*****************************************************************************
- * 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
+ * DeleteSong : Delete the char pointers in a song
*****************************************************************************/
-void DeleteQueue( audioscrobbler_queue_t *p_queue )
+static void DeleteSong( audioscrobbler_song_t* p_song )
{
- int i;
-
- for( i = 0; i < p_queue->i_songs_nb; i++ )
- {
- free( p_queue->p_queue[i]->psz_a );
- free( p_queue->p_queue[i]->psz_b );
- free( p_queue->p_queue[i]->psz_t );
- free( p_queue->p_queue[i]->psz_i );
- free( p_queue->p_queue[i] );
- }
+ FREENULL( p_song->psz_a );
+ FREENULL( p_song->psz_b );
+ FREENULL( p_song->psz_t );
+ FREENULL( p_song->psz_m );
+ FREENULL( p_song->psz_n );
}
/*****************************************************************************
- * ReadMetaData : Puts current song's meta data in p_sys->p_current_song
+ * ReadMetaData : Read meta data when parsed by vlc
*****************************************************************************/
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_this->p_sys;
+ input_thread_t *p_input;
+ input_item_t *p_item;
- p_playlist = pl_Yield( p_this );
- PL_LOCK;
- p_input = p_playlist->p_input;
+ intf_sys_t *p_sys = p_this->p_sys;
+ p_input = playlist_CurrentInput( pl_Get( p_this ) );
if( !p_input )
- {
- PL_UNLOCK;
- pl_Release( p_playlist );
return( VLC_SUCCESS );
- }
- vlc_object_yield( p_input );
- PL_UNLOCK;
- pl_Release( p_playlist );
+ p_item = input_GetItem( p_input );
+ if( !p_item )
+ return VLC_SUCCESS;
- if ( p_input->input.p_item->i_type == ITEM_TYPE_NET )
- {
- msg_Dbg( p_this, "We play a stream -> no submission");
- goto no_submission;
+ char *psz_meta;
+#define ALLOC_ITEM_META( a, b ) \
+ psz_meta = input_item_Get##b( p_item ); \
+ if( psz_meta && *psz_meta ) \
+ { \
+ a = encode_URI_component( psz_meta ); \
+ if( !a ) \
+ { \
+ vlc_mutex_unlock( &p_sys->lock ); \
+ vlc_object_release( p_input ); \
+ free( psz_meta ); \
+ return VLC_ENOMEM; \
+ } \
}
- var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
- if( video_val.i_int > 0 )
- {
- msg_Dbg( p_this, "We play a video -> no submission");
- goto no_submission;
- }
+ vlc_mutex_lock( &p_sys->lock );
- if ( p_input->input.p_item->p_meta->psz_artist )
- {
- 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.." );
- goto no_submission;
- }
+ p_sys->b_meta_read = true;
- 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 )
- {
- goto error;
- }
- }
+ ALLOC_ITEM_META( p_sys->p_current_song.psz_a, Artist )
else
{
- psz_album = calloc( 1, sizeof( char ) );
+ vlc_mutex_unlock( &p_sys->lock );
+ msg_Dbg( p_this, "No artist.." );
+ vlc_object_release( p_input );
+ free( psz_meta );
+ return VLC_EGENERIC;
}
+ free( psz_meta );
- 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;
- }
- }
+ ALLOC_ITEM_META( p_sys->p_current_song.psz_t, Title )
else
{
+ vlc_mutex_unlock( &p_sys->lock );
msg_Dbg( p_this, "No track name.." );
- goto no_submission;
+ vlc_object_release( p_input );
+ free( p_sys->p_current_song.psz_a );
+ free( psz_meta );
+ return VLC_EGENERIC;
}
+ free( psz_meta );
- i_length = p_input->input.p_item->i_duration / 1000000;
-
- vlc_object_release( p_input );
+ /* Now we have read the mandatory meta data, so we can submit that info */
+ p_sys->b_submit = true;
- 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;
-
- vlc_mutex_unlock ( &p_sys->lock );
-
- msg_Dbg( p_this, "Meta data registered, waiting to be queued" );
+ ALLOC_ITEM_META( p_sys->p_current_song.psz_b, Album )
+ else
+ p_sys->p_current_song.psz_b = calloc( 1, 1 );
+ free( psz_meta );
- free( psz_title );
- free( psz_artist );
- free( psz_album );
+ ALLOC_ITEM_META( p_sys->p_current_song.psz_m, TrackID )
+ else
+ p_sys->p_current_song.psz_m = calloc( 1, 1 );
+ free( psz_meta );
- return VLC_SUCCESS;
+ p_sys->p_current_song.i_l = input_item_GetDuration( p_item ) / 1000000;
-error:
- vlc_object_release( p_input );
+ ALLOC_ITEM_META( p_sys->p_current_song.psz_n, TrackNum )
+ else
+ p_sys->p_current_song.psz_n = calloc( 1, 1 );
+ free( psz_meta );
+#undef ALLOC_ITEM_META
- free( psz_artist );
- free( psz_album );
- free( psz_title );
- return VLC_ENOMEM;
+ msg_Dbg( p_this, "Meta data registered" );
-no_submission:
+ vlc_mutex_unlock( &p_sys->lock );
vlc_object_release( p_input );
+ return VLC_SUCCESS;
- 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;
+static void HandleInterval( mtime_t *next, unsigned int *i_interval )
+{
+ if( *i_interval == 0 )
+ {
+ /* first interval is 1 minute */
+ *i_interval = 1;
+ }
+ else
+ {
+ /* else we double the previous interval, up to 120 minutes */
+ *i_interval <<= 1;
+ if( *i_interval > 120 )
+ *i_interval = 120;
+ }
+ *next = mdate() + ( *i_interval * 1000000 * 60 );
}
+
projects / vlc / blobdiff