/*****************************************************************************
* audioscrobbler.c : audioscrobbler submission plugin
*****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2011 the VideoLAN team
* $Id$
*
* Author: Rafaël Carré <funman at videolanorg>
* http://www.audioscrobbler.net/development/protocol/
*
* TODO: "Now Playing" feature (not mandatory)
+ * Update to new API? http://www.lastfm.fr/api
*/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#if defined( WIN32 )
-#include <time.h>
-#endif
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
+#include <time.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>
/*****************************************************************************
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 */
-
- /* data about audioscrobbler session */
- mtime_t next_exchange; /**< when can we send data */
- unsigned int i_interval; /**< waiting interval (secs)*/
+ vlc_thread_t thread; /**< thread to submit song */
/* 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 */
+ vlc_url_t p_submit_url; /**< where to submit data */
/* submission of playing song */
#if 0 //NOT USED
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 */
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 */
};
-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 * );
+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")
/* This error value is used when last.fm plugin has to be unloaded. */
#define VLC_AUDIOSCROBBLER_EFATAL -69
#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: %u\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"
-
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, false );
- add_password( "lastfm-password", "", NULL,
- PASSWORD_TEXT, PASSWORD_LONGTEXT, false );
- set_capability( "interface", 0 )
- set_callbacks( Open, Close )
+ 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 int Open( vlc_object_t *p_this )
+static void DeleteSong(audioscrobbler_song_t* p_song)
{
- 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 ) );
-
- if( !p_sys )
- return VLC_ENOMEM;
-
- p_intf->p_sys = p_sys;
-
- vlc_mutex_init( &p_sys->lock );
- vlc_cond_init( &p_sys->wait );
-
- p_playlist = pl_Hold( p_intf );
- PL_LOCK;
- var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- PL_UNLOCK;
- pl_Release( p_intf );
-
- p_intf->pf_run = Run;
-
- return VLC_SUCCESS;
+ 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);
}
/*****************************************************************************
- * Close: destroy interface stuff
+ * ReadMetaData : Read meta data when parsed by vlc
*****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void ReadMetaData(intf_thread_t *p_this, input_thread_t *p_input)
{
- 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;
+ intf_sys_t *p_sys = p_this->p_sys;
- p_playlist = pl_Hold( p_intf );
- if( p_playlist )
- {
+ assert(p_input != NULL);
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ input_item_t *p_item = input_GetItem(p_input);
+ if (p_item == NULL)
+ return;
- p_input = playlist_CurrentInput( p_playlist );
- if ( p_input )
- {
- if( p_sys->b_state_cb )
- var_DelCallback( p_input, "intf-event", PlayingChange, p_intf );
-
- vlc_object_release( p_input );
- }
-
- pl_Release( p_intf );
- }
-
- 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 );
-}
+#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_lock(&p_sys->lock);
-/*****************************************************************************
- * Run : call Handshake() then submit songs
- *****************************************************************************/
-static void Run( intf_thread_t *p_intf )
-{
- char *psz_submit, *psz_submit_song, *psz_submit_tmp;
- int i_net_ret;
- int i_song;
- uint8_t p_buffer[1024];
- char *p_buffer_pos;
- int i_post_socket;
- int canc = vlc_savecancel();
+ p_sys->b_meta_read = true;
- intf_sys_t *p_sys = p_intf->p_sys;
+ 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;
+ }
- /* main loop */
- for( ;; )
+ ALLOC_ITEM_META(p_sys->p_current_song.psz_t, Title);
+ if (!p_sys->p_current_song.psz_t)
{
- bool b_wait = false;
+ msg_Dbg(p_this, "No track name..");
+ DeleteSong(&p_sys->p_current_song);
+ goto end;
+ }
+ /* Now we have read the mandatory meta data, so we can submit that info */
+ p_sys->b_submit = true;
- vlc_restorecancel( canc );
- vlc_mutex_lock( &p_sys->lock );
- mutex_cleanup_push( &p_sys->lock );
+ 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);
- 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();
+ 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);
- if( b_wait )
- continue; /* holding on until next_exchange */
+ p_sys->p_current_song.i_l = input_item_GetDuration(p_item) / 1000000;
- /* handshake if needed */
- if( p_sys->b_handshaked == false )
- {
- msg_Dbg( p_intf, "Handshaking with last.fm ..." );
+ 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
- switch( Handshake( p_intf ) )
- {
- case VLC_ENOMEM:
- return;
+ msg_Dbg(p_this, "Meta data registered");
- case VLC_ENOVAR:
- /* username not set */
- intf_UserFatal( p_intf, false,
- _("Last.fm username not set"),
- _("Please set a username or disable the "
- "audioscrobbler plugin, and restart VLC.\n"
- "Visit http://www.last.fm/join/ to get an account.")
- );
- return;
+end:
+ 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;
+/*****************************************************************************
+ * AddToQueue: Add the played song to the queue to be submitted
+ *****************************************************************************/
+static void AddToQueue (intf_thread_t *p_this)
+{
+ mtime_t played_time;
+ intf_sys_t *p_sys = p_this->p_sys;
- case VLC_AUDIOSCROBBLER_EFATAL:
- msg_Warn( p_intf, "Exiting..." );
- return;
+ vlc_mutex_lock(&p_sys->lock);
+ if (!p_sys->b_submit)
+ goto end;
- 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;
- }
+ /* 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 */
- msg_Dbg( p_intf, "Going to submit some data..." );
+ /*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;
- /* 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';
+ /* Don't send song shorter than 30s */
+ if (p_sys->p_current_song.i_l < 30)
+ {
+ msg_Dbg(p_this, "Song too short (< 30s), not submitting");
+ goto end;
+ }
- if( !asprintf( &psz_submit, "s=%s", p_sys->psz_auth_token ) )
- { /* Out of memory */
- return;
- }
+ /* 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)))
+ {
+ msg_Dbg(p_this, "Song not listened long enough, not submitting");
+ goto end;
+ }
- /* 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 );
+ /* 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)
+ {
+ msg_Dbg(p_this, "Missing artist or title, not submitting");
+ goto end;
+ }
- i_post_socket = net_ConnectTCP( p_intf,
- p_sys->psz_submit_host, p_sys->i_submit_port );
+ if (p_sys->i_songs >= QUEUE_MAX)
+ {
+ msg_Warn(p_this, "Submission queue is full, not submitting");
+ goto end;
+ }
- 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;
- }
+ msg_Dbg(p_this, "Song will be submitted.");
- /* we transmit the data */
- i_net_ret = net_Printf(
- VLC_OBJECT( p_intf ), i_post_socket, NULL,
- POST_REQUEST, p_sys->psz_submit_file,
- (unsigned)strlen( psz_submit ), p_sys->psz_submit_file,
- VERSION, psz_submit
- );
-
- free( psz_submit );
- if ( i_net_ret == -1 )
- {
- /* If connection fails, we assume we must handshake again */
- HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
- p_sys->b_handshaked = false;
- continue;
- }
+#define QUEUE_COPY(a) \
+ p_sys->p_queue[p_sys->i_songs].a = p_sys->p_current_song.a
- i_net_ret = net_Read( p_intf, i_post_socket, NULL,
- p_buffer, 1023, false );
- if ( i_net_ret <= 0 )
- {
- /* if we get no answer, something went wrong : try again */
- continue;
- }
+#define QUEUE_COPY_NULL(a) \
+ QUEUE_COPY(a); \
+ p_sys->p_current_song.a = NULL
- net_Close( i_post_socket );
- p_buffer[i_net_ret] = '\0';
+ 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_buffer_pos = strstr( ( char * ) p_buffer, "FAILED" );
- if ( p_buffer_pos )
- {
- msg_Warn( p_intf, "%s", p_buffer_pos );
- HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
- continue;
- }
+ p_sys->i_songs++;
- 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;
- }
+ /* signal the main loop we have something to submit */
+ vlc_cond_signal(&p_sys->wait);
- 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
- {
- 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 );
+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;
- 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_UNUSED(oldval);
- VLC_UNUSED( p_this ); VLC_UNUSED( psz_var );
+ 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;
- if( newval.i_int != INPUT_EVENT_STATE ) return VLC_SUCCESS;
+ VLC_UNUSED(psz_var);
- state_value.i_int = 0;
+ if (newval.i_int != INPUT_EVENT_STATE) return VLC_SUCCESS;
- var_Get( p_input, "state", &state_value );
+ if (var_CountChoices(p_input, "video-es"))
+ {
+ msg_Dbg(p_this, "Not an audio-only input, not submitting");
+ return VLC_SUCCESS;
+ }
+ state = var_GetInteger(p_input, "state");
- if( p_sys->b_meta_read == false && state_value.i_int >= PLAYING_S )
+ if (!p_sys->b_meta_read && state >= PLAYING_S)
{
- ReadMetaData( p_intf );
+ ReadMetaData(p_intf, p_input);
return VLC_SUCCESS;
}
- if( state_value.i_int >= END_S )
- AddToQueue( p_intf );
- else if( state_value.i_int == PAUSE_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_value.i_int == PLAYING_S )
- p_sys->time_total_pauses += ( mdate() - p_sys->time_pause );
+ else if (p_sys->time_pause > 0 && state == PLAYING_S)
+ {
+ p_sys->time_total_pauses += (mdate() - p_sys->time_pause);
+ p_sys->time_pause = 0;
+ }
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;
- intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
- intf_sys_t *p_sys = p_intf->p_sys;
- input_item_t *p_item;
- vlc_value_t video_val;
+ intf_thread_t *p_intf = p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ input_thread_t *p_input = newval.p_address;
- VLC_UNUSED( p_this ); VLC_UNUSED( psz_var );
- VLC_UNUSED( oldval ); VLC_UNUSED( newval );
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_var);
+ VLC_UNUSED(oldval);
- p_sys->b_state_cb = false;
p_sys->b_meta_read = false;
p_sys->b_submit = false;
- p_playlist = pl_Hold( p_intf );
- p_input = playlist_CurrentInput( p_playlist );
-
- if( !p_input || p_input->b_dead )
+ if (p_sys->p_input != NULL)
{
- pl_Release( p_intf );
- return VLC_SUCCESS;
+ var_DelCallback(p_sys->p_input, "intf-event", PlayingChange, p_intf);
+ vlc_object_release(p_sys->p_input);
+ p_sys->p_input = NULL;
}
- pl_Release( p_intf );
+ if (p_input == NULL)
+ return VLC_SUCCESS;
- p_item = input_GetItem( p_input );
- if( !p_item )
- {
- vlc_object_release( p_input );
+ input_item_t *p_item = input_GetItem(p_input);
+ if (p_item == NULL)
return VLC_SUCCESS;
- }
- var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
- if( ( video_val.i_int > 0 ) || p_item->i_type == ITEM_TYPE_NET )
+ if (var_CountChoices(p_input, "video-es"))
{
- msg_Dbg( p_this, "Not an audio local file, not submitting");
- vlc_object_release( p_input );
+ msg_Dbg(p_this, "Not an audio-only input, not submitting");
return VLC_SUCCESS;
}
p_sys->time_total_pauses = 0;
- time( &p_sys->p_current_song.date ); /* to be sent to last.fm */
+ time(&p_sys->p_current_song.date); /* to be sent to last.fm */
p_sys->p_current_song.i_start = mdate(); /* only used locally */
- var_AddCallback( p_input, "intf-event", PlayingChange, p_intf );
- p_sys->b_state_cb = true;
+ p_sys->p_input = vlc_object_hold(p_input);
+ var_AddCallback(p_input, "intf-event", PlayingChange, p_intf);
- if( input_item_IsPreparsed( p_item ) )
- ReadMetaData( p_intf );
+ 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 void AddToQueue ( intf_thread_t *p_this )
+static int Open(vlc_object_t *p_this)
{
- mtime_t played_time;
- intf_sys_t *p_sys = p_this->p_sys;
-
- vlc_mutex_lock( &p_sys->lock );
- if( !p_sys->b_submit )
- goto end;
-
- /* 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 */
-
- /*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;
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ intf_sys_t *p_sys = calloc(1, sizeof(intf_sys_t));
- /* Don't send song shorter than 30s */
- if( p_sys->p_current_song.i_l < 30 )
- {
- msg_Dbg( p_this, "Song too short (< 30s), not submitting" );
- goto end;
- }
+ if (!p_sys)
+ return VLC_ENOMEM;
- /* 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 ) ) )
- {
- msg_Dbg( p_this, "Song not listened long enough, not submitting" );
- goto end;
- }
+ p_intf->p_sys = p_sys;
- /* 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 )
- {
- msg_Dbg( p_this, "Missing artist or title, not submitting" );
- goto end;
- }
+ vlc_mutex_init(&p_sys->lock);
+ vlc_cond_init(&p_sys->wait);
- if( p_sys->i_songs >= QUEUE_MAX )
+ if (vlc_clone(&p_sys->thread, Run, p_intf, VLC_THREAD_PRIORITY_LOW))
{
- msg_Warn( p_this, "Submission queue is full, not submitting" );
- goto end;
+ vlc_cond_destroy(&p_sys->wait);
+ vlc_mutex_destroy(&p_sys->lock);
+ free(p_sys);
+ return VLC_ENOMEM;
}
- msg_Dbg( p_this, "Song will be submitted." );
-
-#define QUEUE_COPY( a ) \
- p_sys->p_queue[p_sys->i_songs].a = p_sys->p_current_song.a
-
-#define QUEUE_COPY_NULL( a ) \
- QUEUE_COPY( a ); \
- p_sys->p_current_song.a = NULL
-
- 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_sys->i_songs++;
+ var_AddCallback(pl_Get(p_intf), "input-current", ItemChange, p_intf);
- /* 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 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * 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
+ * Close: destroy interface stuff
*****************************************************************************/
-static int ParseURL( char *psz_url, char **psz_host, char **psz_file,
- int *i_port )
+static void Close(vlc_object_t *p_this)
{
- int i_pos;
- int i_len = strlen( psz_url );
- FREENULL( *psz_host );
- FREENULL( *psz_file );
-
- i_pos = strcspn( psz_url, ":" );
- if( i_pos == i_len )
- return VLC_EGENERIC;
-
- *psz_host = strndup( psz_url, i_pos );
- if( !*psz_host )
- return VLC_ENOMEM;
-
- i_pos++; /* skip the ':' */
- *i_port = atoi( psz_url + i_pos );
- if( *i_port <= 0 )
- {
- FREENULL( *psz_host );
- return VLC_EGENERIC;
- }
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- i_pos = strcspn( psz_url, "/" );
+ vlc_cancel(p_sys->thread);
+ vlc_join(p_sys->thread, NULL);
- if( i_pos == i_len )
- return VLC_EGENERIC;
+ var_DelCallback(pl_Get(p_intf), "input-current", ItemChange, p_intf);
- i_pos++; /* skip the '/' */
- *psz_file = strdup( psz_url + i_pos );
- if( !*psz_file )
+ if (p_sys->p_input != NULL)
{
- FREENULL( *psz_host );
- return VLC_ENOMEM;
+ var_DelCallback(p_sys->p_input, "intf-event", PlayingChange, p_intf);
+ vlc_object_release(p_sys->p_input);
}
- free( psz_url );
- return VLC_SUCCESS;
+ 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_username, *psz_password;
+ char *psz_scrobbler_url;
time_t timestamp;
char psz_timestamp[21];
int i_ret;
char *psz_url;
- intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
+ intf_thread_t *p_intf = (intf_thread_t*) p_this;
intf_sys_t *p_sys = p_this->p_sys;
- psz_username = config_GetPsz( p_this, "lastfm-username" );
- if( !psz_username )
- return VLC_ENOMEM;
-
- psz_password = config_GetPsz( p_this, "lastfm-password" );
- if( !psz_password )
- {
- free( psz_username );
- return VLC_ENOMEM;
- }
+ psz_username = var_InheritString(p_this, "lastfm-username");
+ psz_password = var_InheritString(p_this, "lastfm-password");
/* username or password have not been setup */
- if ( !*psz_username || !*psz_password )
+ if (EMPTY_STR(psz_username) || EMPTY_STR(psz_password))
{
- free( psz_username );
- free( psz_password );
+ free(psz_username);
+ free(psz_password);
return VLC_ENOVAR;
}
- time( ×tamp );
+ time(×tamp);
/* 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 );
+ InitMD5(&p_struct_md5);
+ AddMD5(&p_struct_md5, (uint8_t*) psz_password, strlen(psz_password));
+ EndMD5(&p_struct_md5);
- free( psz_password );
+ free(psz_password);
- char *psz_password_md5 = psz_md5_hash( &p_struct_md5 );
- if( !psz_password_md5 )
+ char *psz_password_md5 = psz_md5_hash(&p_struct_md5);
+ if (!psz_password_md5)
{
- free( psz_username );
+ free(psz_username);
return VLC_ENOMEM;
}
- snprintf( psz_timestamp, sizeof( psz_timestamp ), "%"PRIu64,
- (uint64_t)timestamp );
+ 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 )
+ 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)
{
- free( psz_username );
+ free(psz_username);
return VLC_ENOMEM;
}
- strncpy( p_sys->psz_auth_token, psz_auth_token, 33 );
- free( psz_auth_token );
- if( !asprintf( &psz_handshake_url,
- "http://post.audioscrobbler.com/?hs=true&p=1.2&c=%s&v=%s&u=%s&t=%s&a=%s",
- CLIENT_NAME, CLIENT_VERSION, psz_username, psz_timestamp,
- p_sys->psz_auth_token ) )
+ psz_scrobbler_url = var_InheritString(p_this, "scrobbler-url");
+ if (!psz_scrobbler_url)
{
- free( psz_username );
+ free(psz_auth_token);
+ free(psz_username);
return VLC_ENOMEM;
}
- free( psz_username );
+
+ 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);
+
+ free(psz_auth_token);
+ free(psz_scrobbler_url);
+ free(psz_username);
+ if (i_ret == -1)
+ return VLC_ENOMEM;
/* send the http handshake request */
- p_stream = stream_UrlNew( p_intf, psz_handshake_url );
- free( psz_handshake_url );
+ p_stream = stream_UrlNew(p_intf, psz_handshake_url);
+ free(psz_handshake_url);
- if( !p_stream )
+ if (!p_stream)
return VLC_EGENERIC;
/* read answer */
- i_ret = stream_Read( p_stream, p_buffer, 1023 );
- if( i_ret == 0 )
+ i_ret = stream_Read(p_stream, p_buffer, sizeof(p_buffer) - 1);
+ if (i_ret == 0)
{
- stream_Delete( p_stream );
+ stream_Delete(p_stream);
return VLC_EGENERIC;
}
p_buffer[i_ret] = '\0';
- stream_Delete( p_stream );
+ stream_Delete(p_stream);
- p_buffer_pos = strstr( ( char* ) p_buffer, "FAILED " );
- if ( p_buffer_pos )
+ p_buffer_pos = strstr((char*) p_buffer, "FAILED ");
+ if (p_buffer_pos)
{
/* handshake request failed, sorry */
- msg_Err( p_this, "last.fm handshake failed: %s", p_buffer_pos + 7 );
+ msg_Err(p_this, "last.fm handshake failed: %s", p_buffer_pos + 7);
return VLC_EGENERIC;
}
- p_buffer_pos = strstr( ( char* ) p_buffer, "BADAUTH" );
- if ( p_buffer_pos )
+ if (strstr((char*) p_buffer, "BADAUTH"))
{
/* authentication failed, bad username/password combination */
- intf_UserFatal( p_this, false,
+ dialog_Fatal(p_this,
_("last.fm: Authentication failed"),
- _("last.fm username or password is incorrect. "
- "Please verify your settings and relaunch VLC." ) );
+ "%s", _("last.fm username or password is incorrect. "
+ "Please verify your settings and relaunch VLC."));
return VLC_AUDIOSCROBBLER_EFATAL;
}
- p_buffer_pos = strstr( ( char* ) p_buffer, "BANNED" );
- if ( p_buffer_pos )
+ if (strstr((char*) p_buffer, "BANNED"))
{
/* 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." );
+ 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;
}
- p_buffer_pos = strstr( ( char* ) p_buffer, "BADTIME" );
- if ( p_buffer_pos )
+ if (strstr((char*) p_buffer, "BADTIME"))
{
/* 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." );
+ 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 = strstr( ( char* ) p_buffer, "OK" );
- if ( !p_buffer_pos )
+ p_buffer_pos = strstr((char*) p_buffer, "OK");
+ if (!p_buffer_pos)
goto proto;
- p_buffer_pos = strstr( p_buffer_pos, "\n" );
- if( !p_buffer_pos || strlen( p_buffer_pos ) < 34 )
+ 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' */
/* save the session ID */
- snprintf( p_sys->psz_auth_token, 33, "%s", p_buffer_pos );
+ memcpy(p_sys->psz_auth_token, p_buffer_pos, 32);
+ p_sys->psz_auth_token[32] = '\0';
- p_buffer_pos = strstr( p_buffer_pos, "http://" );
- if( !p_buffer_pos || strlen( p_buffer_pos ) == 7 )
+ p_buffer_pos = strstr(p_buffer_pos, "http://");
+ if (!p_buffer_pos || strlen(p_buffer_pos) == 7)
goto proto;
/* 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 )
+ psz_url = strndup(p_buffer_pos, strcspn(p_buffer_pos, "\n"));
+ if (!psz_url)
goto oom;
- switch( ParseURL( psz_url, &p_sys->psz_nowp_host,
- &p_sys->psz_nowp_file, &p_sys->i_nowp_port ) )
+ switch(ParseURL(psz_url, &p_sys->psz_nowp_host,
+ &p_sys->psz_nowp_file, &p_sys->i_nowp_port))
{
case VLC_ENOMEM:
goto oom;
break;
}
#endif
- p_buffer_pos = strstr( p_buffer_pos, "http://" );
- if( !p_buffer_pos || strlen( p_buffer_pos ) == 7 )
+ 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 )
+ 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 ) )
- {
- case VLC_ENOMEM:
- goto oom;
- case VLC_EGENERIC:
- goto proto;
- case VLC_SUCCESS:
- default:
- break;
- }
+ /* parse the submission url */
+ vlc_UrlParse(&p_sys->p_submit_url, psz_url, 0);
+ free(psz_url);
return VLC_SUCCESS;
return VLC_ENOMEM;
proto:
- msg_Err( p_intf, "Handshake: can't recognize server protocol" );
+ msg_Err(p_intf, "Handshake: can't recognize server protocol");
return VLC_EGENERIC;
}
-/*****************************************************************************
- * DeleteSong : Delete the char pointers in a song
- *****************************************************************************/
-static void DeleteSong( audioscrobbler_song_t* p_song )
+static void HandleInterval(mtime_t *next, unsigned int *i_interval)
{
- 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 );
+ 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);
}
/*****************************************************************************
- * ReadMetaData : Read meta data when parsed by vlc
+ * 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;
- input_item_t *p_item;
+ intf_thread_t *p_intf = data;
+ uint8_t p_buffer[1024];
+ int canc = vlc_savecancel();
+ bool b_handshaked = false;
- intf_sys_t *p_sys = p_this->p_sys;
+ /* data about audioscrobbler session */
+ mtime_t next_exchange = -1; /**< when can we send data */
+ unsigned int i_interval = 0; /**< waiting interval (secs)*/
+
+ intf_sys_t *p_sys = p_intf->p_sys;
- p_playlist = pl_Hold( p_this );
- p_input = playlist_CurrentInput( p_playlist );
- if( !p_input )
+ /* main loop */
+ for (;;)
{
- pl_Release( p_this );
- return( VLC_SUCCESS );
- }
+ vlc_restorecancel(canc);
+ vlc_mutex_lock(&p_sys->lock);
+ mutex_cleanup_push(&p_sys->lock);
- pl_Release( p_this );
+ do
+ vlc_cond_wait(&p_sys->wait, &p_sys->lock);
+ while (mdate() < next_exchange);
- p_item = input_GetItem( p_input );
- if( !p_item )
- return VLC_SUCCESS;
+ vlc_cleanup_run();
+ canc = vlc_savecancel();
- 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; \
- } \
- }
+ /* handshake if needed */
+ if (!b_handshaked)
+ {
+ msg_Dbg(p_intf, "Handshaking with last.fm ...");
- vlc_mutex_lock( &p_sys->lock );
+ switch(Handshake(p_intf))
+ {
+ case VLC_ENOMEM:
+ goto out;
- p_sys->b_meta_read = true;
+ 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;
- ALLOC_ITEM_META( p_sys->p_current_song.psz_a, Artist )
- else
- {
- 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 );
+ case VLC_SUCCESS:
+ msg_Dbg(p_intf, "Handshake successful :)");
+ b_handshaked = true;
+ i_interval = 0;
+ next_exchange = mdate();
+ break;
- 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.." );
- vlc_object_release( p_input );
- free( p_sys->p_current_song.psz_a );
- free( psz_meta );
- return VLC_EGENERIC;
- }
- free( psz_meta );
+ case VLC_AUDIOSCROBBLER_EFATAL:
+ msg_Warn(p_intf, "Exiting...");
+ goto out;
- /* Now we have read the mandatory meta data, so we can submit that info */
- p_sys->b_submit = true;
+ 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;
+ }
- 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 );
+ 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;
- 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 );
+ /* 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++)
+ {
+ 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;
+ }
+ 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);
+ }
+ vlc_mutex_unlock(&p_sys->lock);
- p_sys->p_current_song.i_l = input_item_GetDuration( p_item ) / 1000000;
+ int i_post_socket = net_ConnectTCP(p_intf, p_sys->p_submit_url.psz_host,
+ p_sys->p_submit_url.i_port);
- 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
+ if (i_post_socket == -1)
+ {
+ /* If connection fails, we assume we must handshake again */
+ HandleInterval(&next_exchange, &i_interval);
+ b_handshaked = false;
+ free(psz_submit);
+ continue;
+ }
- msg_Dbg( p_this, "Meta data registered" );
+ /* 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;
+ }
- vlc_mutex_unlock( &p_sys->lock );
- vlc_object_release( p_input );
- return VLC_SUCCESS;
+ 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;
+ }
-}
+ net_Close(i_post_socket);
+ p_buffer[i_net_ret] = '\0';
-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;
+ char *failed = strstr((char *) p_buffer, "FAILED");
+ if (failed)
+ {
+ msg_Warn(p_intf, "%s", failed);
+ HandleInterval(&next_exchange, &i_interval);
+ continue;
+ }
+
+ 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;
+ }
+
+ 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);
+ }
}
- *next = mdate() + ( *i_interval * 1000000 * 60 );
+out:
+ vlc_restorecancel(canc);
+ return NULL;
}
-
projects / vlc / blobdiff