X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=playlist.c;h=d02ade3ba911a186f0f7e5a57f419ce9074092d0;hb=0b5c29fae8853bac16b91503df70b0e101dccca4;hp=806e49d55f68502fb38daffc33620cb075bbd1b3;hpb=a5ad3d4c598bafe28e90e5b623e0a754d6e973d5;p=paraslash.git diff --git a/playlist.c b/playlist.c index 806e49d5..d02ade3b 100644 --- a/playlist.c +++ b/playlist.c @@ -1,11 +1,8 @@ -/* - * Copyright (C) 2007-2011 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2007 Andre Noll , see file COPYING. */ #include #include +#include #include "para.h" #include "error.h" @@ -13,17 +10,18 @@ #include "afh.h" #include "afs.h" #include "ipc.h" +#include "sideband.h" /** \file playlist.c Functions for loading and saving playlists. */ /** Structure used for adding entries to a playlist. */ -struct playlist_info { +struct playlist_instance { /** The name of the playlist. */ char *name; /** The number of entries currently in the playlist. */ unsigned length; }; -static struct playlist_info current_playlist; +static struct playlist_instance current_playlist; /** * Re-insert an audio file into the tree of admissible files. @@ -40,7 +38,7 @@ static int playlist_update_audio_file(const struct osl_row *aft_row) static int add_playlist_entry(char *path, void *data) { - struct playlist_info *playlist = data; + struct playlist_instance *playlist = data; struct osl_row *aft_row; int ret = aft_get_row_of_path(path, &aft_row); @@ -57,134 +55,108 @@ static int add_playlist_entry(char *path, void *data) return 1; } -/* 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 = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def); - if (ret < 0) - goto err; - 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) - goto err; - 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 check_playlist_path(char *path, void *data) { - struct para_buffer *pb = data; + struct afs_callback_arg *aca = data; struct osl_row *aft_row; int ret = aft_get_row_of_path(path, &aft_row); - if (ret >= 0) - return 1; - return para_printf(pb, "%s: %s\n", path, para_strerror(-ret)); + if (ret < 0) + afs_error(aca, "%s: %s\n", path, para_strerror(-ret)); + return 1; /* do not fail the loop on bad paths */ } static int check_playlist(struct osl_row *row, void *data) { - struct para_buffer *pb = data; + struct afs_callback_arg *aca = data; + struct para_buffer *pb = &aca->pbout; struct osl_object playlist_def; char *playlist_name; int ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def); - if (ret < 0) - return para_printf(pb, "failed to get playlist data: %s\n", + if (ret < 0) { /* log error, but continue */ + afs_error(aca, "failed to get playlist data: %s\n", para_strerror(-ret)); + return 1; + } if (*playlist_name) { /* skip dummy row */ - ret = para_printf(pb, "checking playlist %s...\n", playlist_name); - if (ret < 0) - return ret; - ret = for_each_line_ro(playlist_def.data, playlist_def.size, - check_playlist_path, pb); + para_printf(pb, "checking playlist %s...\n", playlist_name); + for_each_line(FELF_READ_ONLY, playlist_def.data, + playlist_def.size, check_playlist_path, aca); } osl_close_disk_object(&playlist_def); - return ret; + return 1; } /** * Check the playlist table for inconsistencies. * - * \param fd The afs socket. - * \param query Unused. + * \param aca This callback ignores ->query. * - * \return The return value of the underlying call to osl_rbtree_loop(). + * \return Standard. Invalid paths are reported, but are not considered an + * error. */ -void playlist_check_callback(int fd, __a_unused const struct osl_object *query) +int playlist_check_callback(struct afs_callback_arg *aca) { - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm - }; - int ret = para_printf(&pb, "checking playlists...\n"); - - if (ret < 0) - return; - osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb, - check_playlist); - if (pb.offset) - pass_buffer_as_shm(pb.buf, pb.offset, &fd); - free(pb.buf); + para_printf(&aca->pbout, "checking playlists...\n"); + return osl(osl_rbtree_loop(playlists_table, BLOBCOL_ID, aca, + check_playlist)); } -/** - * Close the current playlist. - * - * \sa playlist_open(). - */ -void playlist_close(void) +/** Free all resources of the current playlist, if any. */ +void playlist_unload(void) { if (!current_playlist.name) return; free(current_playlist.name); current_playlist.name = NULL; + current_playlist.length = 0; } /** - * Open the given playlist. + * Populate the score table from the paths of a playlist database object. * - * \param name The name of the playlist to open. + * This loads the blob object which corresponds to the given name from the + * playlist table. Each line of the blob is regarded as a path which is looked + * up in the audio file table. If the path lookup succeeds, a reference to the + * corresponding row of the audio file table is added to the score table. * - * Files which are listed in the playlist, but not contained in the database - * are ignored. This is not considered an error. + * \param name The name of the playlist to load. + * \param msg Error message or playlist info is returned here. * - * \return Standard. + * \return The length of the loaded playlist on success, negative error code + * else. Files which are listed in the playlist, but are not contained in the + * database are ignored. This is not considered an error. */ -int playlist_open(char *name) +int playlist_load(const char *name, char **msg) { - struct osl_object obj; int ret; - struct osl_row *row; + struct playlist_instance *playlist = ¤t_playlist; + struct osl_object playlist_def; - obj.data = name; - obj.size = strlen(obj.data); - ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row)); + ret = pl_get_def_by_name(name, &playlist_def); if (ret < 0) { - PARA_NOTICE_LOG("failed to load playlist %s\n", name); + *msg = make_message("could not read playlist %s\n", name); return ret; } - playlist_close(); - ret = load_playlist(row, ¤t_playlist); - return (ret == -E_PLAYLIST_LOADED)? current_playlist.length : ret; + playlist_unload(); + ret = for_each_line(FELF_READ_ONLY, 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) + goto err; + playlist->name = para_strdup(name); + *msg = make_message("loaded playlist %s (%u files)\n", playlist->name, + playlist->length); + /* success */ + return current_playlist.length; +err: + PARA_NOTICE_LOG("unable to load playlist %s\n", name); + *msg = make_message("unable to load playlist %s\n", name); + return ret; } static int search_path(char *path, void *data) @@ -196,27 +168,22 @@ static int search_path(char *path, void *data) static int handle_audio_file_event(enum afs_events event, void *data) { - int ret, was_admissible = 0, is_admissible; + int ret; + bool was_admissible = false, is_admissible; struct osl_object playlist_def; char *new_path; const struct osl_row *row = data; - if (!current_playlist.name) - return 1; - if (event == AUDIO_FILE_RENAME) { - ret = row_belongs_to_score_table(row, NULL); - if (ret < 0) - return ret; - was_admissible = ret; - } + if (event == AUDIO_FILE_RENAME) + was_admissible = row_belongs_to_score_table(row); ret = get_audio_file_path_of_row(row, &new_path); if (ret < 0) return ret; ret = pl_get_def_by_name(current_playlist.name, &playlist_def); if (ret < 0) return ret; - ret = for_each_line_ro(playlist_def.data, playlist_def.size, - search_path, new_path); + ret = for_each_line(FELF_READ_ONLY, playlist_def.data, + playlist_def.size, search_path, new_path); osl_close_disk_object(&playlist_def); is_admissible = (ret < 0); if (was_admissible && is_admissible) @@ -244,20 +211,18 @@ static int handle_audio_file_event(enum afs_events event, void *data) int playlists_event_handler(enum afs_events event, __a_unused struct para_buffer *pb, void *data) { - int ret; struct afsi_change_event_data *aced = data; - switch(event) { + if (!current_playlist.name) + return 1; + switch (event) { case AFSI_CHANGE: return playlist_update_audio_file(aced->aft_row); case AUDIO_FILE_RENAME: case AUDIO_FILE_ADD: return handle_audio_file_event(event, data); case AUDIO_FILE_REMOVE: - ret = row_belongs_to_score_table(data, NULL); - if (ret < 0) - return ret; - if (!ret) + if (!row_belongs_to_score_table(data)) return 1; current_playlist.length--; return score_delete(data);