anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/playlists/system: Move the least played playlist into system.c 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-04-27 08:48:25 -04:00 committed by Anna Schumaker
parent 9d3cc2e5ab
commit 2ff7113668
5 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/collection.c
View File

@ -112,6 +112,7 @@ static bool __validate_library(void *data)
queue_remove_all(&c_queue, track);
playlist_remove(PL_UNPLAYED, track);
playlist_remove(PL_MOST_PLAYED, track);
playlist_remove(PL_LEAST_PLAYED, track);
track_remove(track);
}
}

27
core/playlists/system.c
View File

@ -20,6 +20,8 @@ static enum sys_playlist_t __sys_pl_convert(const gchar *name)
return SYS_PL_UNPLAYED;
else if (string_match(name, "Most Played"))
return SYS_PL_MOST_PLAYED;
else if (string_match(name, "Least Played"))
return SYS_PL_LEAST_PLAYED;
return SYS_PL_NUM_PLAYLISTS;
}
@ -64,9 +66,10 @@ static bool __sys_pl_can_add(enum sys_playlist_t plist, struct track *track,
{
if (track->tr_count == 0)
return plist == SYS_PL_UNPLAYED;
else if (track->tr_count > average)
return plist == SYS_PL_MOST_PLAYED;
return false;
else if (track->tr_count <= average)
return plist == SYS_PL_LEAST_PLAYED;
/* track->tr_count > average */
return plist == SYS_PL_MOST_PLAYED;
}
static bool __sys_pl_add(enum sys_playlist_t plist, struct track *track,
@ -85,13 +88,19 @@ static bool __sys_pl_add(enum sys_playlist_t plist, struct track *track,
switch (plist) {
case SYS_PL_HIDDEN:
__sys_pl_remove(SYS_PL_UNPLAYED, track);
__sys_pl_remove(SYS_PL_MOST_PLAYED, track);
__sys_pl_remove(SYS_PL_UNPLAYED, track);
__sys_pl_remove(SYS_PL_MOST_PLAYED, track);
__sys_pl_remove(SYS_PL_LEAST_PLAYED, track);
case SYS_PL_FAVORITES:
__sys_pl_save();
break;
case SYS_PL_MOST_PLAYED:
__sys_pl_remove(SYS_PL_UNPLAYED, track);
__sys_pl_remove(SYS_PL_UNPLAYED, track);
__sys_pl_remove(SYS_PL_LEAST_PLAYED, track);
break;
case SYS_PL_LEAST_PLAYED:
__sys_pl_remove(SYS_PL_UNPLAYED, track);
__sys_pl_remove(SYS_PL_MOST_PLAYED, track);
default:
break;
}
@ -105,8 +114,9 @@ static bool __sys_pl_remove(enum sys_playlist_t plist, struct track *track)
switch (plist) {
case SYS_PL_HIDDEN:
__sys_pl_add(SYS_PL_UNPLAYED, track, track_db_average_plays());
__sys_pl_add(SYS_PL_MOST_PLAYED, track, track_db_average_plays());
__sys_pl_add(SYS_PL_UNPLAYED, track, track_db_average_plays());
__sys_pl_add(SYS_PL_MOST_PLAYED, track, track_db_average_plays());
__sys_pl_add(SYS_PL_LEAST_PLAYED, track, track_db_average_plays());
case SYS_PL_FAVORITES:
__sys_pl_save();
default:
@ -189,6 +199,7 @@ void pl_system_init(struct queue_ops *ops)
idle_schedule(IDLE_SYNC, __sys_pl_load, NULL);
pl_system_update("Unplayed");
pl_system_update("Most Played");
pl_system_update("Least Played");
}
void pl_system_deinit()

1
include/core/playlists/system.h
View File

@ -11,6 +11,7 @@ enum sys_playlist_t {
SYS_PL_HIDDEN, /* Songs that the user has hidden. */
SYS_PL_UNPLAYED, /* Songs that have not been played yet. */
SYS_PL_MOST_PLAYED, /* Songs with an above average play count. */
SYS_PL_LEAST_PLAYED, /* Songs with a below average play count. */
SYS_PL_NUM_PLAYLISTS, /* Number of system playlists. */
};

8
tests/core/playlist.c
View File

@ -118,7 +118,7 @@ static void test_dynamic()
{
struct db_entry *dbe, *next;
unsigned int i, average = 0;
struct track *track;
//struct track *track;
struct queue *q;
/* Set play count to (track_number - 1) (average = 6) */
@ -141,17 +141,19 @@ static void test_dynamic()
test_equal(queue_at(q, 0)->tr_count, 0);
/* Six tracks have tr_count <= average && tr_count > 0 */
playlist_update(PL_LEAST_PLAYED);
while (idle_run_task()) {}
q = playlist_get_queue(PL_LEAST_PLAYED);
playlist_select(PL_LEAST_PLAYED);
test_equal(playlist_add(PL_LEAST_PLAYED, track_get(0)), (bool)false);
test_equal(queue_size(q), 6);
for (i = 0; i < queue_size(q); i++) {
/*for (i = 0; i < queue_size(q); i++) {
track = queue_at(q, i);
test_loop_equal(track->tr_track, i + 2, i);
test_loop_equal(track->tr_count, i + 1, i);
test_loop_equal(playlist_remove(PL_LEAST_PLAYED, track),
(bool)false, i);
} test_loop_passed();
} test_loop_passed();*/
/* Six tracks have tr_count > average */
playlist_update(PL_MOST_PLAYED);

41
tests/core/playlists/system.c
View File

@ -147,8 +147,8 @@ static void test_most_played()
pl_system_deinit();
pl_system_init(NULL);
test_not_equal((void *)most, NULL);
test_equal(queue_has_flag(most, Q_ADD_FRONT), (bool)true);
test_not_equal((void *)most, NULL);
test_equal(queue_has_flag(most, Q_ADD_FRONT), (bool)true);
__test_playlist_reinit(most, 1, false, true);
@ -170,6 +170,42 @@ static void test_most_played()
__test_playlist_reinit(most, 0, false, false);
__test_playlist_update("Most Played", most, 0, false, false);
__test_playlist_unhide_track("Most Played", most, 1, true, false);
}
static void test_least_played()
{
struct queue *least = pl_system.pl_get_queue("Least Played");
/* Reset playcounts so track 1 is "least played" */
track_get(0)->tr_count = 3;
track_get(1)->tr_count = 1;
pl_system_deinit();
pl_system_init(NULL);
test_not_equal((void *)least, NULL);
test_equal(queue_has_flag(least, Q_ADD_FRONT), (bool)true);
__test_playlist_reinit(least, 1, false, true);
test_equal(pl_system.pl_remove_track("Least Played", track_get(0)), (bool)false);
test_equal(pl_system.pl_remove_track("Least Played", track_get(1)), (bool)true);
test_equal(pl_system.pl_remove_track("Least Played", track_get(1)), (bool)false);
__test_playlist_state(least, 0, false, false);
test_equal(pl_system.pl_add_track("Least Played", track_get(0)), (bool)false);
test_equal(pl_system.pl_add_track("Least Played", track_get(1)), (bool)true);
test_equal(pl_system.pl_add_track("Least Played", track_get(1)), (bool)false);
__test_playlist_state(least, 1, false, true);
track_get(0)->tr_count = 1;
track_get(1)->tr_count = 3;
__test_playlist_update("Least Played", least, 1, true, false);
__test_playlist_hide_track("Least Played", least, 0, false, false);
__test_playlist_reinit(least, 0, false, false);
__test_playlist_update("Least Played", least, 0, false, false);
__test_playlist_unhide_track("Least Played", least, 1, true, false);
pl_system_deinit();
}
@ -180,4 +216,5 @@ DECLARE_UNIT_TESTS(
UNIT_TEST("Hidden Playlist", test_hidden),
UNIT_TEST("Unplayed Tracks Playlist", test_unplayed),
UNIT_TEST("Most Played Tracks Playlist", test_most_played),
UNIT_TEST("Least Played Tracks Playlist", test_least_played),
);