X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=playlist.c;h=5cfe1a75196d5baf446507b21ee551044ecf446a;hb=b36883d75a07842740562eb654d5642914042d4b;hp=60e27e6e6fc104034b13e054c330c4ce484749a6;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e;p=paraslash.git diff --git a/playlist.c b/playlist.c index 60e27e6e..5cfe1a75 100644 --- a/playlist.c +++ b/playlist.c @@ -1,11 +1,8 @@ -/* - * Copyright (C) 2007-2013 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" @@ -70,8 +67,8 @@ static int load_playlist(struct osl_row *row, void *data) if (ret < 0) goto err; playlist->length = 0; - ret = for_each_line_ro(playlist_def.data, playlist_def.size, - add_playlist_entry, playlist); + 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; @@ -95,9 +92,9 @@ static int check_playlist_path(char *path, void *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) + para_printf(pb, "%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) @@ -107,53 +104,39 @@ static int check_playlist(struct osl_row *row, void *data) 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 */ + para_printf(pb, "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, pb); } 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 = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - }; - 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(fd, SBD_OUTPUT, pb.buf, pb.offset); - free(pb.buf); + para_printf(&aca->pbout, "checking playlists...\n"); + return osl(osl_rbtree_loop(playlists_table, BLOBCOL_ID, &aca->pbout, + check_playlist)); } /** * Close the current playlist. * - * \sa playlist_open(). + * \sa \ref playlist_open(). */ void playlist_close(void) { @@ -164,26 +147,30 @@ void playlist_close(void) } /** - * Open the given playlist. + * Open and load the given playlist. * * \param name The name of the playlist to open. + * \param errmsg To be sent to the client (if called via select command). * * Files which are listed in the playlist, but not contained in the database * are ignored. This is not considered an error. * - * \return Standard. + * \return The length of the loaded playlist on success, negative error code + * else. */ -int playlist_open(char *name) +int playlist_open(const char *name, char **errmsg) { struct osl_object obj; int ret; struct osl_row *row; - obj.data = name; + obj.data = (char *)name; obj.size = strlen(obj.data); ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) { - PARA_NOTICE_LOG("failed to load playlist %s\n", name); + if (errmsg) + *errmsg = make_message("could not open playlist %s", + name); return ret; } playlist_close(); @@ -200,13 +187,12 @@ 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) @@ -219,8 +205,8 @@ static int handle_audio_file_event(enum afs_events event, void *data) 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) @@ -251,7 +237,9 @@ int playlists_event_handler(enum afs_events event, 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: