compute_mood_score(): Add additional mood * parameter.

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index 19f5dc4dbcb4d4eb29803ff9e6bb844165e1095f..6b2dfa07617932edda5319248e06b254fa4eabd4 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file mood.c Paraslash's mood handling functions. */
+
 #include "para.h"
 #include "error.h"
 #include "afh.h"
@@ -5,8 +13,6 @@
 #include "list.h"
 #include "string.h"
 
-/** \file mood.c Paraslash's mood handling functions. */
-
 /**
  * Contains statistical data of the currently admissible audio files.
  *
@@ -255,26 +261,27 @@ static int add_item_score(const struct osl_row *row, struct mood_item *item, lon
        return 1;
 }
 
-static int compute_mood_score(const struct osl_row *row, long *result)
+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;
 
-       if (!current_mood)
+       if (!m)
                return -E_NO_MOOD;
        /* reject audio file if it matches any entry in the deny list */
-       list_for_each_entry(item, &current_mood->deny_list, mood_item_node)
-               if (add_item_score(row, item, &score, &score_arg_sum) > 0)
+       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, &current_mood->accept_list, mood_item_node)
-               if (add_item_score(row, item, &score, &score_arg_sum) > 0)
+       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;
        /* reject if there is no matching entry in the accept list */
-       if (!match && !list_empty(&current_mood->accept_list))
+       if (!match && !list_empty(&m->accept_list))
                return -E_NOT_ADMISSIBLE;
-       list_for_each_entry(item, &current_mood->score_list, mood_item_node)
-               add_item_score(row, item, &score, &score_arg_sum);
+       list_for_each_entry(item, &m->score_list, mood_item_node)
+               add_item_score(aft_row, item, &score, &score_arg_sum);
        if (score_arg_sum)
                score /= score_arg_sum;
        *result = score;
@@ -358,9 +365,9 @@ enum mood_line_type {
  * all matching files
  */
 
-/* TODO: Use current_mood as private_data*/
-static int parse_mood_line(char *mood_line, __a_unused void *private_data)
+static int parse_mood_line(char *mood_line, void *data)
 {
+       struct mood *m = data;
        char **argv;
        char *delim = " \t";
        unsigned num_words;
@@ -368,7 +375,6 @@ static int parse_mood_line(char *mood_line, __a_unused void *private_data)
        int i, ret;
        enum mood_line_type mlt = ML_INVALID;
        struct mood_item *mi = NULL;
-       struct mood *m = current_mood;
        char *buf = para_strdup(mood_line);
 
        num_words = split_args(buf, &argv, delim);
@@ -486,7 +492,7 @@ static int load_mood(const struct osl_row *row)
        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, NULL);
+               parse_mood_line, &current_mood);
        osl_close_disk_object(&objs[BLOBCOL_DEF]);
        if (ret < 0) {
                PARA_ERROR_LOG("unable to load mood %s: %d\n",
@@ -679,7 +685,7 @@ static int add_if_admissible(struct osl_row *aft_row, void *private_data)
        long score = 0;
 
        score = 0;
-       ret = compute_mood_score(aft_row, &score);
+       ret = compute_mood_score(aft_row, current_mood, &score);
        if (ret < 0)
                return (ret == -E_NOT_ADMISSIBLE)? 1 : ret;
        if (statistics.num >= aa->size) {
@@ -816,7 +822,7 @@ int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_a
        if (ret < 0)
                return ret;
        was_admissible = ret;
-       ret = compute_mood_score(aft_row, &score);
+       ret = compute_mood_score(aft_row, current_mood, &score);
        is_admissible = (ret > 0);
        if (!was_admissible && !is_admissible)
                return 1;