/*****************************************************************************
* audioscrobbler.c : audioscrobbler submission plugin
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright © 2006-2011 the VideoLAN team
* $Id$
*
- * Authors: Rafaël Carré <funman at videolan org>
- * 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.1
- * http://audioscrobbler.net/wiki/Protocol1.1
- * */
-
+/* 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
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#if defined( WIN32 )
+#include <assert.h>
#include <time.h>
-#endif
-#include <vlc/vlc.h>
+#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
+#include <vlc_input.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 <vlc_network.h>
-#include <vlc_interface.h>
#include <vlc_playlist.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+#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 */
- char *psz_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 */
- time_t time_next_exchange; /* when can we send data? */
- 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 ? */
- char *psz_response_md5; /* md5 response to use */
+ audioscrobbler_song_t p_queue[QUEUE_MAX]; /**< songs not submitted yet*/
+ int i_songs; /**< number of songs */
+
+ input_thread_t *p_input; /**< current input thread */
+ vlc_mutex_t lock; /**< p_sys mutex */
+ vlc_cond_t wait; /**< song to submit event */
+ vlc_thread_t thread; /**< thread to submit song */
+
+ /* submission of played songs */
+ vlc_url_t p_submit_url; /**< where to submit data */
+
+ /* 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
+ char psz_auth_token[33]; /**< Authentication token */
/* data about song currently playing */
- 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; /* is vlc paused ? */
- vlc_bool_t b_waiting_meta; /* we need fetched data? */
-};
+ audioscrobbler_song_t p_current_song; /**< song being played */
-intf_sys_t *p_sys_global; /* to retrieve p_sys in Run() thread */
+ mtime_t time_pause; /**< time when vlc paused */
+ mtime_t time_total_pauses; /**< total time in pause */
-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 );
+ bool b_submit; /**< do we have to submit ? */
+
+ bool b_meta_read; /**< if we read the song's
+ * metadata already */
+};
+
+static int Open (vlc_object_t *);
+static void Close (vlc_object_t *);
+static void *Run (void *);
/*****************************************************************************
* Module descriptor
#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")
-/* if something goes wrong, we wait at least one minute before trying again */
-#define DEFAULT_INTERVAL 60
+/* This error value is used when last.fm plugin has to be unloaded. */
+#define VLC_AUDIOSCROBBLER_EFATAL -69
/* 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" \
- "Connection: close\n" \
- "Content-type: application/x-www-form-urlencoded\n" \
- "Host: %s\n" \
- "User-agent: VLC Media Player/%s\r\n" \
- "\r\n" \
- "%s\r\n" \
- "\r\n"
-
-/* data to submit */
-#define POST_DATA "&a%%5B%d%%5D=%s&t%%5B%d%%5D=%s&b%%5B%d%%5D=%s" \
- "&m%%5B%d%%5D=%s&l%%5B%d%%5D=%d&i%%5B%d%%5D=%s"
-#define HTTPPOST_MAXLEN 2048
-
-vlc_module_begin();
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_shortname( N_( "Audioscrobbler" ) );
- set_description( N_("Audioscrobbler submission Plugin") );
- add_string( "lastfm-username", "", NULL,
- USERNAME_TEXT, USERNAME_LONGTEXT, VLC_FALSE );
- add_password( "lastfm-password", "", NULL,
- PASSWORD_TEXT, PASSWORD_LONGTEXT, VLC_FALSE );
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+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", "",
+ USERNAME_TEXT, USERNAME_LONGTEXT, false)
+ add_password("lastfm-password", "",
+ PASSWORD_TEXT, PASSWORD_LONGTEXT, false)
+ add_string("scrobbler-url", "post.audioscrobbler.com",
+ URL_TEXT, URL_LONGTEXT, false)
+ set_capability("interface", 0)
+ set_callbacks(Open, Close)
+vlc_module_end ()
/*****************************************************************************
- * Open: initialize and create stuff
+ * DeleteSong : Delete the char pointers in a song
*****************************************************************************/
+static void DeleteSong(audioscrobbler_song_t* p_song)
+{
+ 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);
+}
-static int Open( vlc_object_t *p_this )
+/*****************************************************************************
+ * ReadMetaData : Read meta data when parsed by vlc
+ *****************************************************************************/
+static void ReadMetaData(intf_thread_t *p_this, input_thread_t *p_input)
{
- playlist_t *p_playlist;
- intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
- intf_sys_t *p_sys = malloc( sizeof( intf_sys_t ) );
-
-#define MEM_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;
+ intf_sys_t *p_sys = p_this->p_sys;
- if( !p_sys )
- {
- MEM_ERROR
- }
+ assert(p_input != NULL);
- p_intf->p_sys = p_sys;
+ input_item_t *p_item = input_GetItem(p_input);
+ if (p_item == NULL)
+ return;
+
+#define ALLOC_ITEM_META(a, b) do { \
+ char *psz_meta = input_item_Get##b(p_item); \
+ if (psz_meta && *psz_meta) \
+ a = encode_URI_component(psz_meta); \
+ free(psz_meta); \
+ } while (0)
- vlc_mutex_init( p_this, &p_sys->lock );
+ vlc_mutex_lock(&p_sys->lock);
- 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->time_next_exchange = time( NULL );
- p_sys->psz_username = NULL;
- p_sys->b_paused = VLC_FALSE;
+ p_sys->b_meta_read = true;
-#define MALLOC_CHECK( a ) \
- if( !a ) { \
- vlc_mutex_destroy( &p_sys->lock ); \
- MEM_ERROR \
+ ALLOC_ITEM_META(p_sys->p_current_song.psz_a, Artist);
+ if (!p_sys->p_current_song.psz_a)
+ {
+ msg_Dbg(p_this, "No artist..");
+ DeleteSong(&p_sys->p_current_song);
+ goto end;
}
- /* md5 response is 32 chars, + final \0 */
- p_sys->psz_response_md5 = malloc( 33 );
- MALLOC_CHECK( p_sys->psz_response_md5 )
+ ALLOC_ITEM_META(p_sys->p_current_song.psz_t, Title);
+ if (!p_sys->p_current_song.psz_t)
+ {
+ msg_Dbg(p_this, "No track name..");
+ DeleteSong(&p_sys->p_current_song);
+ goto end;
+ }
- p_sys->p_first_queue = malloc( sizeof( audioscrobbler_queue_t ) );
- MALLOC_CHECK( p_sys->p_first_queue )
+ /* Now we have read the mandatory meta data, so we can submit that info */
+ p_sys->b_submit = true;
- p_sys->p_current_song = malloc( sizeof( audioscrobbler_song_t ) );
- MALLOC_CHECK( p_sys->p_current_song )
- time( &p_sys->p_current_song->time_playing );
+ ALLOC_ITEM_META(p_sys->p_current_song.psz_b, Album);
+ if (!p_sys->p_current_song.psz_b)
+ p_sys->p_current_song.psz_b = calloc(1, 1);
- /* queues can't contain more than 10 songs */
- p_sys->p_first_queue->p_queue =
- malloc( 10 * sizeof( audioscrobbler_song_t ) );
- MALLOC_CHECK( p_sys->p_current_song )
+ ALLOC_ITEM_META(p_sys->p_current_song.psz_m, TrackID);
+ if (!p_sys->p_current_song.psz_m)
+ p_sys->p_current_song.psz_m = calloc(1, 1);
- p_sys->p_first_queue->i_songs_nb = 0;
- p_sys->p_first_queue->p_next_queue = NULL;
+ p_sys->p_current_song.i_l = input_item_GetDuration(p_item) / 1000000;
- p_playlist = pl_Yield( p_intf );
- PL_LOCK;
- var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- PL_UNLOCK;
- pl_Release( p_playlist );
+ ALLOC_ITEM_META(p_sys->p_current_song.psz_n, TrackNum);
+ if (!p_sys->p_current_song.psz_n)
+ p_sys->p_current_song.psz_n = calloc(1, 1);
+#undef ALLOC_ITEM_META
- p_intf->pf_run = Run;
+ msg_Dbg(p_this, "Meta data registered");
- return VLC_SUCCESS;
-#undef MEM_ERROR
-#undef MALLOC_CHECK
+end:
+ vlc_mutex_unlock(&p_sys->lock);
}
/*****************************************************************************
- * Close: destroy interface stuff
+ * AddToQueue: Add the played song to the queue to be submitted
*****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void AddToQueue (intf_thread_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;
+ mtime_t played_time;
+ intf_sys_t *p_sys = p_this->p_sys;
- p_playlist = pl_Yield( p_intf );
- PL_LOCK;
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ vlc_mutex_lock(&p_sys->lock);
+ if (!p_sys->b_submit)
+ goto end;
- p_input = p_playlist->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 );
+ /* wait for the user to listen enough before submitting */
+ played_time = mdate() - p_sys->p_current_song.i_start -
+ p_sys->time_total_pauses;
+ played_time /= 1000000; /* µs → s */
- vlc_mutex_lock ( &p_sys->lock );
- p_current_queue = p_sys->p_first_queue;
- vlc_mutex_unlock ( &p_sys->lock );
+ /*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;
- while( ( p_current_queue->i_songs_nb == 10 ) &&
- ( p_current_queue->p_next_queue != NULL ) )
+ /* Don't send song shorter than 30s */
+ if (p_sys->p_current_song.i_l < 30)
{
- p_next_queue = p_current_queue->p_next_queue;
- DeleteQueue( p_current_queue );
- free( p_current_queue );
- p_current_queue = p_next_queue;
+ msg_Dbg(p_this, "Song too short (< 30s), not submitting");
+ goto end;
}
- DeleteQueue( p_current_queue );
- free( p_current_queue );
-
- vlc_mutex_lock ( &p_sys->lock );
- free( p_sys->psz_username );
- free( p_sys->p_current_song );
- free( p_sys->psz_submit_host );
- free( p_sys->psz_submit_file );
- free( p_sys->psz_response_md5 );
- vlc_mutex_unlock ( &p_sys->lock );
- vlc_mutex_destroy( &p_sys->lock );
- free( p_sys );
-}
-
-/*****************************************************************************
- * Run : call Handshake() then submit songs
- *****************************************************************************/
-static void Run( intf_thread_t *p_this )
-{
- char *psz_submit = NULL;
- char *psz_submit_song = NULL;
- int i_net_ret;
- int i_song;
- playlist_t *p_playlist;
- uint8_t *p_buffer = NULL;
- char *p_buffer_pos = NULL;
- audioscrobbler_queue_t *p_first_queue;
- int i_post_socket;
- time_t played_time;
-
- p_this->p_sys = p_sys_global;
- intf_sys_t *p_sys = p_this->p_sys;
-
- #define MEM_ERROR \
- free( psz_submit ); \
- free( psz_submit_song ); \
- free( p_buffer ); \
- msg_Err( p_this, "Out of memory" ); \
- return;
-
- psz_submit = malloc( HTTPPOST_MAXLEN );
- psz_submit_song = malloc( HTTPPOST_MAXLEN );
- p_buffer = ( uint8_t* ) malloc( 1024 );
-
- if( !psz_submit || !psz_submit_song || !p_buffer )
+ /* 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)))
{
- MEM_ERROR
+ msg_Dbg(p_this, "Song not listened long enough, not submitting");
+ goto end;
}
- /* main loop */
- while( !p_this->b_die )
+ /* 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)
{
- /* verify if there is data to submit
- * and if waiting interval is elapsed */
- if ( ( p_sys->p_first_queue->i_songs_nb > 0 ) &&
- ( time( NULL ) >= p_sys->time_next_exchange ) )
- {
- /* handshake if needed */
- if( p_sys->b_handshaked == VLC_FALSE )
- {
- msg_Dbg( p_this, "Handshaking with last.fm ..." );
-
- switch( Handshake( p_this ) )
- {
- case VLC_ENOMEM:
- MEM_ERROR
- break;
-
- case VLC_ENOVAR:
- /* username not set */
- vlc_mutex_unlock ( &p_sys->lock );
- intf_UserFatal( p_this, VLC_FALSE,
- _("Last.fm username not set"),
- _("Please set an username or disable "
- "audioscrobbler plugin, and then restart VLC.\n"
- "Visit https://www.last.fm/join/ to get an account")
- );
- free( psz_submit );
- free( psz_submit_song );
- free( p_buffer );
- 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:
- /* protocol error : we'll try later */
- vlc_mutex_lock ( &p_sys->lock );
- time( &p_sys->time_next_exchange );
- p_sys->time_next_exchange += DEFAULT_INTERVAL;
- vlc_mutex_unlock ( &p_sys->lock );
- break;
- }
- /* handshake is done or failed, lets start from
- * beginning to check it out and wait INTERVAL if needed
- */
- continue;
- }
-
- msg_Dbg( p_this, "Going to submit some data..." );
- vlc_mutex_lock ( &p_sys->lock );
-
- snprintf( psz_submit, HTTPPOST_MAXLEN, "u=%s&s=%s",
- p_sys->psz_username, p_sys->psz_response_md5 );
-
- /* forge the HTTP POST request */
- for (i_song = 0 ; i_song < p_sys->p_first_queue->i_songs_nb ;
- i_song++ )
- {
- snprintf( psz_submit_song, HTTPPOST_MAXLEN -1, POST_DATA,
- 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
- );
- strncat( psz_submit, psz_submit_song, HTTPPOST_MAXLEN - 1 );
- }
-
- i_post_socket = net_ConnectTCP( p_this,
- p_sys->psz_submit_host, p_sys->i_submit_port);
-
- if ( i_post_socket == -1 )
- {
- /* If connection fails, we assume we must handshake again */
- time( &p_sys->time_next_exchange );
- p_sys->time_next_exchange += DEFAULT_INTERVAL;
- p_sys->b_handshaked = VLC_FALSE;
- vlc_mutex_unlock( &p_sys->lock );
- continue;
- }
-
- /* we transmit the data */
- i_net_ret = net_Printf(
- VLC_OBJECT(p_this), i_post_socket, NULL,
- POST_REQUEST, p_sys->psz_submit_file,
- strlen( psz_submit ), p_sys->psz_submit_file,
- VERSION, psz_submit
- );
-
- if ( i_net_ret == -1 )
- {
- /* If connection fails, we assume we must handshake again */
- time( &p_sys->time_next_exchange );
- p_sys->time_next_exchange += DEFAULT_INTERVAL;
- p_sys->b_handshaked = VLC_FALSE;
- vlc_mutex_unlock( &p_sys->lock );
- continue;
- }
-
- memset( p_buffer, '\0', 1024 );
-
- i_net_ret = net_Read( p_this, 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;
- }
-
- net_Close( i_post_socket );
-
- /* record interval */
- p_buffer_pos = strstr( ( char * ) p_buffer, "INTERVAL" );
- if ( p_buffer_pos )
- {
- time( &p_sys->time_next_exchange );
- p_sys->time_next_exchange += atoi( p_buffer_pos +
- strlen( "INTERVAL " ) );
- }
+ msg_Dbg(p_this, "Missing artist or title, not submitting");
+ goto end;
+ }
- p_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
- if ( p_buffer_pos )
- {
- /* woops, submission failed */
- msg_Dbg( p_this, "%s", p_buffer_pos );
- vlc_mutex_unlock ( &p_sys->lock );
- continue;
- }
+ if (p_sys->i_songs >= QUEUE_MAX)
+ {
+ msg_Warn(p_this, "Submission queue is full, not submitting");
+ goto end;
+ }
- p_buffer_pos = strstr( ( char * ) p_buffer, "BADAUTH" );
- if ( p_buffer_pos )
- {
- msg_Dbg( p_this, "Authentification failed, handshaking again" );
- p_sys->b_handshaked = VLC_FALSE;
- vlc_mutex_unlock ( &p_sys->lock );
- continue;
- }
+ msg_Dbg(p_this, "Song will be submitted.");
- p_buffer_pos = strstr( ( char * ) p_buffer, "OK" );
- if ( p_buffer_pos )
- {
- if ( p_sys->p_first_queue->i_songs_nb == 10 )
- {
- /* 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;
- }
- 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 );
- } /* data transmission finished or skipped */
+#define QUEUE_COPY(a) \
+ p_sys->p_queue[p_sys->i_songs].a = p_sys->p_current_song.a
- msleep( INTF_IDLE_SLEEP );
+#define QUEUE_COPY_NULL(a) \
+ QUEUE_COPY(a); \
+ p_sys->p_current_song.a = NULL
- p_playlist = pl_Yield( p_this );
- PL_LOCK;
- if( p_playlist->request.i_status == PLAYLIST_STOPPED )
- {
- /* 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 );
- }
- PL_UNLOCK;
- pl_Release( p_playlist );
+ 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
- vlc_mutex_lock( &p_sys->lock );
- if( p_sys->b_metadata_read == VLC_FALSE )
- {
- /* we read the metadata of the playing song */
- time( &played_time );
- played_time -= p_sys->p_current_song->time_playing;
- played_time -= p_sys->time_total_pauses;
+ p_sys->i_songs++;
- vlc_mutex_unlock( &p_sys->lock );
+ /* signal the main loop we have something to submit */
+ vlc_cond_signal(&p_sys->wait);
- if( played_time > 20 )
- /* wait at least 20 secondes before reading the meta data
- * since the songs must be at least 30s */
- {
- if ( ReadMetaData( p_this ) == VLC_ENOMEM )
- {
- MEM_ERROR
- }
- }
- }
- else
- {
- /* we add the playing song into the queue */
- 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 )
- {
- MEM_ERROR
- }
- }
- else
- {
- vlc_mutex_unlock( &p_sys->lock );
- }
- }
- }
-#undef MEM_ERROR
+end:
+ DeleteSong(&p_sys->p_current_song);
+ p_sys->b_submit = false;
+ vlc_mutex_unlock(&p_sys->lock);
}
/*****************************************************************************
* PlayingChange: Playing status change callback
*****************************************************************************/
-static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+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;
+ VLC_UNUSED(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;
+ int state;
- (void)p_this; (void)psz_var; (void)oldval;
+ VLC_UNUSED(psz_var);
- /* don't bother if song has already been queued */
- if( p_sys->b_queued == VLC_TRUE )
+ if (newval.i_int != INPUT_EVENT_STATE) return VLC_SUCCESS;
+
+ if (var_CountChoices(p_input, "video-es"))
+ {
+ msg_Dbg(p_this, "Not an audio-only input, not submitting");
return VLC_SUCCESS;
+ }
- vlc_mutex_lock( &p_sys->lock );
+ state = var_GetInteger(p_input, "state");
- if( newval.i_int == PAUSE_S )
+ if (!p_sys->b_meta_read && state >= PLAYING_S)
{
- time( &p_sys->time_pause );
- p_sys->b_paused = VLC_TRUE;
+ ReadMetaData(p_intf, p_input);
+ return VLC_SUCCESS;
}
- else if( newval.i_int == PLAYING_S )
+
+ if (state >= END_S)
+ AddToQueue(p_intf);
+ else if (state == PAUSE_S)
+ p_sys->time_pause = mdate();
+ else if (p_sys->time_pause > 0 && state == PLAYING_S)
{
- p_sys->time_total_pauses += time( NULL ) - p_sys->time_pause;
- p_sys->b_paused = VLC_FALSE;
+ p_sys->time_total_pauses += (mdate() - p_sys->time_pause);
+ p_sys->time_pause = 0;
}
- vlc_mutex_unlock( &p_sys->lock );
-
return VLC_SUCCESS;
}
/*****************************************************************************
* ItemChange: Playlist item change callback
*****************************************************************************/
-static int ItemChange( vlc_object_t *p_this, const char *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+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];
- 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; (void)newval;
-
- p_playlist = pl_Yield( p_intf );
- PL_LOCK;
- p_input = p_playlist->p_input;
-
- if( !p_input )
- {
- PL_UNLOCK;
- pl_Release( p_playlist );
-
- vlc_mutex_lock( &p_sys->lock );
+ intf_thread_t *p_intf = p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ input_thread_t *p_input = newval.p_address;
- p_sys->b_queued = VLC_TRUE;
- p_sys->b_metadata_read = VLC_TRUE;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_var);
+ VLC_UNUSED(oldval);
- vlc_mutex_unlock( &p_sys->lock );
+ p_sys->b_meta_read = false;
+ p_sys->b_submit = false;
- return VLC_SUCCESS;
+ if (p_sys->p_input != NULL)
+ {
+ var_DelCallback(p_sys->p_input, "intf-event", PlayingChange, p_intf);
+ vlc_object_release(p_sys->p_input);
+ p_sys->p_input = NULL;
}
- vlc_object_yield( p_input );
- PL_UNLOCK;
- pl_Release( p_playlist );
+ if (p_input == NULL)
+ return VLC_SUCCESS;
- var_AddCallback( p_input, "state", PlayingChange, p_intf );
+ input_item_t *p_item = input_GetItem(p_input);
+ if (p_item == NULL)
+ return VLC_SUCCESS;
- vlc_mutex_lock ( &p_sys->lock );
+ if (var_CountChoices(p_input, "video-es"))
+ {
+ msg_Dbg(p_this, "Not an audio-only input, not submitting");
+ 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 metadata when it's present */
- p_sys->b_metadata_read = VLC_FALSE;
- p_sys->b_waiting_meta = VLC_FALSE;
-
- 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;
-
- char *psz_name = input_item_GetName( input_GetItem( p_input ) );
- p_sys->b_paused = ( p_input->b_dead || !psz_name )
- ? VLC_TRUE : VLC_FALSE;
- free( psz_name );
+ p_sys->p_input = vlc_object_hold(p_input);
+ var_AddCallback(p_input, "intf-event", PlayingChange, p_intf);
- vlc_mutex_unlock( &p_sys->lock );
+ if (input_item_IsPreparsed(p_item))
+ ReadMetaData(p_intf, p_input);
+ /* 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
+ * Open: initialize and create stuff
*****************************************************************************/
-static int AddToQueue ( intf_thread_t *p_this )
+static int Open(vlc_object_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;
-
- /* wait for the user to listen enough before submitting */
- time ( &played_time );
- vlc_mutex_lock( &p_sys->lock );
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ intf_sys_t *p_sys = calloc(1, sizeof(intf_sys_t));
- played_time -= p_sys->p_current_song->time_playing;
- played_time -= p_sys->time_total_pauses;
+ if (!p_sys)
+ return VLC_ENOMEM;
- #define NO_SUBMISSION \
- p_sys->b_queued = VLC_TRUE; \
- vlc_mutex_unlock( &p_sys->lock ); \
- return VLC_SUCCESS;
+ p_intf->p_sys = p_sys;
- if( ( played_time < 240 ) &&
- ( played_time < ( p_sys->p_current_song->i_l / 2 ) ) )
- {
- //msg_Dbg( p_this, "Song not listened long enough -> waiting" );
- vlc_mutex_unlock( &p_sys->lock );
- return VLC_SUCCESS;
- }
+ vlc_mutex_init(&p_sys->lock);
+ vlc_cond_init(&p_sys->wait);
- if( p_sys->p_current_song->i_l < 30 )
+ if (vlc_clone(&p_sys->thread, Run, p_intf, VLC_THREAD_PRIORITY_LOW))
{
- msg_Dbg( p_this, "Song too short (< 30s) -> not submitting" );
- NO_SUBMISSION
+ vlc_cond_destroy(&p_sys->wait);
+ vlc_mutex_destroy(&p_sys->lock);
+ free(p_sys);
+ return VLC_ENOMEM;
}
- 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" );
- NO_SUBMISSION
- }
+ var_AddCallback(pl_Get(p_intf), "input-current", ItemChange, p_intf);
- msg_Dbg( p_this, "Ok. We'll put it in the queue for submission" );
+ return VLC_SUCCESS;
+}
- /* 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;
+/*****************************************************************************
+ * Close: destroy interface stuff
+ *****************************************************************************/
+static void Close(vlc_object_t *p_this)
+{
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- i_songs_nb = p_queue->i_songs_nb;
+ vlc_cancel(p_sys->thread);
+ vlc_join(p_sys->thread, NULL);
- #define MALLOC_CHECK( a ) \
- if( !a ) { \
- vlc_mutex_unlock( &p_sys->lock ); \
- return VLC_ENOMEM; \
- }
+ var_DelCallback(pl_Get(p_intf), "input-current", ItemChange, p_intf);
- if( i_songs_nb == 10 )
+ if (p_sys->p_input != NULL)
{
- p_next_queue = malloc( sizeof( audioscrobbler_queue_t ) );
- MALLOC_CHECK( p_next_queue );
- p_queue->p_next_queue = p_next_queue;
- p_queue = p_next_queue;
- i_songs_nb = 0;
- p_queue->i_songs_nb = i_songs_nb;
+ var_DelCallback(p_sys->p_input, "intf-event", PlayingChange, p_intf);
+ vlc_object_release(p_sys->p_input);
}
- p_queue->p_queue[i_songs_nb] = malloc( sizeof( audioscrobbler_song_t ) );
- MALLOC_CHECK( p_queue->p_queue[i_songs_nb] );
-
- #define QUEUE_COPY( a ) \
- p_queue->p_queue[i_songs_nb]->a = p_sys->p_current_song->a
-
- QUEUE_COPY(i_l);
- QUEUE_COPY(psz_a);
- QUEUE_COPY(psz_t);
- QUEUE_COPY(psz_b);
- QUEUE_COPY(psz_m);
- QUEUE_COPY(psz_i);
-
- p_queue->i_songs_nb++;
- p_sys->b_queued = VLC_TRUE;
-
- vlc_mutex_unlock( &p_sys->lock );
-
- return VLC_SUCCESS;
-#undef QUEUE_COPY
-#undef MALLOC_CHECK
-#undef NO_SUBMISSION
+ int i;
+ for (i = 0; i < p_sys->i_songs; i++)
+ DeleteSong(&p_sys->p_queue[i]);
+ vlc_UrlClean(&p_sys->p_submit_url);
+#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);
}
/*****************************************************************************
* Handshake : Init audioscrobbler connection
*****************************************************************************/
-static int Handshake( intf_thread_t *p_this )
+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;
- stream_t *p_stream;
- char *psz_handshake_url = NULL;
- uint8_t *p_buffer = NULL;
- char *p_buffer_pos = NULL;
- char *psz_url_parser = NULL;
- char *psz_buffer_substring;
- int i_url_pos, i;
-
- intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
- intf_sys_t *p_sys = p_this->p_sys;
+ char *psz_username, *psz_password;
+ char *psz_scrobbler_url;
+ time_t timestamp;
+ char psz_timestamp[21];
- vlc_mutex_lock ( &p_sys->lock );
+ struct md5_s p_struct_md5;
- #define MEM_ERROR \
- free( p_buffer ); \
- free( p_struct_md5 ); \
- free( ps_challenge_md5 ); \
- vlc_mutex_unlock( &p_sys->lock ); \
- return VLC_ENOMEM;
+ stream_t *p_stream;
+ char *psz_handshake_url;
+ uint8_t p_buffer[1024];
+ char *p_buffer_pos;
- #define PROTOCOL_ERROR \
- free( p_buffer ); \
- vlc_mutex_unlock( &p_sys->lock ); \
- return VLC_EGENERIC;
+ int i_ret;
+ char *psz_url;
- #define MALLOC_CHECK( a ) \
- if( !a ) \
- { \
- MEM_ERROR \
- }
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ intf_sys_t *p_sys = p_this->p_sys;
- p_sys->psz_username = config_GetPsz(p_this, "lastfm-username");
- MALLOC_CHECK( p_sys->psz_username )
+ psz_username = var_InheritString(p_this, "lastfm-username");
+ psz_password = var_InheritString(p_this, "lastfm-password");
- /* username has not been setup, ignoring */
- if ( !*p_sys->psz_username )
+ /* username or password have not been setup */
+ if (EMPTY_STR(psz_username) || EMPTY_STR(psz_password))
+ {
+ free(psz_username);
+ free(psz_password);
return VLC_ENOVAR;
+ }
- psz_handshake_url = malloc( 1024 );
- MALLOC_CHECK( p_sys->psz_username )
-
- 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 );
+ time(×tamp);
- /* send the http handshake request */
- p_stream = stream_UrlNew( p_intf, psz_handshake_url);
+ /* 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);
- free( psz_handshake_url );
+ free(psz_password);
- if( !p_stream )
+ char *psz_password_md5 = psz_md5_hash(&p_struct_md5);
+ if (!psz_password_md5)
{
- 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 );
- MEM_ERROR
+ free(psz_username);
+ return VLC_ENOMEM;
}
- /* read answer */
- 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 );
- PROTOCOL_ERROR
+ free(psz_auth_token);
+ free(psz_username);
+ return VLC_ENOMEM;
}
- stream_Delete( p_stream );
+ i_ret = asprintf(&psz_handshake_url,
+ "http://%s/?hs=true&p=1.2&c="CLIENT_NAME"&v="CLIENT_VERSION"&u=%s&t=%s&a=%s"
+ , psz_scrobbler_url, psz_username, psz_timestamp, psz_auth_token);
- /* record interval before next submission */
- p_buffer_pos = strstr( ( char* ) p_buffer, "INTERVAL" );
- if ( p_buffer_pos )
- {
- time( &p_sys->time_next_exchange );
- p_sys->time_next_exchange +=
- atoi( p_buffer_pos + strlen( "INTERVAL " ) );
- }
+ free(psz_auth_token);
+ free(psz_scrobbler_url);
+ free(psz_username);
+ if (i_ret == -1)
+ return VLC_ENOMEM;
- p_buffer_pos = strstr( ( char* ) p_buffer, "FAILED" );
- if ( p_buffer_pos )
- {
- /* handshake request failed, sorry */
- msg_Dbg( p_this, "%s", p_buffer_pos );
- PROTOCOL_ERROR
- }
+ /* send the http handshake request */
+ p_stream = stream_UrlNew(p_intf, psz_handshake_url);
+ free(psz_handshake_url);
- p_buffer_pos = strstr( ( char* ) p_buffer, "BADUSER" );
- if ( p_buffer_pos )
+ if (!p_stream)
+ return VLC_EGENERIC;
+
+ /* read answer */
+ i_ret = stream_Read(p_stream, p_buffer, sizeof(p_buffer) - 1);
+ if (i_ret == 0)
{
- /* username does not exist on the server */
- intf_UserFatal( p_this, VLC_FALSE, _("Bad last.fm Username"),
- _("last.fm username is incorrect, please verify your settings")
- );
- PROTOCOL_ERROR
+ stream_Delete(p_stream);
+ return VLC_EGENERIC;
}
+ p_buffer[i_ret] = '\0';
+ stream_Delete(p_stream);
- p_buffer_pos = strstr( ( char* ) p_buffer, "UPDATE" );
- if ( p_buffer_pos )
+ p_buffer_pos = strstr((char*) p_buffer, "FAILED ");
+ if (p_buffer_pos)
{
- /* protocol has been updated, time to update the code */
- msg_Dbg( p_intf, "Protocol updated : plugin may be outdated" );
- msg_Dbg( p_intf, "%s", p_buffer_pos );
+ /* handshake request failed, sorry */
+ msg_Err(p_this, "last.fm handshake failed: %s", p_buffer_pos + 7);
+ return VLC_EGENERIC;
}
- else
+ if (strstr((char*) p_buffer, "BADAUTH"))
{
- p_buffer_pos = strstr( ( char* ) p_buffer, "UPTODATE" );
- if ( !p_buffer_pos )
- {
- msg_Dbg( p_intf, "Can't recognize server protocol" );
- PROTOCOL_ERROR
- }
+ /* 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;
}
- psz_buffer_substring = strstr( p_buffer_pos, "\n" );
- if( ( psz_buffer_substring == NULL ) || \
- ( strlen( psz_buffer_substring + 1 ) < 32 ) )
+ if (strstr((char*) p_buffer, "BANNED"))
{
- msg_Dbg( p_intf, "Can't recognize server protocol" );
- PROTOCOL_ERROR
+ /* 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;
}
- else
+
+ if (strstr((char*) p_buffer, "BADTIME"))
{
- ps_challenge_md5 = malloc( 32 );
- MALLOC_CHECK( ps_challenge_md5 )
- memcpy( ps_challenge_md5, psz_buffer_substring + 1, 32 );
+ /* 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;
}
- p_buffer_pos = ( void* ) strstr( ( char* ) p_buffer, "http://" );
-
- /* free old information */
- free( p_sys->psz_submit_host );
- free( p_sys->psz_submit_file );
+ p_buffer_pos = strstr((char*) p_buffer, "OK");
+ if (!p_buffer_pos)
+ goto proto;
- psz_url_parser = p_buffer_pos + strlen( "http://" );
- i_url_pos = strcspn( psz_url_parser, ":" );
+ p_buffer_pos = strstr(p_buffer_pos, "\n");
+ if (!p_buffer_pos || strlen(p_buffer_pos) < 33)
+ goto proto;
+ p_buffer_pos++; /* we skip the '\n' */
- p_sys->psz_submit_host = strndup( psz_url_parser, i_url_pos );
- MALLOC_CHECK( p_sys->psz_submit_host )
+ /* save the session ID */
+ memcpy(p_sys->psz_auth_token, p_buffer_pos, 32);
+ p_sys->psz_auth_token[32] = '\0';
- p_sys->i_submit_port = atoi( psz_url_parser + i_url_pos + 1 );
+ p_buffer_pos = strstr(p_buffer_pos, "http://");
+ if (!p_buffer_pos || strlen(p_buffer_pos) == 7)
+ goto proto;
- 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 );
- MALLOC_CHECK( p_sys->psz_submit_file )
+ /* 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;
- free(p_buffer);
-
- p_struct_md5 = malloc( sizeof( struct md5_s ) );
- MALLOC_CHECK( p_struct_md5 )
-
- psz_password = config_GetPsz(p_this, "lastfm-password");
- MALLOC_CHECK( psz_password )
-
- /* 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 );
-
- free( psz_password );
-
- psz_password_md5 = malloc ( 33 );
- MALLOC_CHECK( psz_password_md5 )
-
- for ( i = 0; i < 4; i++ )
+ switch(ParseURL(psz_url, &p_sys->psz_nowp_host,
+ &p_sys->psz_nowp_file, &p_sys->i_nowp_port))
{
- 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
- );
+ case VLC_ENOMEM:
+ goto oom;
+ case VLC_EGENERIC:
+ goto proto;
+ case VLC_SUCCESS:
+ default:
+ break;
}
+#endif
+ p_buffer_pos = strstr(p_buffer_pos, "http://");
+ if (!p_buffer_pos || strlen(p_buffer_pos) == 7)
+ goto proto;
- /* generates a md5 hash of :
- * - md5 hash of the password, plus
- * - 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 );
- EndMD5( p_struct_md5 );
-
- free( ps_challenge_md5 );
- free( psz_password_md5 );
+ /* 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;
- for ( i = 0; i < 4; i++ )
- {
- 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
- );
- }
+ /* parse the submission url */
+ vlc_UrlParse(&p_sys->p_submit_url, psz_url, 0);
+ free(psz_url);
- p_sys->psz_response_md5[32] = '\0';
+ return VLC_SUCCESS;
- vlc_mutex_unlock ( &p_sys->lock );
+oom:
+ return VLC_ENOMEM;
- return VLC_SUCCESS;
-#undef MEM_ERROR
-#undef PROTOCOL_ERROR
-#undef MALLOC_CHECK
+proto:
+ msg_Err(p_intf, "Handshake: can't recognize server protocol");
+ return VLC_EGENERIC;
}
-/*****************************************************************************
- * DeleteQueue : Free all songs from an audioscrobbler_queue_t
- *****************************************************************************/
-void DeleteQueue( audioscrobbler_queue_t *p_queue )
+static void HandleInterval(mtime_t *next, unsigned int *i_interval)
{
- int i;
-
- for( i = 0; i < p_queue->i_songs_nb; i++ )
+ if (*i_interval == 0)
+ {
+ /* first interval is 1 minute */
+ *i_interval = 1;
+ }
+ else
{
- 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] );
+ /* 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);
}
/*****************************************************************************
- * ReadMetaData : Read meta data when parsed by vlc
- * or wait for fetching if unavailable
+ * Run : call Handshake() then submit songs
*****************************************************************************/
-static int ReadMetaData( intf_thread_t *p_this )
+static void *Run(void *data)
{
- playlist_t *p_playlist;
- input_thread_t *p_input = NULL;
- vlc_value_t video_val;
-
- 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;
- intf_sys_t *p_sys = p_this->p_sys;
- int i_status;
-
- p_playlist = pl_Yield( p_this );
- PL_LOCK;
- p_input = p_playlist->p_input;
-
- if( !p_input )
- {
- PL_UNLOCK;
- pl_Release( p_playlist );
- return( VLC_SUCCESS );
- }
+ intf_thread_t *p_intf = data;
+ uint8_t p_buffer[1024];
+ int canc = vlc_savecancel();
+ bool b_handshaked = false;
+
+ /* data about audioscrobbler session */
+ mtime_t next_exchange = -1; /**< when can we send data */
+ unsigned int i_interval = 0; /**< waiting interval (secs)*/
- vlc_object_yield( p_input );
- PL_UNLOCK;
- pl_Release( p_playlist );
+ intf_sys_t *p_sys = p_intf->p_sys;
- var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
- if( ( video_val.i_int > 0 ) || \
- ( input_GetItem( p_input )->i_type == ITEM_TYPE_NET ) )
+ /* main loop */
+ for (;;)
{
- msg_Dbg( p_this, "Not an audio only local file -> no submission");
- vlc_object_release( p_input );
+ vlc_restorecancel(canc);
+ vlc_mutex_lock(&p_sys->lock);
+ mutex_cleanup_push(&p_sys->lock);
- 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 );
+ do
+ vlc_cond_wait(&p_sys->wait, &p_sys->lock);
+ while (mdate() < next_exchange);
- return VLC_SUCCESS;
- }
+ vlc_cleanup_run();
+ canc = vlc_savecancel();
- #define FREE_INPUT_AND_CHARS \
- vlc_object_release( p_input ); \
- free( psz_title ); \
- free( psz_artist ); \
- free( psz_album ); \
- free( psz_trackid );
-
- #define WAIT_METADATA_FETCHING( a ) \
- if ( b_waiting == VLC_TRUE ) \
- { \
- a = calloc( 1, 1 ); \
- } \
- else \
- { \
- 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 ); \
- return VLC_SUCCESS; \
- }
+ /* handshake if needed */
+ if (!b_handshaked)
+ {
+ msg_Dbg(p_intf, "Handshaking with last.fm ...");
- char *psz_meta;
- #define ALLOC_ITEM_META( a, b ) \
- psz_meta = input_item_Get##b( input_GetItem( p_input ) ); \
- if( psz_meta ) \
- { \
- a = encode_URI_component( psz_meta ); \
- if( !a ) \
- { \
- free( psz_meta ); \
- FREE_INPUT_AND_CHARS \
- return VLC_ENOMEM; \
- } \
- free( psz_meta ); \
+ switch(Handshake(p_intf))
+ {
+ case VLC_ENOMEM:
+ goto out;
+
+ 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."));
+ goto out;
+
+ case VLC_SUCCESS:
+ msg_Dbg(p_intf, "Handshake successful :)");
+ b_handshaked = true;
+ i_interval = 0;
+ next_exchange = mdate();
+ break;
+
+ case VLC_AUDIOSCROBBLER_EFATAL:
+ msg_Warn(p_intf, "Exiting...");
+ goto out;
+
+ case VLC_EGENERIC:
+ default:
+ /* protocol error : we'll try later */
+ HandleInterval(&next_exchange, &i_interval);
+ break;
+ }
+ /* if handshake failed let's restart the loop */
+ if (!b_handshaked)
+ continue;
}
- i_status = input_GetItem(p_input)->p_meta->i_status;
+ msg_Dbg(p_intf, "Going to submit some data...");
+ char *psz_submit;
+ if (asprintf(&psz_submit, "s=%s", p_sys->psz_auth_token) == -1)
+ break;
- vlc_mutex_lock( &p_sys->lock );
- b_waiting = p_sys->b_waiting_meta;
- vlc_mutex_unlock( &p_sys->lock );
-
- if( i_status & ( !b_waiting ? ITEM_PREPARSED : ITEM_META_FETCHED ) )
- {
- ALLOC_ITEM_META( psz_artist, Artist )
- else
- {
- msg_Dbg( p_this, "No artist.." );
- WAIT_METADATA_FETCHING( psz_artist )
- }
- psz_meta = input_item_GetName( input_GetItem( p_input ) );
- if( psz_meta )
+ /* forge the HTTP POST request */
+ vlc_mutex_lock(&p_sys->lock);
+ audioscrobbler_song_t *p_song;
+ for (int i_song = 0 ; i_song < p_sys->i_songs ; i_song++)
{
- psz_title = encode_URI_component( psz_meta );
- if( !psz_title )
- {
- free( psz_meta );
- FREE_INPUT_AND_CHARS
- return VLC_ENOMEM;
+ char *psz_submit_song, *psz_submit_tmp;
+ 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
+ ) == -1)
+ { /* Out of memory */
+ vlc_mutex_unlock(&p_sys->lock);
+ goto out;
}
- free( psz_meta );
+ psz_submit_tmp = psz_submit;
+ if (asprintf(&psz_submit, "%s%s",
+ psz_submit_tmp, psz_submit_song) == -1)
+ { /* Out of memory */
+ free(psz_submit_tmp);
+ free(psz_submit_song);
+ vlc_mutex_unlock(&p_sys->lock);
+ goto out;
+ }
+ free(psz_submit_song);
+ free(psz_submit_tmp);
}
- else
+ vlc_mutex_unlock(&p_sys->lock);
+
+ int i_post_socket = net_ConnectTCP(p_intf, p_sys->p_submit_url.psz_host,
+ p_sys->p_submit_url.i_port);
+
+ if (i_post_socket == -1)
{
- msg_Dbg( p_this, "No track name.." );
- WAIT_METADATA_FETCHING( psz_title );
+ /* If connection fails, we assume we must handshake again */
+ HandleInterval(&next_exchange, &i_interval);
+ b_handshaked = false;
+ free(psz_submit);
+ continue;
}
- ALLOC_ITEM_META( psz_album, Album )
- else
- psz_album = calloc( 1, 1 );
-
- ALLOC_ITEM_META( psz_trackid, TrackID )
- else
- psz_trackid = calloc( 1, 1 );
+ /* we transmit the data */
+ int i_net_ret = net_Printf(p_intf, i_post_socket, NULL,
+ "POST %s HTTP/1.1\n"
+ "Accept-Encoding: identity\n"
+ "Content-length: %zu\n"
+ "Connection: close\n"
+ "Content-type: application/x-www-form-urlencoded\n"
+ "Host: %s\n"
+ "User-agent: VLC media player/"VERSION"\r\n"
+ "\r\n"
+ "%s\r\n"
+ "\r\n",
+ p_sys->p_submit_url.psz_path, strlen(psz_submit),
+ p_sys->p_submit_url.psz_host, psz_submit
+ );
+
+ free(psz_submit);
+ if (i_net_ret == -1)
+ {
+ /* If connection fails, we assume we must handshake again */
+ HandleInterval(&next_exchange, &i_interval);
+ b_handshaked = false;
+ continue;
+ }
- i_length = input_item_GetDuration( input_GetItem( p_input ) ) / 1000000;
+ i_net_ret = net_Read(p_intf, i_post_socket, NULL,
+ p_buffer, sizeof(p_buffer) - 1, false);
+ if (i_net_ret <= 0)
+ {
+ /* 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';
- 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;
+ char *failed = strstr((char *) p_buffer, "FAILED");
+ if (failed)
+ {
+ msg_Warn(p_intf, "%s", failed);
+ HandleInterval(&next_exchange, &i_interval);
+ continue;
+ }
- vlc_mutex_unlock( &p_sys->lock );
+ if (strstr((char *) p_buffer, "BADSESSION"))
+ {
+ msg_Err(p_intf, "Authentication failed (BADSESSION), are you connected to last.fm with another program ?");
+ b_handshaked = false;
+ HandleInterval(&next_exchange, &i_interval);
+ continue;
+ }
- msg_Dbg( p_this, "Meta data registered, waiting to be queued" );
+ if (strstr((char *) p_buffer, "OK"))
+ {
+ for (int i = 0; i < p_sys->i_songs; i++)
+ DeleteSong(&p_sys->p_queue[i]);
+ p_sys->i_songs = 0;
+ i_interval = 0;
+ next_exchange = mdate();
+ msg_Dbg(p_intf, "Submission successful!");
+ }
+ else
+ {
+ msg_Err(p_intf, "Authentication failed, handshaking again (%s)",
+ p_buffer);
+ b_handshaked = false;
+ HandleInterval(&next_exchange, &i_interval);
+ }
}
-
- FREE_INPUT_AND_CHARS
- return VLC_SUCCESS;
-#undef FREE_INPUT_AND_CHARS
-#undef ALLOC_ITEM_META
-#undef WAIT_METADATA_FETCHING
+out:
+ vlc_restorecancel(canc);
+ return NULL;
}
projects / vlc / blobdiff