core/playlists/system: Cleanup system playlist updating
Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
8af9148606
commit
2a8288e1b3
|
@ -50,41 +50,6 @@ bool playlist_generic_remove_track(struct playlist *playlist, struct track *trac
|
||||||
return queue_remove_all(&playlist->pl_queue, track);
|
return queue_remove_all(&playlist->pl_queue, track);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct pl_update_data {
|
|
||||||
struct playlist *pud_playlist;
|
|
||||||
bool (*pud_func)(struct playlist *, struct track *);
|
|
||||||
};
|
|
||||||
|
|
||||||
static bool __playlist_generic_update(void *data)
|
|
||||||
{
|
|
||||||
struct pl_update_data *pud = data;
|
|
||||||
struct db_entry *dbe, *next;
|
|
||||||
|
|
||||||
db_for_each(dbe, next, track_db_get()) {
|
|
||||||
if (!pud->pud_func(pud->pud_playlist, TRACK(dbe)))
|
|
||||||
playlist_generic_remove_track(pud->pud_playlist, TRACK(dbe));
|
|
||||||
}
|
|
||||||
|
|
||||||
queue_resort(&pud->pud_playlist->pl_queue);
|
|
||||||
g_free(pud);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void playlist_generic_update(struct playlist *playlist,
|
|
||||||
bool (*func)(struct playlist *, struct track *))
|
|
||||||
{
|
|
||||||
struct pl_update_data *data;
|
|
||||||
|
|
||||||
if (!func)
|
|
||||||
return;
|
|
||||||
|
|
||||||
data = g_malloc(sizeof(struct pl_update_data));
|
|
||||||
data->pud_playlist = playlist;
|
|
||||||
data->pud_func = func;
|
|
||||||
|
|
||||||
idle_schedule(IDLE_SYNC, __playlist_generic_update, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void playlist_generic_set_flag(struct playlist *playlist,
|
void playlist_generic_set_flag(struct playlist *playlist,
|
||||||
enum queue_flags flag, bool enabled)
|
enum queue_flags flag, bool enabled)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
static struct playlist *pl_system_lookup(const gchar *);
|
static struct playlist *pl_system_lookup(const gchar *);
|
||||||
static struct playlist *pl_system_get(unsigned int);
|
static struct playlist *pl_system_get(unsigned int);
|
||||||
static void pl_system_update(const gchar *);
|
|
||||||
static void pl_system_save();
|
static void pl_system_save();
|
||||||
|
|
||||||
static struct file sys_file = FILE_INIT("playlist.db", 0);
|
static struct file sys_file = FILE_INIT("playlist.db", 0);
|
||||||
|
@ -26,14 +25,51 @@ static bool sys_pl_delete_clear(struct playlist *playlist)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool sys_pl_generic_add_front(struct playlist *playlist,
|
static bool sys_pl_update_check(struct playlist *playlist, struct track *track)
|
||||||
struct track *track)
|
|
||||||
{
|
{
|
||||||
if (queue_has(&pl_system_get(SYS_PL_HIDDEN)->pl_queue, track))
|
switch (playlist->pl_id) {
|
||||||
return false;
|
case SYS_PL_UNPLAYED:
|
||||||
return playlist_generic_add_track_front(playlist, track);
|
return track->tr_count == 0;
|
||||||
|
case SYS_PL_LEAST_PLAYED:
|
||||||
|
return track->tr_count <= track_db_average_plays() &&
|
||||||
|
track->tr_count > 0;
|
||||||
|
case SYS_PL_MOST_PLAYED:
|
||||||
|
return track->tr_count > track_db_average_plays();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool sys_pl_update_func(void *data)
|
||||||
|
{
|
||||||
|
struct playlist *playlist = (struct playlist *)data;
|
||||||
|
struct db_entry *dbe, *next;
|
||||||
|
|
||||||
|
db_for_each(dbe, next, track_db_get()) {
|
||||||
|
struct track *track = TRACK(dbe);
|
||||||
|
|
||||||
|
if (sys_pl_update_check(playlist, track) &&
|
||||||
|
!queue_has(&pl_system_get(SYS_PL_HIDDEN)->pl_queue, track))
|
||||||
|
playlist_generic_add_track_front(playlist, track);
|
||||||
|
else
|
||||||
|
playlist_generic_remove_track(playlist, track);
|
||||||
|
}
|
||||||
|
|
||||||
|
queue_resort(&playlist->pl_queue);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void sys_pl_update(struct playlist *playlist)
|
||||||
|
{
|
||||||
|
switch (playlist->pl_id) {
|
||||||
|
case SYS_PL_COLLECTION:
|
||||||
|
case SYS_PL_UNPLAYED:
|
||||||
|
case SYS_PL_LEAST_PLAYED:
|
||||||
|
case SYS_PL_MOST_PLAYED:
|
||||||
|
idle_schedule(IDLE_SYNC, sys_pl_update_func, playlist);
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -178,12 +214,6 @@ static bool sys_pl_collection_load()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool sys_pl_collection_update(struct playlist *playlist,
|
|
||||||
struct track *track)
|
|
||||||
{
|
|
||||||
return sys_pl_generic_add_front(playlist, track) || true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct playlist_ops collection_ops = {
|
static struct playlist_ops collection_ops = {
|
||||||
.pl_can_select = playlist_generic_can_select,
|
.pl_can_select = playlist_generic_can_select,
|
||||||
.pl_next = playlist_generic_next,
|
.pl_next = playlist_generic_next,
|
||||||
|
@ -195,7 +225,6 @@ static struct playlist_ops collection_ops = {
|
||||||
static struct sys_playlist sys_collection = {
|
static struct sys_playlist sys_collection = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Collection",
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Collection",
|
||||||
SYS_PL_COLLECTION, &collection_ops),
|
SYS_PL_COLLECTION, &collection_ops),
|
||||||
.spl_update = sys_pl_collection_update,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -223,14 +252,6 @@ static struct sys_playlist sys_history = {
|
||||||
/*
|
/*
|
||||||
* Unplayed tracks playlist operations.
|
* Unplayed tracks playlist operations.
|
||||||
*/
|
*/
|
||||||
static bool sys_pl_unplayed_update(struct playlist *playlist,
|
|
||||||
struct track *track)
|
|
||||||
{
|
|
||||||
if (track->tr_count > 0)
|
|
||||||
return false;
|
|
||||||
return sys_pl_generic_add_front(playlist, track) || true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct playlist_ops unplayed_ops = {
|
static struct playlist_ops unplayed_ops = {
|
||||||
.pl_can_select = playlist_generic_can_select,
|
.pl_can_select = playlist_generic_can_select,
|
||||||
.pl_next = playlist_generic_next,
|
.pl_next = playlist_generic_next,
|
||||||
|
@ -241,22 +262,12 @@ static struct playlist_ops unplayed_ops = {
|
||||||
static struct sys_playlist sys_unplayed = {
|
static struct sys_playlist sys_unplayed = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Unplayed",
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Unplayed",
|
||||||
SYS_PL_UNPLAYED, &unplayed_ops),
|
SYS_PL_UNPLAYED, &unplayed_ops),
|
||||||
.spl_update = sys_pl_unplayed_update,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Most played tracks playlist operations.
|
* Most played tracks playlist operations.
|
||||||
*/
|
*/
|
||||||
static bool sys_pl_most_played_update(struct playlist *playlist,
|
|
||||||
struct track *track)
|
|
||||||
{
|
|
||||||
unsigned int average = track_db_average_plays();
|
|
||||||
if (track->tr_count <= average)
|
|
||||||
return false;
|
|
||||||
return sys_pl_generic_add_front(playlist, track) || true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct playlist_ops most_played_ops = {
|
static struct playlist_ops most_played_ops = {
|
||||||
.pl_can_select = playlist_generic_can_select,
|
.pl_can_select = playlist_generic_can_select,
|
||||||
.pl_next = playlist_generic_next,
|
.pl_next = playlist_generic_next,
|
||||||
|
@ -267,22 +278,12 @@ static struct playlist_ops most_played_ops = {
|
||||||
static struct sys_playlist sys_most_played = {
|
static struct sys_playlist sys_most_played = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Most Played",
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Most Played",
|
||||||
SYS_PL_MOST_PLAYED, &most_played_ops),
|
SYS_PL_MOST_PLAYED, &most_played_ops),
|
||||||
.spl_update = sys_pl_most_played_update,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Least played tracks playlist operations.
|
* Least played tracks playlist operations.
|
||||||
*/
|
*/
|
||||||
static bool sys_pl_least_played_update(struct playlist *playlist,
|
|
||||||
struct track *track)
|
|
||||||
{
|
|
||||||
unsigned int average = track_db_average_plays();
|
|
||||||
if (!track->tr_count || track->tr_count > average)
|
|
||||||
return false;
|
|
||||||
return sys_pl_generic_add_front(playlist, track) || true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct playlist_ops least_played_ops = {
|
static struct playlist_ops least_played_ops = {
|
||||||
.pl_can_select = playlist_generic_can_select,
|
.pl_can_select = playlist_generic_can_select,
|
||||||
.pl_next = playlist_generic_next,
|
.pl_next = playlist_generic_next,
|
||||||
|
@ -293,7 +294,6 @@ static struct playlist_ops least_played_ops = {
|
||||||
static struct sys_playlist sys_least_played = {
|
static struct sys_playlist sys_least_played = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Least Played",
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Least Played",
|
||||||
SYS_PL_LEAST_PLAYED, &least_played_ops),
|
SYS_PL_LEAST_PLAYED, &least_played_ops),
|
||||||
.spl_update = sys_pl_least_played_update,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -434,16 +434,9 @@ static void pl_system_played(struct track *track)
|
||||||
for (i = 0; i < SYS_PL_NUM_PLAYLISTS; i++)
|
for (i = 0; i < SYS_PL_NUM_PLAYLISTS; i++)
|
||||||
queue_updated(&pl_system_get(i)->pl_queue, track);
|
queue_updated(&pl_system_get(i)->pl_queue, track);
|
||||||
|
|
||||||
pl_system_update("Unplayed");
|
sys_pl_update(pl_system_lookup("Unplayed"));
|
||||||
pl_system_update("Most Played");
|
sys_pl_update(pl_system_lookup("Most Played"));
|
||||||
pl_system_update("Least Played");
|
sys_pl_update(pl_system_lookup("Least Played"));
|
||||||
}
|
|
||||||
|
|
||||||
static void pl_system_update(const gchar *name)
|
|
||||||
{
|
|
||||||
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
|
||||||
if (sys_pl)
|
|
||||||
playlist_generic_update(&sys_pl->spl_playlist, sys_pl->spl_update);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -474,7 +467,7 @@ void pl_system_init(struct queue_ops *ops)
|
||||||
case SYS_PL_UNPLAYED:
|
case SYS_PL_UNPLAYED:
|
||||||
case SYS_PL_MOST_PLAYED:
|
case SYS_PL_MOST_PLAYED:
|
||||||
case SYS_PL_LEAST_PLAYED:
|
case SYS_PL_LEAST_PLAYED:
|
||||||
pl_system_update(playlist->pl_name);
|
sys_pl_update(playlist);
|
||||||
case SYS_PL_FAVORITES:
|
case SYS_PL_FAVORITES:
|
||||||
case SYS_PL_HIDDEN:
|
case SYS_PL_HIDDEN:
|
||||||
playlist_generic_init(playlist, 0, ops);
|
playlist_generic_init(playlist, 0, ops);
|
||||||
|
|
|
@ -20,8 +20,6 @@ enum sys_playlist_t {
|
||||||
|
|
||||||
struct sys_playlist {
|
struct sys_playlist {
|
||||||
struct playlist spl_playlist;
|
struct playlist spl_playlist;
|
||||||
|
|
||||||
bool (*spl_update)(struct playlist *, struct track *);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -95,10 +95,6 @@ bool playlist_generic_add_track_front(struct playlist *, struct track *);
|
||||||
/* Generic playlist remove track operation. */
|
/* Generic playlist remove track operation. */
|
||||||
bool playlist_generic_remove_track(struct playlist *, struct track *);
|
bool playlist_generic_remove_track(struct playlist *, struct track *);
|
||||||
|
|
||||||
/* Generic playlist update operation. */
|
|
||||||
void playlist_generic_update(struct playlist *,
|
|
||||||
bool (*)(struct playlist *, struct track *));
|
|
||||||
|
|
||||||
/* Generic playlist set_flag operation. */
|
/* Generic playlist set_flag operation. */
|
||||||
void playlist_generic_set_flag(struct playlist *, enum queue_flags, bool);
|
void playlist_generic_set_flag(struct playlist *, enum queue_flags, bool);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue