C has a function named strchr().

[vlc] / modules / misc / audioscrobbler.c

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index ec3f5479e8e2bcb63b2b5dec19996b12a9681798..bae7d6c0cecccc3dca7e1f63b6769bfce9eed91a 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * audioscrobbler.c : audioscrobbler submission plugin
  *****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
  * $Id$
  *
  * Author: Rafaël Carré <funman at videolanorg>
@@ -26,6 +26,7 @@
  * http://www.audioscrobbler.net/development/protocol/
  *
  * TODO:    "Now Playing" feature (not mandatory)
+ *          Update to new API? http://www.lastfm.fr/api
  */
 /*****************************************************************************
  * Preamble
@@ -42,6 +43,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
+#include <vlc_dialog.h>
 #include <vlc_meta.h>
 #include <vlc_md5.h>
 #include <vlc_stream.h>
@@ -133,6 +135,8 @@ static void HandleInterval  ( mtime_t *, unsigned int * );
 #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
@@ -148,7 +152,7 @@ static void HandleInterval  ( mtime_t *, unsigned int * );
                         "Connection: close\n"                               \
                         "Content-type: application/x-www-form-urlencoded\n" \
                         "Host: %s\n"                                        \
-                        "User-agent: VLC Media Player/%s\r\n"               \
+                        "User-agent: VLC media player/%s\r\n"               \
                         "\r\n"                                              \
                         "%s\r\n"                                            \
                         "\r\n"
@@ -162,6 +166,8 @@ vlc_module_begin ()
                 USERNAME_TEXT, USERNAME_LONGTEXT, false )
     add_password( "lastfm-password", "", NULL,
                 PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
+    add_string( "scrobbler-url", "post.audioscrobbler.com", NULL,
+                URL_TEXT, URL_LONGTEXT, false )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
 vlc_module_end ()
@@ -288,9 +294,9 @@ static void Run( intf_thread_t *p_intf )
 
                 case VLC_ENOVAR:
                     /* username not set */
-                    intf_UserFatal( p_intf, false,
+                    dialog_Fatal( p_intf,
                         _("Last.fm username not set"),
-                        _("Please set a username or disable the "
+                        "%s", _("Please set a username or disable the "
                         "audioscrobbler plugin, and restart VLC.\n"
                         "Visit http://www.last.fm/join/ to get an account.")
                     );
@@ -390,7 +396,7 @@ static void Run( intf_thread_t *p_intf )
         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,
+            (unsigned)strlen( psz_submit ), p_sys->psz_submit_host,
             VERSION, psz_submit
         );
 
@@ -460,6 +466,8 @@ static void Run( intf_thread_t *p_intf )
 static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *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;
@@ -486,7 +494,10 @@ static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
     else if( state_value.i_int == PAUSE_S )
         p_sys->time_pause = mdate();
     else if( p_sys->time_pause > 0 && state_value.i_int == PLAYING_S )
+    {
         p_sys->time_total_pauses += ( mdate() - p_sys->time_pause );
+        p_sys->time_pause = 0;
+    }
 
     return VLC_SUCCESS;
 }
@@ -530,9 +541,9 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     }
 
     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( video_val.i_int > 0 )
     {
-        msg_Dbg( p_this, "Not an audio local file, not submitting");
+        msg_Dbg( p_this, "Not an audio-only input, not submitting");
         vlc_object_release( p_input );
         return VLC_SUCCESS;
     }
@@ -653,26 +664,34 @@ static int ParseURL( char *psz_url, char **psz_host, char **psz_file,
 {
     int i_pos;
     int i_len = strlen( psz_url );
+    bool b_no_port = false;
     FREENULL( *psz_host );
     FREENULL( *psz_file );
 
     i_pos = strcspn( psz_url, ":" );
     if( i_pos == i_len )
-        return VLC_EGENERIC;
+    {
+        *i_port = 80;
+        i_pos = strcspn( psz_url, "/" );
+        b_no_port = true;
+    }
 
     *psz_host = strndup( psz_url, i_pos );
     if( !*psz_host )
         return VLC_ENOMEM;
 
-    i_pos++; /* skip the ':' */
-    *i_port = atoi( psz_url + i_pos );
-    if( *i_port <= 0 )
+    if( !b_no_port )
     {
-        FREENULL( *psz_host );
-        return VLC_EGENERIC;
-    }
+        i_pos++; /* skip the ':' */
+        *i_port = atoi( psz_url + i_pos );
+        if( *i_port <= 0 )
+        {
+            FREENULL( *psz_host );
+            return VLC_EGENERIC;
+        }
 
-    i_pos = strcspn( psz_url, "/" );
+        i_pos = strcspn( psz_url, "/" );
+    }
 
     if( i_pos == i_len )
         return VLC_EGENERIC;
@@ -695,6 +714,7 @@ static int ParseURL( char *psz_url, char **psz_host, char **psz_file,
 static int Handshake( intf_thread_t *p_this )
 {
     char                *psz_username, *psz_password;
+    char                *psz_scrobbler_url;
     time_t              timestamp;
     char                psz_timestamp[21];
 
@@ -768,14 +788,23 @@ static int Handshake( intf_thread_t *p_this )
     strncpy( p_sys->psz_auth_token, psz_auth_token, 33 );
     free( psz_auth_token );
 
+    psz_scrobbler_url = config_GetPsz( p_this, "scrobbler-url" );
+    if( !psz_scrobbler_url )
+    {
+        free( psz_username );
+        return VLC_ENOMEM;
+    }
+
     if( !asprintf( &psz_handshake_url,
-    "http://post.audioscrobbler.com/?hs=true&p=1.2&c=%s&v=%s&u=%s&t=%s&a=%s",
+    "http://%s/?hs=true&p=1.2&c=%s&v=%s&u=%s&t=%s&a=%s", psz_scrobbler_url,
         CLIENT_NAME, CLIENT_VERSION, psz_username, psz_timestamp,
         p_sys->psz_auth_token ) )
     {
+        free( psz_scrobbler_url );
         free( psz_username );
         return VLC_ENOMEM;
     }
+    free( psz_scrobbler_url );
     free( psz_username );
 
     /* send the http handshake request */
@@ -807,9 +836,9 @@ static int Handshake( intf_thread_t *p_this )
     if ( p_buffer_pos )
     {
         /* 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. "
+            "%s", _("last.fm username or password is incorrect. "
               "Please verify your settings and relaunch VLC." ) );
         return VLC_AUDIOSCROBBLER_EFATAL;
     }