X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=f3ce9e0aa11a691202397039ecd275c1fd05268a;hp=6b2dfa07617932edda5319248e06b254fa4eabd4;hb=fb62100d23baea388cec78e572b0f36d051a61c0;hpb=d6af2c473a9f2ae1f582ad44d5ad6eb8bf1ed35a diff --git a/mood.c b/mood.c index 6b2dfa07..f3ce9e0a 100644 --- a/mood.c +++ b/mood.c @@ -1,97 +1,42 @@ /* - * Copyright (C) 2007 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file mood.c Paraslash's mood handling functions. */ +#include +#include + #include "para.h" #include "error.h" +#include "string.h" #include "afh.h" #include "afs.h" #include "list.h" -#include "string.h" +#include "ipc.h" +#include "mm.h" /** * Contains statistical data of the currently admissible audio files. * - * It is used to assign normalized score values to each admissbile audio file. + * It is used to assign normalized score values to each admissible audio file. */ struct afs_statistics { - /** sum of num played over all admissible files */ + /** Sum of num played over all admissible files. */ int64_t num_played_sum; - /** sum of last played times over all admissible files */ + /** Sum of last played times over all admissible files. */ int64_t last_played_sum; - /** quadratic deviation of num played time */ + /** Quadratic deviation of num played time. */ int64_t num_played_qd; - /** quadratic deviation of last played time */ + /** Quadratic deviation of last played time. */ int64_t last_played_qd; - /** number of admissible files */ + /** Number of admissible files */ unsigned num; }; struct afs_statistics statistics; -/** - * Assign scores according to a mood_method. - * - * Each mood_method has its own mood_score_function. The first parameter passed - * to that function is a pointer to a row of the audio file table. It - * determines the audio file for which a score is to be assigned. The second - * argument depends on the mood method this function is used for. It usually is - * the argument given at the end of a mood line. - * - * Mood score functions must return values between -100 and +100 inclisively. - * Boolean score functions should always return either -100 or +100. - * - * \sa struct mood_method, mood_parser. - */ -typedef int mood_score_function(const struct osl_row*, void *); - -/** - * Preprocess a mood line. - * - * The mood_parser of a mood_method is called once at mood open time for each - * line of the current mood definition that contains the mood_method's name as - * a keyword. The line is passed to the mood_parser as the first argument. The - * mood_parser must determine whether the line is syntactically correct and - * return a positive value if so and a negative value otherwise. - * - * Some mood parsers preprocess the data given in the mood line to compute a - * structure which depends of the particular mood_method and which is used - * later in the mood_score_function of the mood_method. The mood_parser may - * store a pointer to its structure via the second argument. - * - * \sa mood_open(), mood_cleanup_function, mood_score_function. - */ -typedef int mood_parser(const char *, void **); - -/** - * Deallocate resources which were allocated by the mood_parser. - * - * This optional function of a mood_method is used to free any resources - * allocated in mood_open() by the mood_parser. The argument passed is a - * pointer to the mood_method specific data structure that was returned by the - * mood_parser. - * - * \sa mood_parser. - */ -typedef void mood_cleanup_function(void *); - -/** - * Used for scoring and to determine whether a file is admissible. - */ -struct mood_method { - /* The name of the method. */ - const char *name; - /** Pointer to the mood parser. */ - mood_parser *parser; - /** Pointer to the score function */ - mood_score_function *score_function; - /** Optional cleanup function. */ - mood_cleanup_function *cleanup; -}; - /** * Each line of the current mood corresponds to a mood_item. */ @@ -101,7 +46,7 @@ struct mood_item { /** The data structure computed by the mood parser. */ void *parser_data; /** The given score value, or zero if none was given. */ - long score_arg; + int32_t score_arg; /** Non-zero if random scoring was requested. */ int random_score; /** Whether the "not" keyword was given in the mood line. */ @@ -115,13 +60,13 @@ struct mood_item { * * When a mood is opened, each line of its definition is investigated, and a * corresponding mood item is produced. Each mood line starts with \p accept, - * \p deny, or \p score which determins the type of the mood line. For each + * \p deny, or \p score which determines the type of the mood line. For each * such type a linked list is maintained whose entries are the mood items. * * \sa mood_item, mood_open(). */ struct mood { - /** the name of this mood */ + /** The name of this mood. */ char *name; /** The list of mood items of type \p accept. */ struct list_head accept_list; @@ -162,154 +107,80 @@ static uint64_t int_sqrt(uint64_t x) return res; } -static int mm_played_rarely_score_function(const struct osl_row *row, - __a_unused void *ignored) -{ - struct afs_info afsi; - unsigned num; - int ret = get_afsi_of_row(row, &afsi); - - if (ret < 0) - return 0; - ret = get_num_admissible_files(&num); - if (ret < 0) - return 0; - if (statistics.num_played_sum - num * afsi.num_played - > int_sqrt(statistics.num_played_qd * num)) - return 100; - return -100; -} - -static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored) -{ - if (*arg) - PARA_WARNING_LOG("ignored junk at eol: %s\n", arg); - return 1; -} - -static int mm_name_like_score_function(const struct osl_row *row, void *preg) -{ - char *path; - int ret = get_audio_file_path_of_row(row, &path); - - if (ret < 0) - return 0; - ret = regexec((regex_t *)preg, path, 42, NULL, 0); - return (ret == REG_NOMATCH)? -100 : 100; -} - -static int mm_name_like_parser(const char *arg, void **regex) -{ - regex_t *preg = para_malloc(sizeof(*preg)); - int ret = regcomp(preg, arg, REG_NOSUB); - - if (ret) { - free(preg); - return -E_MOOD_REGEX; - } - *regex = preg; - return 1; -} - -static void mm_name_like_cleanup(void *preg) -{ - regfree(preg); - free(preg); -} - -static int mm_is_set_parser(const char *arg, void **bitnum) -{ - unsigned char *c = para_malloc(1); - int ret = get_attribute_bitnum_by_name(arg, c); - - if (ret >= 0) - *bitnum = c; - else - free(c); - return ret; -} - -static int mm_is_set_score_function(const struct osl_row *row, void *bitnum) -{ - unsigned char *bn = bitnum; - struct afs_info afsi; - int ret = get_afsi_of_row(row, &afsi); - - if (ret < 0) - return 0; - if (afsi.attributes & (1ULL << *bn)) - return 100; - return -100; -} - -/* returns 1 if row matches score item, -1 otherwise */ -static int add_item_score(const struct osl_row *row, struct mood_item *item, long *score, +/* returns 1 if row matches score item, 0 if not. */ +static int get_item_score(struct mood_item *item, const struct afs_info *afsi, + const struct afh_info *afhi, const char *path, long *score, long *score_arg_sum) { - int ret = 100; + int ret, match = 1; *score_arg_sum += item->random_score? 100 : PARA_ABS(item->score_arg); + ret = 100; if (item->method) { - ret = item->method->score_function(row, item->parser_data); + ret = item->method->score_function(path, afsi, afhi, + item->parser_data); if ((ret < 0 && !item->logical_not) || (ret >= 0 && item->logical_not)) - return -1; /* no match */ + match = 0; /* no match */ } if (item->random_score) - *score += PARA_ABS(ret) * para_random(100); + *score = PARA_ABS(ret) * para_random(100); else - *score += PARA_ABS(ret) * item->score_arg; - return 1; + *score = PARA_ABS(ret) * item->score_arg; + return match; } +/* returns 1 if row admissible, 0 if not, negative on errors */ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m, long *result) { struct mood_item *item; - int match = 0; - long score_arg_sum = 0, score = 0; + int ret, match = 0; + long score_arg_sum = 0, score = 0, item_score; + struct afs_info afsi; + struct afh_info afhi; + char *path; if (!m) return -E_NO_MOOD; + ret = get_afsi_of_row(aft_row, &afsi); + if (ret< 0) + return ret; + ret = get_afhi_of_row(aft_row, &afhi); + if (ret< 0) + return ret; + ret = get_audio_file_path_of_row(aft_row, &path); + if (ret< 0) + return ret; /* reject audio file if it matches any entry in the deny list */ - list_for_each_entry(item, &m->deny_list, mood_item_node) - if (add_item_score(aft_row, item, &score, &score_arg_sum) > 0) - return -E_NOT_ADMISSIBLE; - list_for_each_entry(item, &m->accept_list, mood_item_node) - if (add_item_score(aft_row, item, &score, &score_arg_sum) > 0) - match = 1; + list_for_each_entry(item, &m->deny_list, mood_item_node) { + ret = get_item_score(item, &afsi, &afhi, path, &item_score, + &score_arg_sum); + if (ret > 0) /* not admissible */ + return 0; + score += item_score; + } + list_for_each_entry(item, &m->accept_list, mood_item_node) { + ret = get_item_score(item, &afsi, &afhi, path, &item_score, + &score_arg_sum); + if (ret == 0) + continue; + match = 1; + score += item_score; + } /* reject if there is no matching entry in the accept list */ if (!match && !list_empty(&m->accept_list)) - return -E_NOT_ADMISSIBLE; - list_for_each_entry(item, &m->score_list, mood_item_node) - add_item_score(aft_row, item, &score, &score_arg_sum); + return 0; + list_for_each_entry(item, &m->score_list, mood_item_node) { + ret = get_item_score(item, &afsi, &afhi, path, &item_score, + &score_arg_sum); + score += item_score; + } if (score_arg_sum) score /= score_arg_sum; *result = score; return 1; } -static const struct mood_method mood_methods[] = { -{ - .parser = mm_played_rarely_parser, - .score_function = mm_played_rarely_score_function, - .name = "played_rarely" -}, -{ - .parser = mm_is_set_parser, - .score_function = mm_is_set_score_function, - .name = "is_set" -}, -{ - .parser = mm_name_like_parser, - .score_function = mm_name_like_score_function, - .cleanup = mm_name_like_cleanup, - .name = "name_like" -}, -{ - .parser = NULL -} -}; - static void cleanup_list_entry(struct mood_item *item) { if (item->method && item->method->cleanup) @@ -358,6 +229,14 @@ enum mood_line_type { ML_SCORE }; +/** Data passed to the parser of a mood line. */ +struct mood_line_parser_data { + /** The mood this mood line belongs to. */ + struct mood *m; + /** The line number in the mood definition. */ + unsigned line_num; +}; + /* * ] | deny [with score ] | score > * [if] [not] [options] @@ -367,18 +246,19 @@ 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; char **w; int i, ret; enum mood_line_type mlt = ML_INVALID; struct mood_item *mi = NULL; - char *buf = para_strdup(mood_line); - num_words = split_args(buf, &argv, delim); - ret = 1; + mlpd->line_num++; + ret = create_argv(mood_line, " \t", &argv); + if (ret < 0) + return ret; + num_words = ret; if (!num_words) /* empty line */ goto out; w = argv; @@ -399,11 +279,13 @@ static int parse_mood_line(char *mood_line, void *data) w++; if (!*w) goto out; - if (!strcmp(*w, "with")) { - w++; - if (!*w) - goto out; - } + if (strcmp(*w, "with")) + goto check_for_if; + w++; + if (!*w) + goto out; + if (strcmp(*w, "score")) + goto out; } if (mlt == ML_SCORE || !strcmp(*w, "score")) { ret = -E_MOOD_SYNTAX; @@ -412,7 +294,7 @@ static int parse_mood_line(char *mood_line, void *data) goto out; if (strcmp(*w, "random")) { mi->random_score = 0; - ret = para_atol(*w, &mi->score_arg); + ret = para_atoi32(*w, &mi->score_arg); if (ret < 0) goto out; } else { @@ -426,6 +308,7 @@ static int parse_mood_line(char *mood_line, void *data) w++; if (!*w) goto out; +check_for_if: if (!strcmp(*w, "if")) { ret = -E_MOOD_SYNTAX; w++; @@ -448,24 +331,25 @@ static int parse_mood_line(char *mood_line, void *data) ret = -E_MOOD_SYNTAX; if (!mood_methods[i].parser) goto out; - w++; - ret = mood_methods[i].parser(*w, &mi->parser_data); + ret = mood_methods[i].parser(num_words - 1 - (w - argv), w, + &mi->parser_data); if (ret < 0) 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; out: - free(argv); - free(buf); + free_argv(argv); if (ret >= 0) return ret; if (mi) { @@ -475,60 +359,82 @@ out: return ret; } -static int load_mood(const struct osl_row *row) +static int load_mood(const struct osl_row *mood_row, struct mood **m) { - int ret; - struct mood *new_mood, *old_mood = current_mood; - 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, 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, row, BLOBCOL_DEF, &objs[BLOBCOL_DEF]); - if (ret < 0) - return ret; - new_mood = alloc_new_mood((char*)objs[BLOBCOL_NAME].data); - current_mood = new_mood; - ret = for_each_line_ro(objs[BLOBCOL_DEF].data, objs[BLOBCOL_DEF].size, - parse_mood_line, ¤t_mood); - 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: %d\n", - (char *)objs[BLOBCOL_NAME].data, ret); - destroy_mood(new_mood); - current_mood = old_mood; + PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name, + para_strerror(-ret)); + destroy_mood(mlpd.m); return ret; } - destroy_mood(old_mood); - current_mood = new_mood; - PARA_INFO_LOG("loaded mood %s\n", current_mood->name); + *m = mlpd.m; return 1; } -/* returns -E_MOOD_LOADED on _success_ to terminate the loop */ -static int mood_loop(struct osl_row *row, __a_unused void *private_data) +static int check_mood(struct osl_row *mood_row, void *data) { - int ret = load_mood(row); + 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) { - if (ret != -E_DUMMY_ROW) - PARA_NOTICE_LOG("invalid mood (%d), trying next mood\n", ret); - return 1; + para_printf(pb, "failed to get mood definition: %s\n", + para_strerror(-ret)); + return ret; } - return -E_MOOD_LOADED; + if (!*mood_name) /* ignore dummy row */ + goto out; + ret = para_printf(pb, "checking mood %s...\n", mood_name); + if (ret < 0) + goto out; + 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 ret; } -static int load_first_available_mood(void) +/** + * Check all moods for syntax errors. + * + * \param fd The afs socket. + * \param query Unused. + */ +void mood_check_callback(int fd, __a_unused const struct osl_object *query) { - int ret = osl_rbtree_loop(moods_table, BLOBCOL_NAME, NULL, - mood_loop); - if (ret == -E_MOOD_LOADED) /* success */ - return 1; + struct para_buffer pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + }; + + int ret = para_printf(&pb, "checking moods...\n"); if (ret < 0) - return ret; /* error */ - PARA_NOTICE_LOG("no valid mood found\n"); - return -E_NO_MOOD; + return; + osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb, + check_mood); + if (pb.offset) + pass_buffer_as_shm(pb.buf, pb.offset, &fd); + free(pb.buf); } #if 0 @@ -664,6 +570,8 @@ struct admissible_file_info /** The temporary array of admissible files. */ struct admissible_array { + /** Files are admissible wrt. this mood. */ + struct mood *m; /** The size of the array */ unsigned size; /** Pointer to the array of admissible files. */ @@ -676,18 +584,17 @@ struct admissible_array { * \param aft_row The audio file to be added. * \param private_data Pointer to a struct admissible_file_info. * - * \return Negative on errors, positive on success. + * \return 1 if row admissible, 0 if not, negative on errors. */ -static int add_if_admissible(struct osl_row *aft_row, void *private_data) +static int add_if_admissible(struct osl_row *aft_row, void *data) { + struct admissible_array *aa = data; int ret; - struct admissible_array *aa = private_data; long score = 0; - score = 0; - ret = compute_mood_score(aft_row, current_mood, &score); - if (ret < 0) - return (ret == -E_NOT_ADMISSIBLE)? 1 : ret; + ret = compute_mood_score(aft_row, aa->m, &score); + if (ret <= 0) + return ret; if (statistics.num >= aa->size) { aa->size *= 2; aa->size += 100; @@ -707,7 +614,7 @@ static int add_if_admissible(struct osl_row *aft_row, void *private_data) * * \param n Number of elements. * \param old_qd The quadratic deviation before the change. - * \param old_val The value that was repaced. + * \param old_val The value that was replaced. * \param new_val The replacement value. * \param old_sum The sum of all elements before the update. * @@ -779,19 +686,19 @@ static int delete_from_statistics_and_score_table(const struct osl_row *aft_row) } /** - * Delete one entry from the statitics and from the score table. + * Delete one entry from the statistics and from the score table. * * \param aft_row The audio file which is no longer admissible. * * \return Positive on success, negative on errors. * - * \sa score_delete(), mood_update_audio_file(). + * \sa score_delete(). */ -int mood_delete_audio_file(const struct osl_row *aft_row) +static int mood_delete_audio_file(const struct osl_row *aft_row) { int ret; - ret = row_belongs_to_score_table(aft_row); + ret = row_belongs_to_score_table(aft_row, NULL); if (ret < 0) return ret; if (!ret) /* not admissible, nothing to do */ @@ -800,7 +707,7 @@ int mood_delete_audio_file(const struct osl_row *aft_row) } /** - * Compute the new score of an audio file. + * Compute the new score of an audio file wrt. the current mood. * * \param aft_row Determines the audio file. * \param old_afsi The audio file selector info before updating. @@ -810,19 +717,23 @@ int mood_delete_audio_file(const struct osl_row *aft_row) * * \return Positive on success, negative on errors. */ -int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi) +static int mood_update_audio_file(const struct osl_row *aft_row, + struct afs_info *old_afsi) { long score, percent; int ret, is_admissible, was_admissible = 0; struct afs_info afsi; + unsigned rank; if (!current_mood) return 1; /* nothing to do */ - ret = row_belongs_to_score_table(aft_row); + ret = row_belongs_to_score_table(aft_row, &rank); if (ret < 0) return ret; was_admissible = ret; ret = compute_mood_score(aft_row, current_mood, &score); + if (ret < 0) + return ret; is_admissible = (ret > 0); if (!was_admissible && !is_admissible) return 1; @@ -852,7 +763,7 @@ int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_a percent = 100; else if (percent < 0) percent = 0; - PARA_DEBUG_LOG("re-inserting at %lu%%\n", percent); + PARA_DEBUG_LOG("moving from rank %u to %lu%%\n", rank, percent); return score_update(aft_row, percent); } @@ -864,23 +775,36 @@ static void log_statistics(void) PARA_NOTICE_LOG("no admissible files\n"); return; } - PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %llu\n", + PARA_INFO_LOG("last_played mean: %lli, last_played sigma: %llu\n", (long long int)(statistics.last_played_sum / n), (long long unsigned)int_sqrt(statistics.last_played_qd / n)); - PARA_NOTICE_LOG("num_played mean: %lli, num_played sigma: %llu\n", + PARA_INFO_LOG("num_played mean: %lli, num_played sigma: %llu\n", (long long int)statistics.num_played_sum / n, (long long unsigned)int_sqrt(statistics.num_played_qd / n)); } /** - * Open the given mood. + * Close the current mood. + * + * Free all resources of the current mood which were allocated during + * mood_open(). + */ +void close_current_mood(void) +{ + destroy_mood(current_mood); + current_mood = NULL; + memset(&statistics, 0, sizeof(statistics)); +} + +/** + * Change the current mood. * * \param mood_name The name of the mood to open. * - * There are two special cases: If \a mood_name is \a NULL, load the - * first available mood. If \a mood_name is the empty string "", load - * the dummy mood that accepts every audio file and uses a scoring method - * based only on the \a last_played information. + * If \a mood_name is \a NULL, load the dummy mood that accepts every audio file + * and uses a scoring method based only on the \a last_played information. + * + * If there is already an open mood, it will be closed first. * * \return Positive on success, negative on errors. Loading the dummy mood * always succeeds. @@ -888,7 +812,7 @@ static void log_statistics(void) * \sa struct admissible_file_info, struct admissible_array, struct * afs_info::last_played, mood_close(). */ -int mood_open(char *mood_name) +int change_current_mood(char *mood_name) { int i, ret; struct admissible_array aa = { @@ -896,61 +820,46 @@ int mood_open(char *mood_name) .array = NULL }; - if (!mood_name) { - ret = load_first_available_mood(); - if (ret < 0) - return ret; - } else if (*mood_name) { + if (mood_name) { + struct mood *m; struct osl_row *row; struct osl_object obj = { .data = mood_name, .size = strlen(mood_name) + 1 }; - ret = osl_get_row(moods_table, BLOBCOL_NAME, &obj, &row); + ret = osl(osl_get_row(moods_table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) { PARA_NOTICE_LOG("no such mood: %s\n", mood_name); return ret; } - ret = load_mood(row); + ret = load_mood(row, &m); if (ret < 0) return ret; + close_current_mood(); + current_mood = m; } else { - destroy_mood(current_mood); + close_current_mood(); current_mood = alloc_new_mood("dummy"); } - PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name); - PARA_INFO_LOG("%s\n", "computing statistics of admissible files"); + aa.m = current_mood; + PARA_NOTICE_LOG("computing statistics of admissible files\n"); ret = audio_file_loop(&aa, add_if_admissible); if (ret < 0) return ret; log_statistics(); - PARA_NOTICE_LOG("%d admissible files \n", statistics.num); + PARA_INFO_LOG("%d admissible files \n", statistics.num); for (i = 0; i < statistics.num; i++) { struct admissible_file_info *a = aa.array + i; ret = add_to_score_table(a->aft_row, a->score); if (ret < 0) goto out; } - PARA_NOTICE_LOG("score add complete\n"); - ret = 1; + PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name); + ret = statistics.num; out: free(aa.array); return ret; } - -/** - * Close the current mood. - * - * Free all resources of the current mood which were allocated during - * mood_open(). - */ -void mood_close(void) -{ - destroy_mood(current_mood); - current_mood = NULL; - memset(&statistics, 0, sizeof(statistics)); -} - /** * Close and re-open the current mood. * @@ -964,17 +873,55 @@ void mood_close(void) * * \sa mood_open(), mood_close(). */ -int mood_reload(void) +int reload_current_mood(void) { int ret; - char *mood_name; + char *mood_name = NULL; if (!current_mood) return 1; - score_shutdown(0); - mood_name = para_strdup(current_mood->name); - mood_close(); - ret = mood_open(mood_name); + PARA_NOTICE_LOG("reloading %s\n", current_mood->name? + current_mood->name : "(dummy)"); + if (current_mood->name) + mood_name = para_strdup(current_mood->name); + close_current_mood(); + ret = change_current_mood(mood_name); free(mood_name); return ret; } + +int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb, + void *data) +{ + switch(event) { + /* + * The three blob events might change the set of admissible files, + * so we must reload the score list. + */ + case BLOB_RENAME: + case BLOB_REMOVE: + case BLOB_ADD: + if (data == moods_table || data == playlists_table) + return 1; /* no reload necessary for these */ + return reload_current_mood(); + /* these also require reload of the score table */ + case ATTRIBUTE_ADD: + case ATTRIBUTE_REMOVE: + case ATTRIBUTE_RENAME: + return reload_current_mood(); + /* changes to the aft only require to re-examine the audio file */ + case AFSI_CHANGE: { + struct afsi_change_event_data *aced = data; + return mood_update_audio_file(aced->aft_row, aced->old_afsi); + } + case AFHI_CHANGE: + case AUDIO_FILE_RENAME: + case AUDIO_FILE_ADD: + return mood_update_audio_file(data, NULL); + case AUDIO_FILE_REMOVE: + return mood_delete_audio_file(data); + default: + return 1; + } +} +