/*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
* Used for scoring and to determine whether a file is admissible.
*/
struct mood_method {
- /* The name of the method. */
+ /** The name of the method. */
const char *name;
/** Pointer to the mood parser. */
mood_parser *parser;
return -100;
}
-/* returns 1 if row matches score item, negative otherwise */
-static int add_item_score(const struct osl_row *row, struct mood_item *item, long *score,
- long *score_arg_sum)
+/* returns 1 if row matches score item, 0 if not, negative on errors */
+static int get_item_score(const struct osl_row *row, struct mood_item *item,
+ long *score, long *score_arg_sum)
{
struct afs_info afsi;
struct afh_info afhi;
char *path;
- int ret;
+ int ret, match = 1;
*score_arg_sum += item->random_score? 100 : PARA_ABS(item->score_arg);
ret = 100;
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;
if (!m)
return -E_NO_MOOD;
/* 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(aft_row, item, &item_score,
+ &score_arg_sum);
+ if (ret < 0)
+ return ret;
+ 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(aft_row, item, &item_score,
+ &score_arg_sum);
+ if (ret < 0)
+ return ret;
+ 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(aft_row, item, &item_score,
+ &score_arg_sum);
+ if (ret < 0)
+ return ret;
+ score += item_score;
+ }
if (score_arg_sum)
score /= score_arg_sum;
*result = score;
struct osl_object mood_def;
struct mood_line_parser_data mlpd = {.line_num = 0};
- int ret2, ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
+ int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
if (ret < 0) {
- ret2 = para_printf(pb, "failed to get mood definition: %s\n",
+ para_printf(pb, "failed to get mood definition: %s\n",
para_strerror(-ret));
return ret;
}
ret = for_each_line_ro(mood_def.data, mood_def.size,
parse_mood_line, &mlpd);
if (ret < 0)
- ret2 = para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
+ para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
para_strerror(-ret));
out:
osl_close_disk_object(&mood_def);
* \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 *data)
{
long score = 0;
ret = compute_mood_score(aft_row, aa->m, &score);
- if (ret < 0)
- return (ret == -E_NOT_ADMISSIBLE)? 1 : ret;
+ if (ret <= 0)
+ return ret;
if (statistics.num >= aa->size) {
aa->size *= 2;
aa->size += 100;
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;
int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
void *data)
{
- switch(event) {
+ if (!current_mood)
+ return 0;
+ switch (event) {
/*
* The three blob events might change the set of admissible files,
* so we must reload the score list.