X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=46337f28f3f42145c54b6fbed34c8088b16e2222;hp=86e0eba22c0819ea657423ec7934cce959e92142;hb=5e54609eda6f4417e8b7042db59ecf47fd720751;hpb=f771887784c73ccfb3f00e775dcf241267a54ea7

diff --git a/mood.c b/mood.c
index 86e0eba2..46337f28 100644
--- a/mood.c
+++ b/mood.c
@@ -9,10 +9,10 @@
 #include <fnmatch.h>
 #include "para.h"
 #include "error.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
 #include "list.h"
-#include "string.h"
 
 /**
  * Contains statistical data of the currently admissible audio files.
@@ -36,11 +36,10 @@ 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.
+ * Each mood_method has its own mood_score_function. The first three parameters
+ * passed to that function are informations about the audio file whose score is
+ * to be computed. The data 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 inclusively.
  * Boolean score functions should always return either -100 or +100.
@@ -524,35 +523,6 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
 	return 1;
 }
 
-/*
- * Calls load_mood() and reverts its error value: It returns -E_MOOD_LOADED
- * on _success_, and 1 on errors. This way the loop over all moods stops at the
- * first valid mood.
- */
-static int load_mood_loop_func(struct osl_row *mood_row, void *data)
-{
-	struct mood **m = data;
-	int ret = load_mood(mood_row, m);
-	if (ret < 0) {
-		if (ret != -E_DUMMY_ROW)
-			PARA_NOTICE_LOG("invalid mood (%d), trying next mood\n", ret);
-		return 1;
-	}
-	return -E_MOOD_LOADED;
-}
-
-static int load_first_available_mood(struct mood **m)
-{
-	int ret = osl_rbtree_loop(moods_table, BLOBCOL_NAME, m,
-		load_mood_loop_func);
-	if (ret == -E_MOOD_LOADED) /* success */
-		return 1;
-	if (ret < 0)
-		return ret; /* error */
-	PARA_NOTICE_LOG("no valid mood found\n");
-	return -E_NO_MOOD;
-}
-
 static int check_mood(struct osl_row *mood_row, void *data)
 {
 	struct para_buffer *pb = data;
@@ -853,13 +823,13 @@ static int delete_from_statistics_and_score_table(const struct osl_row *aft_row)
  *
  * \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 */
@@ -878,15 +848,17 @@ 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;
@@ -920,7 +892,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);
 }
 
@@ -940,15 +912,27 @@ static void log_statistics(void)
 		(long long unsigned)int_sqrt(statistics.num_played_qd / n));
 }
 
+/**
+ * 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.
  *
@@ -966,14 +950,7 @@ int change_current_mood(char *mood_name)
 		.array = NULL
 	};
 
-	if (!mood_name) {
-		struct mood *m;
-		ret = load_first_available_mood(&m);
-		if (ret < 0)
-			return ret;
-		destroy_mood(current_mood);
-		current_mood = m;
-	} else if (*mood_name) {
+	if (mood_name) {
 		struct mood *m;
 		struct osl_row *row;
 		struct osl_object obj = {
@@ -988,10 +965,10 @@ int change_current_mood(char *mood_name)
 		ret = load_mood(row, &m);
 		if (ret < 0)
 			return ret;
-		destroy_mood(current_mood);
+		close_current_mood();
 		current_mood = m;
 	} else {
-		destroy_mood(current_mood);
+		close_current_mood();
 		current_mood = alloc_new_mood("dummy");
 	}
 	aa.m = current_mood;
@@ -1009,25 +986,11 @@ int change_current_mood(char *mood_name)
 			goto out;
 	}
 	PARA_NOTICE_LOG("score add complete\n");
-	ret = 1;
+	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 close_current_mood(void)
-{
-	destroy_mood(current_mood);
-	current_mood = NULL;
-	memset(&statistics, 0, sizeof(statistics));
-}
-
 /**
  * Close and re-open the current mood.
  *
@@ -1044,14 +1007,52 @@ void close_current_mood(void)
 int reload_current_mood(void)
 {
 	int ret;
-	char *mood_name;
+	char *mood_name = NULL;
 
+	PARA_NOTICE_LOG("reloading current mood\n");
 	if (!current_mood)
 		return 1;
-	score_shutdown(0);
-	mood_name = para_strdup(current_mood->name);
+	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;
+	}
+	return 1;
+}
+