From 02baea145799b33cc82ffb227966e77182b5f790 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 25 Sep 2007 14:57:09 +0200 Subject: [PATCH] com_check(): Implement mood checking. --- afs.c | 11 +++++++ afs.h | 4 ++- blob.c | 6 ++-- mood.c | 94 +++++++++++++++++++++++++++++++++++++++++++++------------- 4 files changed, 90 insertions(+), 25 deletions(-) diff --git a/afs.c b/afs.c index d5da1e55..cafe9b47 100644 --- a/afs.c +++ b/afs.c @@ -919,5 +919,16 @@ int com_check(int fd, int argc, char * const * const argv) return ret; } } + if (flags & CHECK_MOODS) { + ret = send_callback_request(mood_check_callback, NULL, &result); + if (ret < 0) + return ret; + if (ret > 0) { + ret = send_buffer(fd, (char *) result.data); + free(result.data); + if (ret < 0) + return ret; + } + } return 1; } diff --git a/afs.h b/afs.h index 9294ccfe..76464c71 100644 --- a/afs.h +++ b/afs.h @@ -126,6 +126,8 @@ void close_current_mood(void); int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi); int reload_current_mood(void); int mood_delete_audio_file(const struct osl_row *aft_row); +int mood_check_callback(__a_unused const struct osl_object *query, + struct osl_object *result); /* playlist */ @@ -143,7 +145,7 @@ int playlist_check_callback(__a_unused const struct osl_object *query, int table_name ## _init(struct table_info *ti, const char *db); \ void table_name ## _shutdown(enum osl_close_flags flags); \ int cmd_prefix ## _get_name_by_id(uint32_t id, char **name); \ - int cmd_prefix ## _get_name_and_def_by_row(struct osl_row *row, \ + int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \ char **name, struct osl_object *def); \ extern struct osl_table *table_name ## _table; diff --git a/blob.c b/blob.c index 617e94f1..74b1c4f5 100644 --- a/blob.c +++ b/blob.c @@ -440,8 +440,8 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, return blob_get_name_by_id(table_name ## _table, id, name); \ } -static int blob_get_name_and_def_by_row(struct osl_table *table, struct osl_row *row, - char **name, struct osl_object *def) +static int blob_get_name_and_def_by_row(struct osl_table *table, + const struct osl_row *row, char **name, struct osl_object *def) { struct osl_object obj; int ret = osl_get_object(table, row, BLOBCOL_NAME, &obj); @@ -452,7 +452,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, struct osl_row } /** Define the \p get_name_and_def_by_row function for this blob type. */ #define DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix) \ - int cmd_prefix ## _get_name_and_def_by_row(struct osl_row *row, \ + int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \ char **name, struct osl_object *def) \ { \ return blob_get_name_and_def_by_row(table_name ## _table, \ diff --git a/mood.c b/mood.c index 7d207f0b..83c7fa65 100644 --- a/mood.c +++ b/mood.c @@ -358,6 +358,11 @@ enum mood_line_type { ML_SCORE }; +struct mood_line_parser_data { + struct mood *m; + unsigned line_num; +}; + /* * ] | deny [with score ] | score > * [if] [not] [options] @@ -367,7 +372,7 @@ enum mood_line_type { static int parse_mood_line(char *mood_line, void *data) { - struct mood *m = data; + struct mood_line_parser_data *mlpd = data; char **argv; char *delim = " \t"; unsigned num_words; @@ -377,6 +382,7 @@ static int parse_mood_line(char *mood_line, void *data) struct mood_item *mi = NULL; char *buf = para_strdup(mood_line); + mlpd->line_num++; num_words = split_args(buf, &argv, delim); ret = 1; if (!num_words) /* empty line */ @@ -454,12 +460,14 @@ static int parse_mood_line(char *mood_line, void *data) goto out; mi->method = &mood_methods[i]; success: - if (mlt == ML_ACCEPT) - para_list_add(&mi->mood_item_node, &m->accept_list); - else if (mlt == ML_DENY) - para_list_add(&mi->mood_item_node, &m->deny_list); - else - para_list_add(&mi->mood_item_node, &m->score_list); + if (mlpd->m) { + if (mlt == ML_ACCEPT) + para_list_add(&mi->mood_item_node, &mlpd->m->accept_list); + else if (mlt == ML_DENY) + para_list_add(&mi->mood_item_node, &mlpd->m->deny_list); + else + para_list_add(&mi->mood_item_node, &mlpd->m->score_list); + } PARA_DEBUG_LOG("%s entry added, method: %p\n", mlt == ML_ACCEPT? "accept" : (mlt == ML_DENY? "deny" : "score"), mi->method); ret = 1; @@ -477,28 +485,27 @@ out: static int load_mood(const struct osl_row *mood_row, struct mood **m) { - int ret; - struct osl_object objs[NUM_BLOB_COLUMNS]; + char *mood_name; + struct osl_object mood_def; + struct mood_line_parser_data mlpd = {.line_num = 0}; + int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def); - ret = osl_get_object(moods_table, mood_row, BLOBCOL_NAME, &objs[BLOBCOL_NAME]); if (ret < 0) return ret; - if (objs[BLOBCOL_NAME].size <= 1) + if (!*mood_name) return -E_DUMMY_ROW; - ret = osl_open_disk_object(moods_table, mood_row, BLOBCOL_DEF, &objs[BLOBCOL_DEF]); - if (ret < 0) - return ret; - *m = alloc_new_mood((char*)objs[BLOBCOL_NAME].data); - ret = for_each_line_ro(objs[BLOBCOL_DEF].data, objs[BLOBCOL_DEF].size, - parse_mood_line, *m); - osl_close_disk_object(&objs[BLOBCOL_DEF]); + mlpd.m = alloc_new_mood(mood_name); + ret = for_each_line_ro(mood_def.data, mood_def.size, + parse_mood_line, &mlpd); + osl_close_disk_object(&mood_def); if (ret < 0) { - PARA_ERROR_LOG("unable to load mood %s: %s\n", (*m)->name, + PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name, PARA_STRERROR(-ret)); - destroy_mood(*m); + destroy_mood(mlpd.m); return ret; } - PARA_INFO_LOG("loaded mood %s\n", (*m)->name); + PARA_INFO_LOG("loaded mood %s\n", mlpd.m->name); + *m = mlpd.m; return 1; } @@ -531,6 +538,51 @@ static int load_first_available_mood(struct mood **m) return -E_NO_MOOD; } +static int check_mood(struct osl_row *mood_row, void *data) +{ + struct para_buffer *pb = data; + char *mood_name; + struct osl_object mood_def; + struct mood_line_parser_data mlpd = {.line_num = 0}; + + int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def); + + if (ret < 0) { + para_printf(pb, "failed to get mood definition\n"); + return ret; + } + if (!*mood_name) /* ignore dummy row */ + goto out; + para_printf(pb, "checking mood %s...\n", mood_name); + ret = for_each_line_ro(mood_def.data, mood_def.size, + parse_mood_line, &mlpd); + if (ret < 0) + para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num, + PARA_STRERROR(-ret)); +out: + osl_close_disk_object(&mood_def); + return 1; +} + +/** + * Check all moods for syntax errors. + * + * \param query Unused. + * \param result: Contains check messages. + */ +int mood_check_callback(__a_unused const struct osl_object *query, + struct osl_object *result) +{ + struct para_buffer pb = {.buf = NULL}; + + para_printf(&pb, "checking moods...\n"); + osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb, + check_mood); + result->data = pb.buf; + result->size = pb.size; + return 1; +} + #if 0 static unsigned int_log2(uint64_t x) { -- 2.39.2