Mercurial > audlegacy-plugins
annotate src/scrobbler/hatena.c @ 733:7c04570bf809 trunk
[svn] fixed where srobbler dumps files.
author | kustodian |
---|---|
date | Mon, 26 Feb 2007 05:14:22 -0800 |
parents | a3ca00f30af5 |
children | c23705487009 |
rev | line source |
---|---|
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
1 #include "settings.h" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
2 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
3 #include <pthread.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
4 #include <limits.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
5 #include <stdlib.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
6 #include <string.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
7 #include <stdarg.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
8 #include <curl/curl.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
9 #include <stdio.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
10 #include "fmt.h" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
11 #include "md5.h" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
12 #include "scrobbler.h" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
13 #include "config.h" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
14 #include <glib.h> |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
15 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
16 #include <audacious/titlestring.h> |
732 | 17 #include <audacious/util.h> |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
18 |
350 | 19 #define SCROBBLER_HS_URL "http://music.hatelabo.jp/trackauth" |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
20 #define SCROBBLER_CLI_ID "aud" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
21 #define SCROBBLER_HS_WAIT 1800 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
22 #define SCROBBLER_SB_WAIT 10 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
23 #define SCROBBLER_VERSION "1.1" |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
24 #define SCROBBLER_IMPLEMENTATION "0.1" /* This is the implementation, not the player version. */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
25 #define SCROBBLER_SB_MAXLEN 1024 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
26 #define CACHE_SIZE 1024 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
27 |
350 | 28 #define HATENA_SUBMIT_INTERVAL 60 |
29 | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
30 /* Scrobblerbackend for xmms plugin, first draft */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
31 |
350 | 32 static int hatena_sc_hs_status, |
33 hatena_sc_hs_timeout, | |
34 hatena_sc_hs_errors, | |
35 hatena_sc_sb_errors, | |
36 hatena_sc_bad_users, | |
37 hatena_sc_submit_interval = HATENA_SUBMIT_INTERVAL, | |
38 hatena_sc_submit_timeout, | |
39 hatena_sc_srv_res_size, | |
40 hatena_sc_giveup, | |
41 hatena_sc_major_error_present; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
42 |
350 | 43 static char *hatena_sc_submit_url, |
44 *hatena_sc_username = NULL, | |
45 *hatena_sc_password = NULL, | |
46 *hatena_sc_challenge_hash, | |
47 hatena_sc_response_hash[33], | |
48 *hatena_sc_srv_res, | |
49 hatena_sc_curl_errbuf[CURL_ERROR_SIZE], | |
50 *hatena_sc_major_error; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
51 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
52 static void dump_queue(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
53 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
54 /**** Queue stuff ****/ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
55 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
56 #define I_ARTIST(i) i->artist |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
57 #define I_TITLE(i) i->title |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
58 #define I_TIME(i) i->utctime |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
59 #define I_LEN(i) i->len |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
60 #define I_MB(i) i->mb |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
61 #define I_ALBUM(i) i->album |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
62 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
63 typedef struct { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
64 char *artist, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
65 *title, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
66 *mb, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
67 *album, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
68 *utctime, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
69 len[16]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
70 int numtries; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
71 void *next; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
72 } item_t; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
73 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
74 static item_t *q_queue = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
75 static item_t *q_queue_last = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
76 static int q_nitems; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
77 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
78 static void q_item_free(item_t *item) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
79 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
80 if (item == NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
81 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
82 curl_free(item->artist); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
83 curl_free(item->title); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
84 curl_free(item->utctime); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
85 curl_free(item->mb); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
86 curl_free(item->album); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
87 free(item); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
88 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
89 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
90 static void q_put(TitleInput *tuple, int len) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
91 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
92 item_t *item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
93 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
94 item = malloc(sizeof(item_t)); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
95 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
96 item->artist = fmt_escape(tuple->performer); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
97 item->title = fmt_escape(tuple->track_name); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
98 item->utctime = fmt_escape(fmt_timestr(time(NULL), 1)); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
99 snprintf(item->len, sizeof(item->len), "%d", len); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
100 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
101 #ifdef NOTYET |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
102 if(tuple->mb == NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
103 #endif |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
104 item->mb = fmt_escape(""); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
105 #ifdef NOTYET |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
106 else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
107 item->mb = fmt_escape((char*)tuple->mb); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
108 #endif |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
109 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
110 if(tuple->album_name == NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
111 item->album = fmt_escape(""); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
112 else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
113 item->album = fmt_escape((char*)tuple->album_name); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
114 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
115 q_nitems++; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
116 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
117 item->next = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
118 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
119 if(q_queue_last == NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
120 q_queue = q_queue_last = item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
121 else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
122 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
123 q_queue_last->next = item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
124 q_queue_last = item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
125 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
126 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
127 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
128 static item_t *q_put2(char *artist, char *title, char *len, char *time, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
129 char *album, char *mb) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
130 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
131 char *temp = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
132 item_t *item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
133 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
134 item = calloc(1, sizeof(item_t)); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
135 temp = fmt_unescape(artist); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
136 item->artist = fmt_escape(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
137 curl_free(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
138 temp = fmt_unescape(title); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
139 item->title = fmt_escape(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
140 curl_free(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
141 memcpy(item->len, len, sizeof(len)); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
142 temp = fmt_unescape(time); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
143 item->utctime = fmt_escape(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
144 curl_free(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
145 temp = fmt_unescape(album); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
146 item->album = fmt_escape(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
147 curl_free(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
148 temp = fmt_unescape(mb); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
149 item->mb = fmt_escape(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
150 curl_free(temp); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
151 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
152 q_nitems++; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
153 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
154 item->next = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
155 if(q_queue_last == NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
156 q_queue = q_queue_last = item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
157 else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
158 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
159 q_queue_last->next = item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
160 q_queue_last = item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
161 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
162 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
163 return item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
164 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
165 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
166 static item_t *q_peek(void) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
167 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
168 if (q_nitems == 0) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
169 return NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
170 return q_queue; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
171 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
172 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
173 static item_t *q_peekall(int rewind) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
174 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
175 static item_t *citem = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
176 item_t *temp_item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
177 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
178 if (rewind) { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
179 citem = q_queue; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
180 return NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
181 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
182 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
183 temp_item = citem; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
184 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
185 if(citem != NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
186 citem = citem->next; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
187 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
188 return temp_item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
189 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
190 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
191 static int q_get(void) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
192 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
193 item_t *item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
194 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
195 if (q_nitems == 0) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
196 return 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
197 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
198 item = q_queue; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
199 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
200 if(item == NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
201 return 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
202 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
203 q_nitems--; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
204 q_queue = q_queue->next; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
205 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
206 q_item_free(item); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
207 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
208 if (q_nitems == 0) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
209 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
210 q_queue_last = NULL; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
211 return 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
212 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
213 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
214 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
215 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
216 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
217 static void q_free(void) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
218 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
219 while (q_get()); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
220 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
221 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
222 static int q_len(void) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
223 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
224 return q_nitems; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
225 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
226 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
227 /* Error functions */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
228 |
350 | 229 static void hatena_sc_throw_error(char *errortxt) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
230 { |
350 | 231 hatena_sc_major_error_present = 1; |
232 if(hatena_sc_major_error == NULL) | |
233 hatena_sc_major_error = strdup(errortxt); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
234 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
235 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
236 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
237 |
350 | 238 int hatena_sc_catch_error(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
239 { |
350 | 240 return hatena_sc_major_error_present; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
241 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
242 |
350 | 243 char *hatena_sc_fetch_error(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
244 { |
350 | 245 return hatena_sc_major_error; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
246 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
247 |
350 | 248 void hatena_sc_clear_error(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
249 { |
350 | 250 hatena_sc_major_error_present = 0; |
251 if(hatena_sc_major_error != NULL) | |
252 free(hatena_sc_major_error); | |
253 hatena_sc_major_error = NULL; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
254 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
255 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
256 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
257 |
350 | 258 static size_t hatena_sc_store_res(void *ptr, size_t size, |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
259 size_t nmemb, |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
260 void *stream __attribute__((unused))) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
261 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
262 int len = size * nmemb; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
263 |
350 | 264 hatena_sc_srv_res = realloc(hatena_sc_srv_res, hatena_sc_srv_res_size + len + 1); |
265 memcpy(hatena_sc_srv_res + hatena_sc_srv_res_size, | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
266 ptr, len); |
350 | 267 hatena_sc_srv_res_size += len; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
268 return len; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
269 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
270 |
350 | 271 static void hatena_sc_free_res(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
272 { |
350 | 273 if(hatena_sc_srv_res != NULL) |
274 free(hatena_sc_srv_res); | |
275 hatena_sc_srv_res = NULL; | |
276 hatena_sc_srv_res_size = 0; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
277 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
278 |
350 | 279 static int hatena_sc_parse_hs_res(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
280 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
281 char *interval; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
282 |
350 | 283 if (!hatena_sc_srv_res_size) { |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
284 pdebug("No reply from server", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
285 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
286 } |
350 | 287 *(hatena_sc_srv_res + hatena_sc_srv_res_size) = 0; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
288 |
350 | 289 if (!strncmp(hatena_sc_srv_res, "FAILED ", 7)) { |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
290 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
291 /* Throwing a major error, just in case */ |
350 | 292 /* hatena_sc_throw_error(fmt_vastr("%s", hatena_sc_srv_res)); |
293 hatena_sc_hs_errors++; */ | |
294 pdebug(fmt_vastr("error: %s", hatena_sc_srv_res), DEBUG); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
295 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
296 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
297 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
298 |
350 | 299 if (!strncmp(hatena_sc_srv_res, "UPDATE ", 7)) { |
300 | |
301 hatena_sc_submit_url = strchr(strchr(hatena_sc_srv_res, '\n') + 1, '\n') + 1; | |
302 *(hatena_sc_submit_url - 1) = 0; | |
303 hatena_sc_submit_url = strdup(hatena_sc_submit_url); | |
304 hatena_sc_challenge_hash = strchr(hatena_sc_srv_res, '\n') + 1; | |
305 *(hatena_sc_challenge_hash - 1) = 0; | |
306 hatena_sc_challenge_hash = strdup(hatena_sc_challenge_hash); | |
307 | |
308 /* Throwing major error. Need to alert client to update. */ | |
309 hatena_sc_throw_error(fmt_vastr("Please update Audacious.\n" | |
310 "Update available at: http://audacious-media-player.org")); | |
311 pdebug(fmt_vastr("update client: %s", hatena_sc_srv_res + 7), DEBUG); | |
312 | |
313 /* | |
314 * Russ isn't clear on whether we can submit with a not-updated | |
315 * client. Neither is RJ. I use what we did before. | |
316 */ | |
317 hatena_sc_giveup = -1; | |
318 return -1; | |
319 } | |
320 if (!strncmp(hatena_sc_srv_res, "UPTODATE\n", 9)) { | |
321 hatena_sc_bad_users = 0; | |
322 | |
323 hatena_sc_submit_url = strchr(strchr(hatena_sc_srv_res, '\n') + 1, '\n') + 1; | |
324 *(hatena_sc_submit_url - 1) = 0; | |
325 hatena_sc_submit_url = strdup(hatena_sc_submit_url); | |
326 hatena_sc_challenge_hash = strchr(hatena_sc_srv_res, '\n') + 1; | |
327 *(hatena_sc_challenge_hash - 1) = 0; | |
328 hatena_sc_challenge_hash = strdup(hatena_sc_challenge_hash); | |
329 | |
330 return 0; | |
331 } | |
332 if(!strncmp(hatena_sc_srv_res, "BADUSER", 7)) { | |
333 /* Throwing major error. */ | |
334 hatena_sc_throw_error("Incorrect username/password.\n" | |
335 "Please fix in configuration."); | |
336 pdebug("incorrect username/password", DEBUG); | |
337 | |
338 interval = strstr(hatena_sc_srv_res, "INTERVAL"); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
339 if(!interval) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
340 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
341 pdebug("missing INTERVAL", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
342 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
343 else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
344 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
345 *(interval - 1) = 0; |
350 | 346 hatena_sc_submit_interval = strtol(interval + 8, NULL, 10); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
347 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
348 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
349 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
350 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
351 |
350 | 352 pdebug(fmt_vastr("unknown server-reply '%s'", hatena_sc_srv_res), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
353 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
354 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
355 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
356 static void hexify(char *pass, int len) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
357 { |
350 | 358 char *bp = hatena_sc_response_hash; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
359 char hexchars[] = "0123456789abcdef"; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
360 int i; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
361 |
350 | 362 memset(hatena_sc_response_hash, 0, sizeof(hatena_sc_response_hash)); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
363 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
364 for(i = 0; i < len; i++) { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
365 *(bp++) = hexchars[(pass[i] >> 4) & 0x0f]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
366 *(bp++) = hexchars[pass[i] & 0x0f]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
367 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
368 *bp = 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
369 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
370 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
371 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
372 |
350 | 373 static int hatena_sc_handshake(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
374 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
375 int status; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
376 char buf[4096]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
377 CURL *curl; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
378 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
379 snprintf(buf, sizeof(buf), "%s/?hs=true&p=%s&c=%s&v=%s&u=%s", |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
380 SCROBBLER_HS_URL, SCROBBLER_VERSION, |
350 | 381 SCROBBLER_CLI_ID, SCROBBLER_IMPLEMENTATION, hatena_sc_username); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
382 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
383 curl = curl_easy_init(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
384 curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
385 curl_easy_setopt(curl, CURLOPT_URL, buf); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
386 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, |
350 | 387 hatena_sc_store_res); |
388 memset(hatena_sc_curl_errbuf, 0, sizeof(hatena_sc_curl_errbuf)); | |
389 curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, hatena_sc_curl_errbuf); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
390 curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
401
192004e2a1b7
[svn] - add connection timeout option to curl_easy_perform(). hopefully, audacious can quit smoothly even though last.fm server goes down.
yaz
parents:
350
diff
changeset
|
391 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); |
192004e2a1b7
[svn] - add connection timeout option to curl_easy_perform(). hopefully, audacious can quit smoothly even though last.fm server goes down.
yaz
parents:
350
diff
changeset
|
392 curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
393 status = curl_easy_perform(curl); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
394 curl_easy_cleanup(curl); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
395 |
350 | 396 hatena_sc_hs_timeout = time(NULL) + SCROBBLER_HS_WAIT; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
397 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
398 if (status) { |
350 | 399 pdebug(hatena_sc_curl_errbuf, DEBUG); |
400 hatena_sc_hs_errors++; | |
401 hatena_sc_free_res(); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
402 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
403 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
404 |
350 | 405 if (hatena_sc_parse_hs_res()) { |
406 hatena_sc_hs_errors++; | |
407 hatena_sc_free_res(); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
408 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
409 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
410 |
350 | 411 if (hatena_sc_challenge_hash != NULL) { |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
412 md5_state_t md5state; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
413 unsigned char md5pword[16]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
414 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
415 md5_init(&md5state); |
350 | 416 /*pdebug(fmt_vastr("Pass Hash: %s", hatena_sc_password), DEBUG);*/ |
417 md5_append(&md5state, (unsigned const char *)hatena_sc_password, | |
418 strlen(hatena_sc_password)); | |
419 /*pdebug(fmt_vastr("Challenge Hash: %s", hatena_sc_challenge_hash), DEBUG);*/ | |
420 md5_append(&md5state, (unsigned const char *)hatena_sc_challenge_hash, | |
421 strlen(hatena_sc_challenge_hash)); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
422 md5_finish(&md5state, md5pword); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
423 hexify((char*)md5pword, sizeof(md5pword)); |
350 | 424 /*pdebug(fmt_vastr("Response Hash: %s", hatena_sc_response_hash), DEBUG);*/ |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
425 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
426 |
350 | 427 hatena_sc_hs_errors = 0; |
428 hatena_sc_hs_status = 1; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
429 |
350 | 430 hatena_sc_free_res(); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
431 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
432 pdebug(fmt_vastr("submiturl: %s - interval: %d", |
350 | 433 hatena_sc_submit_url, hatena_sc_submit_interval), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
434 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
435 return 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
436 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
437 |
350 | 438 static int hatena_sc_parse_sb_res(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
439 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
440 char *ch, *ch2; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
441 |
350 | 442 if (!hatena_sc_srv_res_size) { |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
443 pdebug("No response from server", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
444 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
445 } |
350 | 446 *(hatena_sc_srv_res + hatena_sc_srv_res_size) = 0; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
447 |
350 | 448 if (!strncmp(hatena_sc_srv_res, "OK", 2)) { |
449 if ((ch = strstr(hatena_sc_srv_res, "INTERVAL"))) { | |
450 hatena_sc_submit_interval = strtol(ch + 8, NULL, 10); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
451 pdebug(fmt_vastr("got new interval: %d", |
350 | 452 hatena_sc_submit_interval), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
453 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
454 |
350 | 455 pdebug(fmt_vastr("submission ok: %s", hatena_sc_srv_res), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
456 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
457 return 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
458 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
459 |
350 | 460 if (!strncmp(hatena_sc_srv_res, "BADAUTH", 7)) { |
461 if ((ch = strstr(hatena_sc_srv_res, "INTERVAL"))) { | |
462 hatena_sc_submit_interval = strtol(ch + 8, NULL, 10); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
463 pdebug(fmt_vastr("got new interval: %d", |
350 | 464 hatena_sc_submit_interval), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
465 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
466 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
467 pdebug("incorrect username/password", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
468 |
350 | 469 hatena_sc_giveup = 0; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
470 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
471 /* |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
472 * We obviously aren't authenticated. The server might have |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
473 * lost our handshake status though, so let's try |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
474 * re-handshaking... This might not be proper. |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
475 * (we don't give up) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
476 */ |
350 | 477 hatena_sc_hs_status = 0; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
478 |
350 | 479 if(hatena_sc_challenge_hash != NULL) |
480 free(hatena_sc_challenge_hash); | |
481 if(hatena_sc_submit_url != NULL) | |
482 free(hatena_sc_submit_url); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
483 |
350 | 484 hatena_sc_challenge_hash = hatena_sc_submit_url = NULL; |
485 hatena_sc_bad_users++; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
486 |
350 | 487 if(hatena_sc_bad_users > 2) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
488 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
489 pdebug("3 BADAUTH returns on submission. Halting " |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
490 "submissions until login fixed.", DEBUG) |
350 | 491 hatena_sc_throw_error("Incorrect username/password.\n" |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
492 "Please fix in configuration."); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
493 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
494 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
495 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
496 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
497 |
350 | 498 if (!strncmp(hatena_sc_srv_res, "FAILED", 6)) { |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
499 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
500 /* This could be important. (Such as FAILED - Get new plugin) */ |
350 | 501 /*hatena_sc_throw_error(fmt_vastr("%s", hatena_sc_srv_res));*/ |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
502 |
350 | 503 pdebug(hatena_sc_srv_res, DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
504 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
505 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
506 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
507 |
350 | 508 if (!strncmp(hatena_sc_srv_res, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">", 50)) { |
509 ch = strstr(hatena_sc_srv_res, "<TITLE>") + 7; | |
510 ch2 = strstr(hatena_sc_srv_res, "</TITLE>"); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
511 *ch2 = '\0'; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
512 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
513 pdebug(fmt_vastr("HTTP Error (%d): '%s'", |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
514 atoi(ch), ch + 4), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
515 *ch2 = '<'; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
516 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
517 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
518 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
519 |
350 | 520 pdebug(fmt_vastr("unknown server-reply %s", hatena_sc_srv_res), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
521 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
522 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
523 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
524 |
350 | 525 static gchar *hatena_sc_itemtag(char c, int n, char *str) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
526 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
527 static char buf[SCROBBLER_SB_MAXLEN]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
528 snprintf(buf, SCROBBLER_SB_MAXLEN, "&%c[%d]=%s", c, n, str); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
529 return buf; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
530 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
531 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
532 #define cfa(f, l, n, v) \ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
533 curl_formadd(f, l, CURLFORM_COPYNAME, n, \ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
534 CURLFORM_PTRCONTENTS, v, CURLFORM_END) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
535 |
350 | 536 static int hatena_sc_generateentry(GString *submission) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
537 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
538 int i; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
539 item_t *item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
540 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
541 i = 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
542 #ifdef ALLOW_MULTIPLE |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
543 q_peekall(1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
544 while ((item = q_peekall(0)) && i < 10) { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
545 #else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
546 item = q_peek(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
547 #endif |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
548 if (!item) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
549 return i; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
550 |
350 | 551 g_string_append(submission,hatena_sc_itemtag('a',i,I_ARTIST(item))); |
552 g_string_append(submission,hatena_sc_itemtag('t',i,I_TITLE(item))); | |
553 g_string_append(submission,hatena_sc_itemtag('l',i,I_LEN(item))); | |
554 g_string_append(submission,hatena_sc_itemtag('i',i,I_TIME(item))); | |
555 g_string_append(submission,hatena_sc_itemtag('m',i,I_MB(item))); | |
556 g_string_append(submission,hatena_sc_itemtag('b',i,I_ALBUM(item))); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
557 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
558 pdebug(fmt_vastr("a[%d]=%s t[%d]=%s l[%d]=%s i[%d]=%s m[%d]=%s b[%d]=%s", |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
559 i, I_ARTIST(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
560 i, I_TITLE(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
561 i, I_LEN(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
562 i, I_TIME(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
563 i, I_MB(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
564 i, I_ALBUM(item)), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
565 #ifdef ALLOW_MULTIPLE |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
566 i++; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
567 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
568 #endif |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
569 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
570 return i; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
571 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
572 |
350 | 573 static int hatena_sc_submitentry(gchar *entry) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
574 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
575 CURL *curl; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
576 /* struct HttpPost *post = NULL , *last = NULL; */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
577 int status; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
578 GString *submission; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
579 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
580 curl = curl_easy_init(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
581 curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); |
350 | 582 curl_easy_setopt(curl, CURLOPT_URL, hatena_sc_submit_url); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
583 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, |
350 | 584 hatena_sc_store_res); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
585 curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
586 curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
587 /*cfa(&post, &last, "debug", "failed");*/ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
588 |
350 | 589 /*pdebug(fmt_vastr("Username: %s", hatena_sc_username), DEBUG);*/ |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
590 submission = g_string_new("u="); |
350 | 591 g_string_append(submission,(gchar *)hatena_sc_username); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
592 |
350 | 593 /*pdebug(fmt_vastr("Response Hash: %s", hatena_sc_response_hash), DEBUG);*/ |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
594 g_string_append(submission,"&s="); |
350 | 595 g_string_append(submission,(gchar *)hatena_sc_response_hash); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
596 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
597 g_string_append(submission, entry); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
598 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
599 curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char *)submission->str); |
350 | 600 memset(hatena_sc_curl_errbuf, 0, sizeof(hatena_sc_curl_errbuf)); |
601 curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, hatena_sc_curl_errbuf); | |
401
192004e2a1b7
[svn] - add connection timeout option to curl_easy_perform(). hopefully, audacious can quit smoothly even though last.fm server goes down.
yaz
parents:
350
diff
changeset
|
602 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); |
192004e2a1b7
[svn] - add connection timeout option to curl_easy_perform(). hopefully, audacious can quit smoothly even though last.fm server goes down.
yaz
parents:
350
diff
changeset
|
603 curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
604 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
605 /* |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
606 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
607 curl_easy_setopt(curl, CURLOPT_TIMEOUT, SCROBBLER_SB_WAIT); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
608 */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
609 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
610 status = curl_easy_perform(curl); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
611 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
612 curl_easy_cleanup(curl); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
613 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
614 g_string_free(submission,TRUE); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
615 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
616 if (status) { |
350 | 617 pdebug(hatena_sc_curl_errbuf, DEBUG); |
618 hatena_sc_sb_errors++; | |
619 hatena_sc_free_res(); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
620 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
621 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
622 |
350 | 623 if (hatena_sc_parse_sb_res()) { |
624 hatena_sc_sb_errors++; | |
625 hatena_sc_free_res(); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
626 pdebug(fmt_vastr("Retrying in %d secs, %d elements in queue", |
350 | 627 hatena_sc_submit_interval, q_len()), DEBUG); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
628 return -1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
629 } |
350 | 630 hatena_sc_free_res(); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
631 return 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
632 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
633 |
350 | 634 static void hatena_sc_handlequeue(GMutex *mutex) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
635 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
636 GString *submitentry; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
637 int nsubmit; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
638 int wait; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
639 |
350 | 640 if(hatena_sc_submit_timeout < time(NULL) && hatena_sc_bad_users < 3) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
641 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
642 submitentry = g_string_new(""); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
643 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
644 g_mutex_lock(mutex); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
645 |
350 | 646 nsubmit = hatena_sc_generateentry(submitentry); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
647 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
648 g_mutex_unlock(mutex); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
649 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
650 if (nsubmit > 0) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
651 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
652 pdebug(fmt_vastr("Number submitting: %d", nsubmit), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
653 pdebug(fmt_vastr("Submission: %s", submitentry->str), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
654 |
350 | 655 if(!hatena_sc_submitentry(submitentry->str)) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
656 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
657 g_mutex_lock(mutex); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
658 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
659 #ifdef ALLOW_MULTIPLE |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
660 q_free(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
661 #else |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
662 q_get(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
663 #endif |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
664 /* |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
665 * This should make sure that the queue doesn't |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
666 * get submitted multiple times on a nasty |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
667 * segfault... |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
668 */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
669 dump_queue(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
670 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
671 g_mutex_unlock(mutex); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
672 |
350 | 673 hatena_sc_sb_errors = 0; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
674 } |
350 | 675 if(hatena_sc_sb_errors) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
676 { |
350 | 677 if(hatena_sc_sb_errors < 5) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
678 /* Retry after 1 min */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
679 wait = 60; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
680 else |
350 | 681 wait = /* hatena_sc_submit_interval + */ |
682 ( ((hatena_sc_sb_errors - 5) < 7) ? | |
683 (60 << (hatena_sc_sb_errors-5)) : | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
684 7200 ); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
685 |
350 | 686 hatena_sc_submit_timeout = time(NULL) + wait; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
687 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
688 pdebug(fmt_vastr("Error while submitting. " |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
689 "Retrying after %d seconds.", wait), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
690 DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
691 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
692 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
693 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
694 g_string_free(submitentry, TRUE); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
695 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
696 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
697 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
698 static void read_cache(void) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
699 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
700 FILE *fd; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
701 char buf[PATH_MAX], *cache = NULL, *ptr1, *ptr2; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
702 int cachesize, written, i = 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
703 item_t *item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
704 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
705 cachesize = written = 0; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
706 |
732 | 707 snprintf(buf, sizeof(buf), "%s/hatenaqueue.txt", audacious_get_localdir()); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
708 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
709 if (!(fd = fopen(buf, "r"))) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
710 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
711 pdebug(fmt_vastr("Opening %s", buf), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
712 while(!feof(fd)) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
713 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
714 cachesize += CACHE_SIZE; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
715 cache = realloc(cache, cachesize + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
716 written += fread(cache + written, 1, CACHE_SIZE, fd); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
717 cache[written] = '\0'; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
718 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
719 fclose(fd); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
720 ptr1 = cache; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
721 while(ptr1 < cache + written - 1) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
722 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
723 char *artist, *title, *len, *time, *album, *mb; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
724 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
725 pdebug("Pushed:", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
726 ptr2 = strchr(ptr1, ' '); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
727 artist = calloc(1, ptr2 - ptr1 + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
728 strncpy(artist, ptr1, ptr2 - ptr1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
729 ptr1 = ptr2 + 1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
730 ptr2 = strchr(ptr1, ' '); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
731 title = calloc(1, ptr2 - ptr1 + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
732 strncpy(title, ptr1, ptr2 - ptr1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
733 ptr1 = ptr2 + 1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
734 ptr2 = strchr(ptr1, ' '); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
735 len = calloc(1, ptr2 - ptr1 + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
736 strncpy(len, ptr1, ptr2 - ptr1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
737 ptr1 = ptr2 + 1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
738 ptr2 = strchr(ptr1, ' '); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
739 time = calloc(1, ptr2 - ptr1 + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
740 strncpy(time, ptr1, ptr2 - ptr1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
741 ptr1 = ptr2 + 1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
742 ptr2 = strchr(ptr1, ' '); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
743 album = calloc(1, ptr2 - ptr1 + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
744 strncpy(album, ptr1, ptr2 - ptr1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
745 ptr1 = ptr2 + 1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
746 ptr2 = strchr(ptr1, '\n'); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
747 if(ptr2 != NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
748 *ptr2 = '\0'; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
749 mb = calloc(1, strlen(ptr1) + 1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
750 strncpy(mb, ptr1, strlen(ptr1)); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
751 if(ptr2 != NULL) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
752 *ptr2 = '\n'; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
753 /* Why is our save printing out CR/LF? */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
754 ptr1 = ptr2 + 1; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
755 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
756 item = q_put2(artist, title, len, time, album, mb); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
757 pdebug(fmt_vastr("a[%d]=%s t[%d]=%s l[%d]=%s i[%d]=%s m[%d]=%s b[%d]=%s", |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
758 i, I_ARTIST(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
759 i, I_TITLE(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
760 i, I_LEN(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
761 i, I_TIME(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
762 i, I_MB(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
763 i, I_ALBUM(item)), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
764 free(artist); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
765 free(title); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
766 free(len); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
767 free(time); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
768 free(album); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
769 free(mb); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
770 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
771 i++; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
772 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
773 pdebug("Done loading cache.", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
774 free(cache); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
775 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
776 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
777 static void dump_queue(void) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
778 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
779 FILE *fd; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
780 item_t *item; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
781 char *home, buf[PATH_MAX]; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
782 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
783 /*pdebug("Entering dump_queue();", DEBUG);*/ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
784 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
785 if (!(home = getenv("HOME"))) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
786 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
787 pdebug("No HOME directory found. Cannot dump queue.", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
788 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
789 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
790 |
733 | 791 snprintf(buf, sizeof(buf), "%s/hatenaqueue.txt", audacious_get_localdir()); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
792 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
793 if (!(fd = fopen(buf, "w"))) |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
794 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
795 pdebug(fmt_vastr("Failure opening %s", buf), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
796 return; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
797 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
798 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
799 pdebug(fmt_vastr("Opening %s", buf), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
800 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
801 q_peekall(1); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
802 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
803 while ((item = q_peekall(0))) { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
804 fprintf(fd, "%s %s %s %s %s %s\n", |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
805 I_ARTIST(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
806 I_TITLE(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
807 I_LEN(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
808 I_TIME(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
809 I_ALBUM(item), |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
810 I_MB(item)); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
811 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
812 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
813 fclose(fd); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
814 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
815 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
816 /* This was made public */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
817 |
350 | 818 void hatena_sc_cleaner(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
819 { |
350 | 820 if(hatena_sc_submit_url != NULL) |
821 free(hatena_sc_submit_url); | |
822 if(hatena_sc_username != NULL) | |
823 free(hatena_sc_username); | |
824 if(hatena_sc_password != NULL) | |
825 free(hatena_sc_password); | |
826 if(hatena_sc_challenge_hash != NULL) | |
827 free(hatena_sc_challenge_hash); | |
828 if(hatena_sc_srv_res != NULL) | |
829 free(hatena_sc_srv_res); | |
830 if(hatena_sc_major_error != NULL) | |
831 free(hatena_sc_major_error); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
832 dump_queue(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
833 q_free(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
834 pdebug("scrobbler shutting down", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
835 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
836 |
350 | 837 static void hatena_sc_checkhandshake(void) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
838 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
839 int wait; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
840 |
350 | 841 if (!hatena_sc_username || !hatena_sc_password) |
348
314b7ac7f771
[svn] - handle no account data gracefully (e.g. you only use one of the
nenolod
parents:
344
diff
changeset
|
842 return; |
314b7ac7f771
[svn] - handle no account data gracefully (e.g. you only use one of the
nenolod
parents:
344
diff
changeset
|
843 |
350 | 844 if (hatena_sc_hs_status) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
845 return; |
350 | 846 if (hatena_sc_hs_timeout < time(NULL)) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
847 { |
350 | 848 hatena_sc_handshake(); |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
849 |
350 | 850 if(hatena_sc_hs_errors) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
851 { |
350 | 852 if(hatena_sc_hs_errors < 5) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
853 /* Retry after 60 seconds */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
854 wait = 60; |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
855 else |
350 | 856 wait = /* hatena_sc_submit_interval + */ |
857 ( ((hatena_sc_hs_errors - 5) < 7) ? | |
858 (60 << (hatena_sc_hs_errors-5)) : | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
859 7200 ); |
350 | 860 hatena_sc_hs_timeout = time(NULL) + wait; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
861 pdebug(fmt_vastr("Error while handshaking. Retrying " |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
862 "after %d seconds.", wait), DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
863 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
864 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
865 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
866 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
867 /**** Public *****/ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
868 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
869 /* Called at session startup*/ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
870 |
350 | 871 void hatena_sc_init(char *uname, char *pwd) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
872 { |
350 | 873 hatena_sc_hs_status = hatena_sc_hs_timeout = hatena_sc_hs_errors = hatena_sc_submit_timeout = |
874 hatena_sc_srv_res_size = hatena_sc_giveup = hatena_sc_major_error_present = | |
875 hatena_sc_bad_users = hatena_sc_sb_errors = 0; | |
876 hatena_sc_submit_interval = 100; | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
877 |
350 | 878 hatena_sc_submit_url = hatena_sc_username = hatena_sc_password = hatena_sc_srv_res = |
879 hatena_sc_challenge_hash = hatena_sc_major_error = NULL; | |
880 hatena_sc_username = strdup(uname); | |
881 hatena_sc_password = strdup(pwd); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
882 read_cache(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
883 pdebug("scrobbler starting up", DEBUG); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
884 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
885 |
350 | 886 void hatena_sc_addentry(GMutex *mutex, TitleInput *tuple, int len) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
887 { |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
888 g_mutex_lock(mutex); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
889 q_put(tuple, len); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
890 /* |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
891 * This will help make sure the queue will be saved on a nasty |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
892 * segfault... |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
893 */ |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
894 dump_queue(); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
895 g_mutex_unlock(mutex); |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
896 } |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
897 |
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
898 /* Call periodically from the plugin */ |
350 | 899 int hatena_sc_idle(GMutex *mutex) |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
900 { |
350 | 901 hatena_sc_checkhandshake(); |
902 if (hatena_sc_hs_status) | |
903 hatena_sc_handlequeue(mutex); | |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
904 |
350 | 905 return hatena_sc_giveup; |
344
03c1ae10bc8d
[svn] - Merge audacious-scrobbler III, new features include:
nenolod
parents:
diff
changeset
|
906 } |