X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=56e19fed307459fb7fd487bfa82c02db7c7b2f8b;hp=6f952e65c1372b3a21ffba4819fd3bae34dbd2f5;hb=c2ac39f76d245816a919d94790672fb66e9a7253;hpb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b;ds=sidebyside

diff --git a/playlist.c b/playlist.c
index 6f952e65..56e19fed 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,8 +1,8 @@
 #include "para.h"
 #include "error.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "string.h"
 
 /** \file playlist.c Functions for loading and saving playlists. */
 
@@ -13,7 +13,7 @@ struct playlist_info {
 	/** The number of entries currently in the playlist. */
 	unsigned length;
 };
-static struct playlist_info playlist;
+static struct playlist_info current_playlist;
 
 /**
  * Re-insert an audio file into the tree of admissible files.
@@ -28,71 +28,60 @@ int playlist_update_audio_file(struct osl_row *aft_row)
 	return score_update(aft_row, 0);
 }
 
-static int add_playlist_entry(char *line, void *private_data)
+static int add_playlist_entry(char *path, void *data)
 {
+	struct playlist_info *playlist = data;
 	struct osl_row *aft_row;
-	struct playlist_info *pli = private_data;
-	int ret = aft_get_row_of_path(line, &aft_row);
+	int ret = aft_get_row_of_path(path, &aft_row);
 
 	if (ret < 0) {
-		PARA_NOTICE_LOG("path not found in audio file table: %s\n",
-			line);
+		PARA_NOTICE_LOG("%s: %s\n", path, PARA_STRERROR(-ret));
 		return 1;
 	}
-	ret = score_add(aft_row, -pli->length);
+	ret = score_add(aft_row, -playlist->length);
 	if (ret < 0) {
-		PARA_ERROR_LOG("failed to add %s: %d\n", line, ret);
+		PARA_ERROR_LOG("failed to add %s: %s\n", path, PARA_STRERROR(-ret));
 		return ret;
 	}
-	pli->length++;
+	playlist->length++;
 	return 1;
 }
 
-static int load_playlist(struct osl_row *row)
+/* returns -E_PLAYLIST_LOADED on _success_ to terminate the loop */
+static int load_playlist(struct osl_row *row, void *data)
 {
-	struct osl_object obj;
+	struct playlist_info *playlist = data;
+	struct osl_object playlist_def;
+	char *playlist_name;
 	int ret;
 
-	ret = osl_get_object(playlists_table, row, BLOBCOL_NAME, &obj);
-	if (ret < 0)
-		return ret;
-	playlist.name = para_strdup(obj.data);
-	playlist.length = 0;
-	ret = osl_open_disk_object(playlists_table, row, BLOBCOL_DEF, &obj);
+	ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def);
 	if (ret < 0)
 		goto err;
-	ret = for_each_line_ro(obj.data, obj.size, add_playlist_entry,
-		&playlist);
-	osl_close_disk_object(&obj);
+	playlist->length = 0;
+	ret = for_each_line_ro(playlist_def.data, playlist_def.size,
+		add_playlist_entry, playlist);
+	osl_close_disk_object(&playlist_def);
 	if (ret < 0)
 		goto err;
 	ret = -E_PLAYLIST_EMPTY;
-	if (!playlist.length)
+	if (!playlist->length)
 		goto err;
-	PARA_NOTICE_LOG("loaded playlist %s (%u files)\n", playlist.name,
-		playlist.length);
-	return 1;
-err:
-	free(playlist.name);
-	return ret;
-}
-
-/* returns -E_PLAYLIST_LOADED on _success_ to terminate the loop */
-static int playlist_loop(struct osl_row *row, __a_unused void *private_data)
-{
-	int ret = load_playlist(row);
-	if (ret < 0) {
-		if (ret != -E_DUMMY_ROW)
-			PARA_NOTICE_LOG("unable to load playlist, trying next\n");
-		return 1;
-	}
+	playlist->name = para_strdup(playlist_name);
+	PARA_NOTICE_LOG("loaded playlist %s (%u files)\n", playlist->name,
+		playlist->length);
 	return -E_PLAYLIST_LOADED;
+err:
+	if (ret != -E_DUMMY_ROW)
+		PARA_NOTICE_LOG("unable to load playlist (%s)\n",
+			PARA_STRERROR(-ret));
+	return 1;
 }
 
-static int load_first_available_playlist(void)
+static int load_first_available_playlist(struct playlist_info *playlist)
 {
-	int ret = osl_rbtree_loop(playlists_table, BLOBCOL_NAME, NULL,
-		playlist_loop);
+	int ret = osl_rbtree_loop(playlists_table, BLOBCOL_NAME, playlist,
+		load_playlist);
 	if (ret == -E_PLAYLIST_LOADED) /* success */
 		return 1;
 	if (ret < 0)
@@ -101,6 +90,59 @@ static int load_first_available_playlist(void)
 	return -E_NO_PLAYLIST;
 }
 
+static int check_playlist_path(char *path, void *data)
+{
+	struct para_buffer *pb = data;
+	struct osl_row *aft_row;
+	int ret = aft_get_row_of_path(path, &aft_row);
+
+	if (ret < 0)
+		para_printf(pb, "%s: %s\n", path, PARA_STRERROR(-ret));
+	return 1;
+}
+
+static int check_playlist(struct osl_row *row, void *data)
+{
+	struct para_buffer *pb = data;
+	struct osl_object playlist_def;
+	char *playlist_name;
+	int ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def);
+
+	if (ret < 0) {
+		para_printf(pb, "failed to get playlist data: %s\n",
+			PARA_STRERROR(-ret));
+		return 1;
+	}
+	if (*playlist_name) { /* skip dummy row */
+		para_printf(pb, "checking playlist %s...\n", playlist_name);
+		for_each_line_ro(playlist_def.data, playlist_def.size,
+			check_playlist_path, pb);
+	}
+	osl_close_disk_object(&playlist_def);
+	return 1;
+}
+
+/**
+ * Check the playlist table for inconsistencies.
+ *
+ * \param query Unused.
+ * \param result Contains messages about inconsistencies.
+ *
+ * \return The return value of the underlying call to osl_rbtree_loop().
+ */
+int playlist_check_callback(__a_unused const struct osl_object *query,
+		struct osl_object *result)
+{
+	struct para_buffer pb = {.buf = NULL};
+
+	para_printf(&pb, "checking playlists...\n");
+	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
+		check_playlist);
+	result->data = pb.buf;
+	result->size = pb.size;
+	return 1;
+}
+
 /**
  * Close the current playlist.
  *
@@ -108,8 +150,8 @@ static int load_first_available_playlist(void)
  */
 void playlist_close(void)
 {
-	free(playlist.name);
-	playlist.name = NULL;
+	free(current_playlist.name);
+	current_playlist.name = NULL;
 }
 
 /**
@@ -131,7 +173,7 @@ int playlist_open(char *name)
 	struct osl_row *row;
 
 	if (!name)
-		return load_first_available_playlist();
+		return load_first_available_playlist(&current_playlist);
 	obj.data = name;
 	obj.size = strlen(obj.data);
 	ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row);
@@ -139,5 +181,73 @@ int playlist_open(char *name)
 		PARA_NOTICE_LOG("failed to load playlist %s\n", name);
 		return ret;
 	}
-	return load_playlist(row);
+	ret = load_playlist(row, &current_playlist);
+	return (ret == -E_PLAYLIST_LOADED)? 1 : ret;
+}
+
+static int search_path(char *path, void *data)
+{
+	if (strcmp(path, data))
+		return 1;
+	return -E_PATH_FOUND;
+}
+
+static int handle_audio_file_event(enum afs_events event, void *data)
+{
+	int ret, was_admissible = 0, is_admissible;
+	struct osl_object playlist_def;
+	char *new_path;
+	const struct osl_row *row = data;
+
+	if (!current_playlist.name)
+		return 1;
+	if (event == AUDIO_FILE_RENAME) {
+		ret = row_belongs_to_score_table(row, NULL);
+		if (ret < 0)
+			return ret;
+		was_admissible = ret;
+	}
+	ret = get_audio_file_path_of_row(row, &new_path);
+	if (ret < 0)
+		return ret;
+	ret = pl_get_def_by_name(current_playlist.name, &playlist_def);
+	if (ret < 0)
+		return ret;
+	ret = for_each_line_ro(playlist_def.data, playlist_def.size,
+		search_path, new_path);
+	osl_close_disk_object(&playlist_def);
+	is_admissible = (ret < 0);
+	if (was_admissible && is_admissible)
+		return 1;
+	if (!was_admissible && !is_admissible)
+		return 1;
+	if (was_admissible && !is_admissible) {
+		current_playlist.length--;
+		return score_delete(row);
+	}
+	/* !was_admissible && is_admissible */
+	current_playlist.length++;
+	return score_add(row, 0); /* play it immediately */
+}
+
+int playlists_event_handler(enum afs_events event, struct para_buffer *pb,
+		void *data)
+{
+	int ret;
+
+	switch(event) {
+	case AUDIO_FILE_RENAME:
+	case AUDIO_FILE_ADD:
+		return handle_audio_file_event(event, data);
+	case AUDIO_FILE_REMOVE:
+		ret = row_belongs_to_score_table(data, NULL);
+		if (ret < 0)
+			return ret;
+		if (!ret)
+			return 1;
+		current_playlist.length--;
+		return score_delete(data);
+	default:
+		return 1;
+	}
 }