@@ -22,16 +22,16 @@ enum album_methods static const lfmget primary_methods[] = { - {&album_method_declarations[get_info], {"album", "name"}, parse_utf8}, - {&album_method_declarations[get_info], {"album", "artist"}, parse_utf8}, - {&album_method_declarations[get_info], {"album", "mbid"}, parse_utf8}, - {&album_method_declarations[get_info], {"album", "url"}, parse_url}, - {&album_method_declarations[get_info], {"album", "releasedate"}, parse_url}, - {&album_method_declarations[get_info], {"album", "image[size=small]"}, parse_url}, - {&album_method_declarations[get_info], {"album", "image[size=medium]"}, parse_url}, - {&album_method_declarations[get_info], {"album", "image[size=large]"}, parse_url}, - {&album_method_declarations[get_info], {"album", "listeners"}, parse_guint}, - {&album_method_declarations[get_info], {"album", "playcount"}, parse_guint}, + {&album_method_declarations[get_info], {"album", "name"}, DATA_UTF8}, + {&album_method_declarations[get_info], {"album", "artist"}, DATA_UTF8}, + {&album_method_declarations[get_info], {"album", "mbid"}, DATA_UTF8}, + {&album_method_declarations[get_info], {"album", "url"}, DATA_URL}, + {&album_method_declarations[get_info], {"album", "releasedate"}, DATA_URL}, + {&album_method_declarations[get_info], {"album", "image[size=small]"}, DATA_URL}, + {&album_method_declarations[get_info], {"album", "image[size=medium]"}, DATA_URL}, + {&album_method_declarations[get_info], {"album", "image[size=large]"}, DATA_URL}, + {&album_method_declarations[get_info], {"album", "listeners"}, DATA_UINT}, + {&album_method_declarations[get_info], {"album", "playcount"}, DATA_UINT}, }; enum primary_info @@ -50,7 +50,7 @@ enum primary_info static const lfmget related_methods[] = { - {&album_method_declarations[get_info], {"album", "toptags", "tag"}, parse_tags} + {&album_method_declarations[get_info], {"album", "toptags", "tag"}, DATA_TAGS} }; enum related_info album.c @@ -37,18 +37,18 @@ enum artist_methods static const lfmget primary_methods[] = { - {&artist_method_declarations[get_info], {"artist", "name"}, parse_utf8}, - {&artist_method_declarations[get_info], {"artist", "mbid"}, parse_utf8}, - {&artist_method_declarations[get_info], {"artist", "url"}, parse_url}, - {&artist_method_declarations[get_info], {"artist", "image[size=small]"}, parse_url}, - {&artist_method_declarations[get_info], {"artist", "image[size=medium]"}, parse_url}, - {&artist_method_declarations[get_info], {"artist", "image[size=large]"}, parse_url}, - {&artist_method_declarations[get_info], {"artist", "streamable"}, parse_boolean}, - {&artist_method_declarations[get_info], {"artist", "stats", "listeners"}, parse_guint}, - {&artist_method_declarations[get_info], {"artist", "stats", "plays"}, parse_guint}, - {&artist_method_declarations[get_info], {"artist", "bio", "published"}, parse_date_time}, - {&artist_method_declarations[get_info], {"artist", "bio", "summary"}, parse_utf8}, - {&artist_method_declarations[get_info], {"artist", "bio", "content"}, parse_utf8}, + {&artist_method_declarations[get_info], {"artist", "name"}, DATA_UTF8}, + {&artist_method_declarations[get_info], {"artist", "mbid"}, DATA_UTF8}, + {&artist_method_declarations[get_info], {"artist", "url"}, DATA_URL}, + {&artist_method_declarations[get_info], {"artist", "image[size=small]"}, DATA_URL}, + {&artist_method_declarations[get_info], {"artist", "image[size=medium]"}, DATA_URL}, + {&artist_method_declarations[get_info], {"artist", "image[size=large]"}, DATA_URL}, + {&artist_method_declarations[get_info], {"artist", "streamable"}, DATA_BOOLEAN}, + {&artist_method_declarations[get_info], {"artist", "stats", "listeners"}, DATA_UINT}, + {&artist_method_declarations[get_info], {"artist", "stats", "plays"}, DATA_UINT}, + {&artist_method_declarations[get_info], {"artist", "bio", "published"}, DATA_DATE_TIME}, + {&artist_method_declarations[get_info], {"artist", "bio", "summary"}, DATA_UTF8}, + {&artist_method_declarations[get_info], {"artist", "bio", "content"}, DATA_UTF8}, }; enum primary_info @@ -69,14 +69,14 @@ enum primary_info lfmget related_methods[] = { - {&artist_method_declarations[get_events], {"events", "event"}, parse_events}, - {&artist_method_declarations[get_similar_artists], {"similarartists", "artist"}, parse_artists}, - {&artist_method_declarations[get_info], {"artist", "similar", "artist"}, parse_artists}, - {&artist_method_declarations[get_info], {"artist", "tags", "tag"}, parse_tags}, - {&artist_method_declarations[get_top_albums], {"topalbums", "album"}, parse_albums}, - {&artist_method_declarations[get_top_fans], {"topfans", "user"}, parse_users}, - {&artist_method_declarations[get_top_tags], {"toptags", "tag"}, parse_tags}, - {&artist_method_declarations[get_top_tracks], {"toptracks", "track"}, parse_tracks} + {&artist_method_declarations[get_events], {"events", "event"}, DATE_EVENTS}, + {&artist_method_declarations[get_similar_artists], {"similarartists", "artist"}, DATA_ARTISTS}, + {&artist_method_declarations[get_info], {"artist", "similar", "artist"}, DATA_ARTISTS}, + {&artist_method_declarations[get_info], {"artist", "tags", "tag"}, DATA_TAGS}, + {&artist_method_declarations[get_top_albums], {"topalbums", "album"}, DATA_ALBUMS}, + {&artist_method_declarations[get_top_fans], {"topfans", "user"}, DATA_USERS}, + {&artist_method_declarations[get_top_tags], {"toptags", "tag"}, DATA_TAGS}, + {&artist_method_declarations[get_top_tracks], {"toptracks", "track"}, DATA_TRACKS} }; enum related_info @@ -91,16 +91,6 @@ enum related_info ARTIST_TOP_TRACKS }; -const lfmget* get_primary_info_call(const enum primary_info info) -{ - return &primary_methods[info]; -} - -const lfmget* get_related_info_call(const enum related_info info) -{ - return &related_methods[info]; -} - G_GNUC_NULL_TERMINATED void artist_get_info_with_parameters(const gchar* artist, const lfmget* call, gpointer callback, gpointer user_data, ...) { createv(lfmparametervalue, parameters); @@ -130,18 +120,17 @@ void artist_get_info(const gchar* artist, const lfmget* call, gpointer callback, void artist_get_name(const gchar* musicbrainz_id, utf8_callback callback, gpointer user_data) { - const lfmget* call = get_primary_info_call(ARTIST_NAME); - get_info_with_parameters(call, callback, user_data, musicbrainz_id, NULL); + get_info_with_parameters(&primary_methods[ARTIST_NAME], callback, user_data, musicbrainz_id, NULL); } void artist_get_musicbrainz_id(const gchar* artist, utf8_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_MUSICBRAINZ_ID), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_MUSICBRAINZ_ID], callback, user_data); } void artist_get_url(const gchar* artist, url_callback callback, gpointer user_data) { - get_primary_info_call(ARTIST_URL); + artist_get_info(artist, &primary_methods[ARTIST_URL], callback, user_data); } void artist_get_image_url(const gchar* artist, image_size size, url_callback callback, gpointer user_data) @@ -151,13 +140,13 @@ void artist_get_image_url(const gchar* artist, image_size size, url_callback cal switch(size) { case IMAGE_LARGE: - call = get_primary_info_call(ARTIST_IMAGE_SMALL); + call = &primary_methods[ARTIST_IMAGE_SMALL]; break; case IMAGE_MEDIUM: - call = get_primary_info_call(ARTIST_IMAGE_MEDIUM); + call = &primary_methods[ARTIST_IMAGE_MEDIUM]; break; default: - call = get_primary_info_call(ARTIST_IMAGE_SMALL); + call = &primary_methods[ARTIST_IMAGE_SMALL]; break; } @@ -166,32 +155,32 @@ void artist_get_image_url(const gchar* artist, image_size size, url_callback cal void artist_is_streamable(const gchar* artist, boolean_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_STREAMABLE), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_STREAMABLE], callback, user_data); } void artist_get_listener_count(const gchar* artist, guint_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_LISTENER_COUNT), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_LISTENER_COUNT], callback, user_data); } void artist_get_play_count(const gchar* artist, guint_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_PLAY_COUNT), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_PLAY_COUNT], callback, user_data); } void artist_get_published_date_time(const gchar* artist, date_time_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_TEXT_PUBLISHED), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_TEXT_PUBLISHED], callback, user_data); } void artist_get_summary(const gchar* artist, utf8_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_SUMMARY), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_SUMMARY], callback, user_data); } void artist_get_description(const gchar* artist, utf8_callback callback, gpointer user_data) { - artist_get_info(artist, get_primary_info_call(ARTIST_DESCRIPTION), callback, user_data); + artist_get_info(artist, &primary_methods[ARTIST_DESCRIPTION], callback, user_data); } // @@ -200,38 +189,38 @@ void artist_get_description(const gchar* artist, utf8_callback callback, gpointe void artist_get_events(const gchar* artist, events_callback callback, gpointer user_data) { - artist_get_info(artist, get_related_info_call(ARTIST_EVENTS), callback, user_data); + artist_get_info(artist, &related_methods[ARTIST_EVENTS], callback, user_data); } //0 means no limit void artist_get_similar_artists(const gchar* artist, guint limit, artists_callback callback, gpointer user_data) { - artist_get_info_with_parameters(artist, get_related_info_call(ARTIST_SIMILAR_2), callback, user_data, limit, NULL); + artist_get_info_with_parameters(artist, &related_methods[ARTIST_SIMILAR_2], callback, user_data, limit, NULL); } void artist_get_tags(const gchar* artist, tags_callback callback, gpointer user_data) { - artist_get_info(artist, get_related_info_call(ARTIST_TAGS), callback, user_data); + artist_get_info(artist, &related_methods[ARTIST_TAGS], callback, user_data); } void artist_get_top_albums(const gchar* artist, albums_callback callback, gpointer user_data) { - artist_get_info(artist, get_related_info_call(ARTIST_TOP_ALBUMS), callback, user_data); + artist_get_info(artist, &related_methods[ARTIST_TOP_ALBUMS], callback, user_data); } void artist_get_top_fans(const gchar* artist, users_callback callback, gpointer user_data) { - artist_get_info(artist, get_related_info_call(ARTIST_TOP_FANS), callback, user_data); + artist_get_info(artist, &related_methods[ARTIST_TOP_FANS], callback, user_data); } void artist_get_top_tags(const gchar* artist, tags_callback callback, gpointer user_data) { - artist_get_info(artist, get_related_info_call(ARTIST_TOP_TAGS), callback, user_data); + artist_get_info(artist, &related_methods[ARTIST_TOP_TAGS], callback, user_data); } void artist_get_top_tracks(const gchar* artist, tracks_callback callback, gpointer user_data) { - artist_get_info(artist, get_related_info_call(ARTIST_TOP_TRACKS), callback, user_data); + artist_get_info(artist, &related_methods[ARTIST_TOP_TRACKS], callback, user_data); } void artist_add_tags() artist.c @@ -1,12 +1,40 @@ - +#include "include.h" +#include "communication.h" #include "authentication.h" -/* -"auth.getToken" - api_key: - api_sig: A 32-character API method signature, constructed as explained in Section 6 - */ -void request_authentication_by_user(const gchar* token) +const lfmmethod authentication_method_declarations[] = { - + {"auth.getToken", {}} +}; + +//enum has to be index of declarations +//changing this will break other code! +enum authentication_methods +{ + get_token +}; + +static const lfmget primary_methods[] = +{ + {&authentication_method_declarations[get_token], {"lfm", "token"}, DATA_UTF8} +}; + +enum primary_info +{ + AUTHENTICATION_GET_TOKEN +}; + +void authentication_get_token(utf8_callback callback, gpointer user_data) +{ + get_info_with_parameters(&primary_methods[AUTHENTICATION_GET_TOKEN], callback, user_data, NULL); +} + +void get_authtoken(gchar* token, guint token_size, GError* error) +{ + token_request_authorization(token, token_size); +} + +void authenticate() +{ + authentication_get_token(get_authtoken, NULL); } authentication.c @@ -2,5 +2,9 @@ #define AUTHENTICATION_H_ #include <glib.h> +#include "callback.h" + +void authenticate(); +void authentication_get_token(utf8_callback callback, gpointer user_data); #endif /*AUTHENTICATION_H_*/ authentication.h @@ -4,7 +4,7 @@ #include <glib.h> #include "lfmobjects.h" -typedef void (*utf8_callback)(gchar** utf8, guint* utf8_length, GError** error); +typedef void (*utf8_callback)(gchar* utf8, guint utf8_length, GError* error); typedef void (*url_callback)(gchar** url, guint* url_length, GError** error); typedef void (*guint_callback)(guint digit, GError** error); typedef void (*boolean_callback)(gboolean istrue, GError** error); callback.h @@ -5,6 +5,7 @@ #include "communication.h" static const gchar* api_key = "100780b228c8aa69be51d709572b45b8"; +static const gchar* secret = "ba296e6c0de47df63b43d4410a702626"; static const gchar* webservice_url = "http://ws.audioscrobbler.com/2.0/"; static const gchar* get_api_key() @@ -27,7 +28,46 @@ gchar* build_post_url() return g_strdup(webservice_url); } -void token_request_authentication(const gchar* token) +const lfmmethod token_method_declarations[] = +{ + {"auth.getsession", {{"token", NULL, FALSE}}} +}; + +enum token_method +{ + get_session +}; + +const lfmget token_data_declarations[] = +{ + {&token_method_declarations[get_session], {"lfm", "session", "name"}, DATA_UTF8}, + {&token_method_declarations[get_session], {"lfm", "session", "key"}, DATA_UTF8}, + {&token_method_declarations[get_session], {"lfm", "session", "subscriber"}, DATA_BOOLEAN} +}; + +enum token_data +{ + SESSION_NAME, + SESSION_KEY, + SESSION_IS_SUBSCRIBER +}; + +void session_get_name(const gchar* token, utf8_callback callback, gpointer user_data) +{ + get_info_with_parameters(&token_data_declarations[SESSION_NAME], callback, user_data, token, NULL); +} + +void session_get_key(const gchar* token, utf8_callback callback, gpointer user_data) +{ + get_info_with_parameters(token, &token_data_declarations[SESSION_KEY], callback, user_data, token, NULL); +} + +void session_is_subscriber(const gchar* token, boolean_callback callback, gpointer user_data) +{ + get_info_with_parameters(&token_data_declarations[SESSION_IS_SUBSCRIBER], callback, user_data, token, NULL); +} + +gboolean token_request_authorization(gchar* token, guint token_size) { createv(gchar, argv); addv(gchar, argv, "x-www-browser"); @@ -51,6 +91,31 @@ void token_request_authentication(const gchar* token) ); g_free(argv[1]); + g_free(argv); + return success; +} + +const gchar* token_get_session(const gchar* token) +{ +/* + get_data_from_method("auth.getSession", + token: + api_sig: token_get_signature(token, auth.getsession); + + * 2 : Invalid service -This service does not exist + * 3 : Invalid Method - No method with that name in this package + * 4 : Authentication Failed - You do not have permissions to access the service + * 5 : Invalid format - This service doesn't exist in that format + * 6 : Invalid parameters - Your request is missing a required parameter + * 7 : Invalid resource specified + * 9 : Invalid session key - Please re-authenticate + * 10 : Invalid API key - You must be granted a valid key by last.fm + * 11 : Service Offline - This service is temporarily offline. Try again later. + * 12 : Subscribers Only - This service is only available to paid last.fm subscribers + * 4 : Invalid authentication token supplied + * 14 : This token has not been authorized + * 15 : This token has expired +*/ } void token_get_signature(const gchar* token, const gchar* method_name) @@ -363,29 +428,6 @@ void send_data_to_method(const gchar* method_name, gchar** names, gchar** values proxy_post(get_proxy(), method_name, names, values); } -const gchar* token_get_session(const gchar* token) -{ -/* - get_data_from_method("auth.getSession", - token: - api_sig: token_get_signature(token, auth.getsession); - - * 2 : Invalid service -This service does not exist - * 3 : Invalid Method - No method with that name in this package - * 4 : Authentication Failed - You do not have permissions to access the service - * 5 : Invalid format - This service doesn't exist in that format - * 6 : Invalid parameters - Your request is missing a required parameter - * 7 : Invalid resource specified - * 9 : Invalid session key - Please re-authenticate - * 10 : Invalid API key - You must be granted a valid key by last.fm - * 11 : Service Offline - This service is temporarily offline. Try again later. - * 12 : Subscribers Only - This service is only available to paid last.fm subscribers - * 4 : Invalid authentication token supplied - * 14 : This token has not been authorized - * 15 : This token has expired -*/ -} - gpointer parse_utf8(const gchar* string, gpointer user_data, GError** error) { return g_strdup(string); @@ -431,15 +473,36 @@ void utf8_array2csl(void* pointer, gchar** css, size_t* byte_count) *byte_count = strlen(*css) * sizeof(gchar); } +void guint2utf8(void* array, gchar** utf8, size_t* byte_count) +{ +} + GDate* utf82date(const char* date_string) { GDate* date = g_date_new; g_date_set_parse(date, date_string); } -gpointer parse_date(const gchar* string, gpointer user_data, GError** error) +gboolean parse_boolean(const gchar* user, size_t user_size, GError** error) +{ + return TRUE; +} + +guint parse_uint(const gchar* user, size_t user_size, GError** error) +{ + return 0; +} + +gchar* parse_url(const gchar* user, size_t user_size, GError** error) +{ + return NULL; +} + +GTimeVal parse_date_time(const gchar* date_time, size_t date_time_size, GError** error) { - return utf82date(string); + GTimeVal test; + return test; + //return utf82date(date_time); } G_GNUC_NULL_TERMINATED void get_info_with_parameters(const lfmget* call, gpointer callback, gpointer user_data, ...) communication.c @@ -2,6 +2,7 @@ #define COMMUNICATION_H_ #include <glib.h> +#include "callback.h" struct lfmproxy; typedef struct lfmproxy lfmproxy; @@ -20,6 +21,11 @@ typedef struct lfmproxy lfmproxy; addv(gchar, array, G_STRUCT_MEMBER_P(astruct, 1));\ addv(gchar, array, G_STRUCT_MEMBER_P(astruct, 2)); +// +//Token functions +// +gboolean token_request_authorization(gchar* token, guint token_size); + /* enum refid { PRIMARY_ID = 1 << 0, @@ -27,6 +33,7 @@ enum refid ANY_ID = PRIMARY_ID | SECONDARY_ID }; typedef enum refid refid; +*/ typedef void (*type_converter)(void* type, gchar** utf8, guint* utf8_length); @@ -45,13 +52,28 @@ struct lfmmethod const lfmparameter parameters[2]; }; +enum data_type +{ + DATA_UTF8, + DATA_URL, + DATA_DATE_TIME, + DATA_BOOLEAN, + DATA_UINT, + DATE_EVENTS, + DATA_ARTISTS, + DATA_ALBUMS, + DATA_USERS, + DATA_TAGS, + DATA_TRACKS +}; + typedef struct lfmmethod lfmmethod; struct lfmget { const lfmmethod* method; const gchar* path[5]; - const void* data_parser; + const enum data_type data_parser; }; typedef struct lfmget lfmget; @@ -68,18 +90,8 @@ struct lfmparametervalue typedef struct lfmparametervalue lfmparametervalue; -// -// Available general parse functions -// - -gpointer parse_utf8(const gchar* string, gpointer user_data, GError** error); -gpointer parse_url(const gchar* string, gpointer user_data, GError** error); -gpointer parse_boolean(const gchar* string, gpointer user_data, GError** error); -gpointer parse_guint(const gchar* string, gpointer user_data, GError** error); -gpointer parse_date_time(const gchar* string, gpointer user_data, GError** error); - void utf8_array2csl(void* array, gchar** utf8, size_t* byte_count); -void guint2utf8(); +void guint2utf8(void* array, gchar** utf8, size_t* byte_count); void fill_parameters(lfmparametervalue** values, const lfmmethod* method, va_list vl); communication.h @@ -1,5 +1,5 @@ AC_PREREQ(2.61) -AC_INIT(liblastfm,0.0.1) +AC_INIT(lastfm,0.0.1) AC_PROG_CC AC_PROG_LIBTOOL configure.in @@ -1,6 +1,7 @@ #ifndef LASTFM_H_ #define LASTFM_H_ +#include "authentication.h" #include "album.h" #include "artist.h" lastfm.h a681d5f0b478dfb95af663c86de1f7e87d1dd54d LCID Fire lcid-fire@gmx.net http://github.com/LCID-Fire/liblastfm/commit/2b8415c9354a98c7bb302eaf3ada037f49a58b0a 2b8415c9354a98c7bb302eaf3ada037f49a58b0a 2008-07-06T12:04:43-07:00 2008-07-06T12:04:43-07:00 Further development (some bits of refactoring) 7b04fbc6416bb40a073eb37e0e56b3df8e5d9224 LCID Fire lcid-fire@gmx.net