Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lastfm Scrobbler: Substitute album artist for empty artist.

Browse source 
Change-Id: I66dda13ec2cbb592ebe0d269f0c7eff749bc737a
This commit is contained in:
James D. Smith 2022-03-29 12:39:29 -06:00 committed by William Wilgus
parent 412dbaeffe
commit 6e3937e836
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/plugins/lastfm_scrobbler.c
View file

@ -49,7 +49,7 @@ http://www.audioscrobbler.net/wiki/Portable_Player_Logging
/* longest entry I've had is 323, add a safety margin */ /* longest entry I've had is 323, add a safety margin */
#define SCROBBLER_CACHE_LEN 512 #define SCROBBLER_CACHE_LEN 512
#define ITEM_HDR "#ARTIST #ALBUM #TITLE #TRACKNUM #LENGTH #RATING #TIMESTAMMP #MUSICBRAINZ_TRACKID\n" #define ITEM_HDR "#ARTIST #ALBUM #TITLE #TRACKNUM #LENGTH #RATING #TIMESTAMP #MUSICBRAINZ_TRACKID\n"
#if CONFIG_RTC #if CONFIG_RTC
static time_t timestamp; static time_t timestamp;
@ -338,14 +338,14 @@ static void scrobbler_add_to_cache(const struct mp3entry *id)
int ret = rb->snprintf(&scrobbler_buf[(SCROBBLER_CACHE_LEN*gCache.pos)], int ret = rb->snprintf(&scrobbler_buf[(SCROBBLER_CACHE_LEN*gCache.pos)],
SCROBBLER_CACHE_LEN, SCROBBLER_CACHE_LEN,
"%s\t%s\t%s\t%s\t%d\t%c\t%ld\t%s\n", "%s\t%s\t%s\t%s\t%d\t%c\t%ld\t%s\n",
id->artist, id->artist ? id->artist : id->albumartist,
id->album ?: "", id->album,
id->title, id->title,
tracknum, tracknum,
(int)(id->length / 1000), (int)(id->length / 1000),
rating, rating,
get_timestamp(), get_timestamp(),
id->mb_track_id ?id->mb_track_id: ""); id->mb_track_id);
if ( ret >= SCROBBLER_CACHE_LEN ) if ( ret >= SCROBBLER_CACHE_LEN )
{ {
@ -389,7 +389,8 @@ static void scrobbler_change_event(unsigned short id, void *ev_data)
/* check if track was resumed > %50 played ( likely got saved ) /* check if track was resumed > %50 played ( likely got saved )
check for blank artist or track name */ check for blank artist or track name */
if ((id3->elapsed > id3->length / 2) || !id3->artist || !id3->title) if ((id3->elapsed > id3->length / 2)
|| (!id3->artist && !id3->albumartist) || !id3->title)
{ {
gCache.pending = false; gCache.pending = false;
logf("SCROBBLER: skipping file %s", id3->path); logf("SCROBBLER: skipping file %s", id3->path);