diff options
| -rw-r--r-- | libpiano/src/main.c | 66 | ||||
| -rw-r--r-- | libpiano/src/piano.h | 2 | ||||
| -rw-r--r-- | src/main.c | 16 |
3 files changed, 74 insertions, 10 deletions
diff --git a/libpiano/src/main.c b/libpiano/src/main.c index aaaacf9..21b32f7 100644 --- a/libpiano/src/main.c +++ b/libpiano/src/main.c @@ -33,6 +33,10 @@ THE SOFTWARE. #include "crypt.h" #include "config.h" +/* prototypes */ +PianoReturn_t PianoAddFeedback (PianoHandle_t *, char *, char *, char *, + char *, char *, PianoSongRating_t); + /* more "secure" free version; only use this function, not original free () * in this library * @public no!!! @@ -270,6 +274,50 @@ PianoReturn_t PianoGetPlaylist (PianoHandle_t *ph, char *stationId) { */ PianoReturn_t PianoRateTrack (PianoHandle_t *ph, PianoStation_t *station, PianoSong_t *song, PianoSongRating_t rating) { + PianoReturn_t ret; + + ret = PianoAddFeedback (ph, station->id, song->musicId, + song->matchingSeed, song->userSeed, song->focusTraitId, rating); + + if (ret == PIANO_RET_OK) { + song->rating = rating; + } + + return ret; +} + +/* move song to another station + * @param piano handle + * @param move from + * @param move here + * @param song to move + */ +PianoReturn_t PianoMoveSong (PianoHandle_t *ph, PianoStation_t *stationFrom, + PianoStation_t *stationTo, PianoSong_t *song) { + PianoReturn_t ret; + + /* ban from current station */ + if ((ret = PianoAddFeedback (ph, stationFrom->id, song->musicId, "", "", + "", PIANO_RATE_BAN)) == PIANO_RET_OK) { + /* love at new station */ + return PianoAddFeedback (ph, stationTo->id, song->musicId, "", + "", "", PIANO_RATE_LOVE); + } + return ret; +} + +/* add feedback + * @param piano handle + * @param station id + * @param song id + * @param song matching seed or NULL + * @param song user seed or NULL + * @param song focus trait id or NULL + * @param rating + */ +PianoReturn_t PianoAddFeedback (PianoHandle_t *ph, char *stationId, + char *songMusicId, char *songMatchingSeed, char *songUserSeed, + char *songFocusTraitId, PianoSongRating_t rating) { char xmlSendBuf[10000], url[PIANO_URL_BUFFER_SIZE]; char *requestStr, *retStr; PianoReturn_t ret = PIANO_RET_ERR; @@ -286,25 +334,23 @@ PianoReturn_t PianoRateTrack (PianoHandle_t *ph, PianoStation_t *station, "<param><value><boolean>%i</boolean></value></param>" "<param><value><boolean>0</boolean></value></param>" "</params></methodCall>", time (NULL), ph->user.authToken, - station->id, song->musicId, song->matchingSeed, song->userSeed, - /* sometimes focusTraitId is not set, dunno why yet */ - (song->focusTraitId == NULL) ? "" : song->focusTraitId, + stationId, songMusicId, + (songMatchingSeed == NULL) ? "" : songMatchingSeed, + (songUserSeed == NULL) ? "" : songUserSeed, + (songFocusTraitId == NULL) ? "" : songFocusTraitId, (rating == PIANO_RATE_LOVE) ? 1 : 0); requestStr = PianoEncryptString (xmlSendBuf); snprintf (url, sizeof (url), PIANO_RPC_URL "rid=%s&lid=%s&method=addFeedback&arg1=%s&arg2=%s" "&arg3=%s&arg4=%s&arg5=%s&arg6=%s&arg7=false", ph->routeId, - ph->user.listenerId, station->id, song->musicId, - song->matchingSeed, song->userSeed, - (song->focusTraitId == NULL) ? "" : song->focusTraitId, + ph->user.listenerId, stationId, songMusicId, + (songMatchingSeed == NULL) ? "" : songMatchingSeed, + (songUserSeed == NULL) ? "" : songUserSeed, + (songFocusTraitId == NULL) ? "" : songFocusTraitId, (rating == PIANO_RATE_LOVE) ? "true" : "false"); PianoHttpPost (ph->curlHandle, url, requestStr, &retStr); ret = PianoXmlParseSimple (retStr); - if (ret == PIANO_RET_OK) { - song->rating = rating; - } - PianoFree (requestStr, 0); PianoFree (retStr, 0); diff --git a/libpiano/src/piano.h b/libpiano/src/piano.h index f134162..54c54dd 100644 --- a/libpiano/src/piano.h +++ b/libpiano/src/piano.h @@ -156,6 +156,8 @@ PianoReturn_t PianoGetPlaylist (PianoHandle_t *ph, char *stationId); PianoReturn_t PianoRateTrack (PianoHandle_t *ph, PianoStation_t *station, PianoSong_t *song, PianoSongRating_t rating); +PianoReturn_t PianoMoveSong (PianoHandle_t *ph, PianoStation_t *stationFrom, + PianoStation_t *stationTo, PianoSong_t *song); PianoReturn_t PianoRenameStation (PianoHandle_t *ph, PianoStation_t *station, char *newName); PianoReturn_t PianoDeleteStation (PianoHandle_t *ph, PianoStation_t *station); @@ -320,6 +320,7 @@ int main (int argc, char **argv) { struct pollfd polls = {fileno (stdin), POLLIN, POLLIN}; char buf, yesnoBuf; char *lineBuf, *musicId; + PianoStation_t *moveStation; if (poll (&polls, 1, 1000) > 0) { read (fileno (stdin), &buf, sizeof (buf)); @@ -417,6 +418,21 @@ int main (int argc, char **argv) { case 'n': player.doQuit = 1; break; + + case 'm': + moveStation = BarUiSelectStation (&ph); + if (moveStation != NULL) { + printf ("Moving song to \"%s\"...", moveStation->name); + fflush (stdout); + if (PianoMoveSong (&ph, curStation, moveStation, + curSong) == PIANO_RET_OK) { + printf ("Ok.\n"); + player.doQuit = 1; + } else { + printf ("Error.\n"); + } + } + break; case 'p': player.doPause = !player.doPause; |