X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=fdf8cdce591e6a6de9359d79974c3e6108ffd3ba;hp=83c7fa65495e2759ecf9122d2bd4428daf15df04;hb=8e2e8dff8f30520c5ba33928992f112a053b920d;hpb=02baea145799b33cc82ffb227966e77182b5f790

diff --git a/mood.c b/mood.c
index 83c7fa65..fdf8cdce 100644
--- a/mood.c
+++ b/mood.c
@@ -6,6 +6,7 @@
 
 /** \file mood.c Paraslash's mood handling functions. */
 
+#include <fnmatch.h>
 #include "para.h"
 #include "error.h"
 #include "afh.h"
@@ -16,18 +17,18 @@
 /**
  * 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;
@@ -41,15 +42,16 @@ struct afs_statistics statistics;
  * 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.
+ * Mood score functions must return values between -100 and +100 inclusively.
  * 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 *);
+typedef int mood_score_function(const char *path, const struct afs_info *afsi,
+		const struct audio_format_info *afhi, const void *data);
 
 /**
- * Preprocess a mood line.
+ * Pre-process 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
@@ -57,7 +59,7 @@ typedef int mood_score_function(const struct osl_row*, void *);
  * 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
+ * Some mood parsers pre-process 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.
@@ -101,7 +103,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,7 +117,7 @@ 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().
@@ -162,19 +164,36 @@ 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)
+static int mm_no_attributes_set_parser(const char *arg, __a_unused void **ignored)
+{
+	if (arg && *arg)
+		PARA_WARNING_LOG("ignored junk at eol: %s\n", arg);
+	return 1;
+}
+
+static int mm_no_attributes_set_score_function(__a_unused const char *path,
+		const struct afs_info *afsi,
+		__a_unused const struct audio_format_info *afhi,
+		__a_unused const void *data)
+{
+	if (!strcmp(path, "/home/mp3/checked/dvd_08/cd_52/Sade__Paradise.mp3"))
+		PARA_NOTICE_LOG("%s: %llu\n", path, afsi->attributes);
+	if (!afsi->attributes)
+		return 100;
+	return -100;
+}
+
+static int mm_played_rarely_score_function(__a_unused const char *path,
+		const struct afs_info *afsi,
+		__a_unused const struct audio_format_info *afhi,
+		__a_unused const void *data)
 {
-	struct afs_info afsi;
 	unsigned num;
-	int ret = get_afsi_of_row(row, &afsi);
+	int ret = get_num_admissible_files(&num);
 
 	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
+	if (statistics.num_played_sum - num * afsi->num_played
 			> int_sqrt(statistics.num_played_qd * num))
 		return 100;
 	return -100;
@@ -182,39 +201,30 @@ static int mm_played_rarely_score_function(const struct osl_row *row,
 
 static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored)
 {
-	if (*arg)
+	if (arg && *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)
+static int mm_name_like_score_function(const char *path,
+		__a_unused const struct afs_info *afsi,
+		__a_unused const struct audio_format_info *afhi,
+		const void *data)
 {
-	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;
+	if (fnmatch(data, path, 0))
+		return -100;
+	return 100;
 }
 
-static int mm_name_like_parser(const char *arg, void **regex)
+static int mm_name_like_parser(const char *arg, void **data)
 {
-	regex_t *preg = para_malloc(sizeof(*preg));
-	int ret = regcomp(preg, arg, REG_NOSUB);
-
-	if (ret) {
-		free(preg);
-		return -E_MOOD_REGEX;
-	}
-	*regex = preg;
+	*data = para_strdup(arg);
 	return 1;
 }
 
-static void mm_name_like_cleanup(void *preg)
+static void mm_name_like_cleanup(void *data)
 {
-	regfree(preg);
-	free(preg);
+	free(data);
 }
 
 static int mm_is_set_parser(const char *arg, void **bitnum)
@@ -229,28 +239,40 @@ static int mm_is_set_parser(const char *arg, void **bitnum)
 	return ret;
 }
 
-static int mm_is_set_score_function(const struct osl_row *row, void *bitnum)
+static int mm_is_set_score_function(__a_unused const char *path,
+		__a_unused const struct afs_info *afsi,
+		__a_unused const struct audio_format_info *afhi,
+		const void *data)
 {
-	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))
+	const unsigned char *bn = data;
+	if (afsi->attributes & (1ULL << *bn))
 		return 100;
 	return -100;
 }
 
-/* returns 1 if row matches score item, -1 otherwise */
+/* 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)
 {
-	int ret = 100;
+	struct afs_info afsi;
+	struct audio_format_info afhi;
+	char *path;
+	int ret;
 
 	*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 = get_afsi_of_row(row, &afsi);
+		if (ret< 0)
+			return ret;
+		ret = get_afhi_of_row(row, &afhi);
+		if (ret< 0)
+			return ret;
+		ret = get_audio_file_path_of_row(row, &path);
+		if (ret< 0)
+			return ret;
+		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 */
 	}
@@ -288,26 +310,21 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	return 1;
 }
 
+#define DEFINE_MOOD_METHOD(_name) \
+.parser = mm_ ## _name ## _parser, \
+.score_function = mm_ ## _name ## _score_function, \
+.name = #_name
+
+#define DEFINE_MOOD_METHOD_WITH_CLEANUP(_name) \
+	DEFINE_MOOD_METHOD(_name), \
+	.cleanup = mm_ ## _name ## _cleanup
+
 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
-}
+	{DEFINE_MOOD_METHOD(no_attributes_set)},
+	{DEFINE_MOOD_METHOD(played_rarely)},
+	{DEFINE_MOOD_METHOD(is_set)},
+	{DEFINE_MOOD_METHOD_WITH_CLEANUP(name_like)},
+	{.parser = NULL}
 };
 
 static void cleanup_list_entry(struct mood_item *item)
@@ -418,7 +435,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 {
@@ -760,7 +777,7 @@ static int add_if_admissible(struct osl_row *aft_row, void *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.
  *
@@ -832,7 +849,7 @@ 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.
  *