X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=429ad2b53a116ffc1da2d4710b51e6db39161324;hp=9153bf1f849246379e68b4605c749474fce2c656;hb=15151d60026dfe17cfaad02284d0abbb8b9389b2;hpb=f6f50d03a09d6bc423324206d274336e9905bbb4 diff --git a/playlist.c b/playlist.c index 9153bf1f..429ad2b5 100644 --- a/playlist.c +++ b/playlist.c @@ -1,5 +1,6 @@ #include "para.h" #include "error.h" +#include "afh.h" #include "afs.h" #include "string.h" @@ -12,7 +13,7 @@ struct playlist_info { /** The number of entries currently in the playlist. */ unsigned length; }; -static struct playlist_info playlist; +static struct playlist_info current_playlist; /** * Re-insert an audio file into the tree of admissible files. @@ -27,71 +28,72 @@ int playlist_update_audio_file(struct osl_row *aft_row) return score_update(aft_row, 0); } -static int add_playlist_entry(char *line, void *private_data) +static int add_playlist_entry(char *path, void *data) { + struct playlist_info *playlist = data; struct osl_row *aft_row; - struct playlist_info *pli = private_data; - int ret = aft_get_row_of_path(line, &aft_row); + int ret = aft_get_row_of_path(path, &aft_row); if (ret < 0) { - PARA_NOTICE_LOG("path not found in audio file table: %s\n", - line); + PARA_NOTICE_LOG("%s: %s\n", path, PARA_STRERROR(-ret)); return 1; } - ret = score_add(aft_row, -pli->length); + ret = score_add(aft_row, -playlist->length); if (ret < 0) { - PARA_ERROR_LOG("failed to add %s: %d\n", line, ret); + PARA_ERROR_LOG("failed to add %s: %d\n", path, ret); return ret; } - pli->length++; + playlist->length++; return 1; } -static int load_playlist(struct osl_row *row) +static int get_playlist_data(struct osl_row *row, char **playlist_name, + struct osl_object *playlist_def) { struct osl_object obj; - int ret; - - ret = osl_get_object(playlists_table, row, BLOBCOL_NAME, &obj); + int ret = osl_get_object(playlists_table, row, BLOBCOL_NAME, &obj); if (ret < 0) return ret; - playlist.name = para_strdup(obj.data); - playlist.length = 0; - ret = osl_open_disk_object(playlists_table, row, BLOBCOL_DEF, &obj); + *playlist_name = obj.data; + return osl_open_disk_object(playlists_table, row, BLOBCOL_DEF, + playlist_def); +} + +/* returns -E_PLAYLIST_LOADED on _success_ to terminate the loop */ +static int load_playlist(struct osl_row *row, void *data) +{ + struct playlist_info *playlist = data; + struct osl_object playlist_def; + char *playlist_name; + int ret; + + ret = get_playlist_data(row, &playlist_name, &playlist_def); if (ret < 0) goto err; - ret = for_each_line_ro(obj.data, obj.size, add_playlist_entry, - &playlist); - osl_close_disk_object(&obj); + playlist->length = 0; + ret = for_each_line_ro(playlist_def.data, playlist_def.size, + add_playlist_entry, playlist); + osl_close_disk_object(&playlist_def); if (ret < 0) goto err; ret = -E_PLAYLIST_EMPTY; - if (!playlist.length) + if (!playlist->length) goto err; - PARA_NOTICE_LOG("loaded playlist %s (%u files)\n", playlist.name, - playlist.length); - return 1; -err: - free(playlist.name); - return ret; -} - -/* returns -E_PLAYLIST_LOADED on _success_ to terminate the loop */ -static int playlist_loop(struct osl_row *row, __a_unused void *private_data) -{ - int ret = load_playlist(row); - if (ret < 0) { - if (ret != -E_DUMMY_ROW) - PARA_NOTICE_LOG("unable to load playlist, trying next\n"); - return 1; - } + playlist->name = para_strdup(playlist_name); + PARA_NOTICE_LOG("loaded playlist %s (%u files)\n", playlist->name, + playlist->length); return -E_PLAYLIST_LOADED; +err: + if (ret != -E_DUMMY_ROW) + PARA_NOTICE_LOG("unable to load playlist (%s)\n", + PARA_STRERROR(-ret)); + return 1; } -static int load_first_available_playlist(void) +static int load_first_available_playlist(struct playlist_info *playlist) { - int ret = osl_rbtree_loop(playlists_table, BLOBCOL_NAME, NULL, - playlist_loop); + int ret = osl_rbtree_loop(playlists_table, BLOBCOL_NAME, playlist, + load_playlist); if (ret == -E_PLAYLIST_LOADED) /* success */ return 1; if (ret < 0) @@ -100,6 +102,51 @@ static int load_first_available_playlist(void) return -E_NO_PLAYLIST; } +static int check_playlist_path(char *path, void *data) +{ + struct para_buffer *pb = data; + struct osl_row *aft_row; + int ret = aft_get_row_of_path(path, &aft_row); + + if (ret < 0) + para_printf(pb, "%s: %s\n", path, PARA_STRERROR(-ret)); + return 1; +} + +static int check_playlist(struct osl_row *row, void *data) +{ + struct para_buffer *pb = data; + struct osl_object playlist_def; + char *playlist_name; + int ret = get_playlist_data(row, &playlist_name, &playlist_def); + + if (ret < 0) { + para_printf(pb, "failed to get playlist data: %s\n", + PARA_STRERROR(-ret)); + return 1; + } + if (*playlist_name) { /* skip dummy row */ + para_printf(pb, "checking playlist %s...\n", playlist_name); + for_each_line_ro(playlist_def.data, playlist_def.size, + check_playlist_path, pb); + } + osl_close_disk_object(&playlist_def); + return 1; +} + +int playlist_check_callback(__a_unused const struct osl_object *query, + struct osl_object *result) +{ + struct para_buffer pb = {.buf = NULL}; + + para_printf(&pb, "checking playlists...\n"); + osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb, + check_playlist); + result->data = pb.buf; + result->size = pb.size; + return 1; +} + /** * Close the current playlist. * @@ -107,8 +154,8 @@ static int load_first_available_playlist(void) */ void playlist_close(void) { - free(playlist.name); - playlist.name = NULL; + free(current_playlist.name); + current_playlist.name = NULL; } /** @@ -130,7 +177,7 @@ int playlist_open(char *name) struct osl_row *row; if (!name) - return load_first_available_playlist(); + return load_first_available_playlist(¤t_playlist); obj.data = name; obj.size = strlen(obj.data); ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row); @@ -138,5 +185,5 @@ int playlist_open(char *name) PARA_NOTICE_LOG("failed to load playlist %s\n", name); return ret; } - return load_playlist(row); + return load_playlist(row, ¤t_playlist); }