X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=4ea8641b2acce666e53d7005bd755ae2099cb07a;hb=4345aa176aecdbd9a876e7efdcc034acd29616a7;hp=0aa9c6ba7ac4588f1889bf4dda8ec52d3b9cf4d7;hpb=420a1f30cc06482f36371d096635846f8800e198;p=paraslash.git

diff --git a/aft.c b/aft.c
index 0aa9c6ba..4ea8641b 100644
--- a/aft.c
+++ b/aft.c
@@ -1362,23 +1362,60 @@ err:
 	return ret;
 }
 
+static int mop_loop(const char *arg, struct afs_callback_arg *aca,
+		struct ls_options *opts)
+{
+	int ret;
+	char *msg;
+
+	if (!arg || strcmp(arg, ".") == 0)
+		return score_loop(prepare_ls_row, NULL, opts);
+	if (!strncmp(arg, "m/", 2)) {
+		struct mood_instance *m;
+		ret = mood_load(arg + 2, &m, &msg);
+		if (ret < 0)
+			afs_error(aca, "%s", msg);
+		free(msg);
+		if (ret < 0)
+			return ret;
+		ret = mood_loop(m, prepare_ls_row, opts);
+		mood_unload(m);
+		return ret;
+	}
+	if (!strncmp(arg, "p/", 2)) {
+		struct playlist_instance *pi;
+		ret = playlist_load(arg + 2, &pi, &msg);
+		if (ret < 0)
+			afs_error(aca, "%s", msg);
+		free(msg);
+		if (ret < 0)
+			return ret;
+		ret = playlist_loop(pi, prepare_ls_row, opts);
+		playlist_unload(pi);
+		return ret;
+	}
+	afs_error(aca, "bad mood/playlist specifier: %s\n", arg);
+	return -ERRNO_TO_PARA_ERROR(EINVAL);
+}
+
 static int com_ls_callback(struct afs_callback_arg *aca)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
 	struct ls_options *opts = aca->query.data;
 	int i = 0, ret;
 	time_t current_time;
-	const struct lls_opt_result *r_r;
+	const struct lls_opt_result *r_r, *r_a;
 
 	ret = lls_deserialize_parse_result(
 		(char *)aca->query.data + sizeof(*opts), cmd, &opts->lpr);
 	assert(ret >= 0);
 	r_r = SERVER_CMD_OPT_RESULT(LS, REVERSE, opts->lpr);
-
+	r_a = SERVER_CMD_OPT_RESULT(LS, ADMISSIBLE, opts->lpr);
 	aca->pbout.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0;
-	if (admissible_only(opts))
-		ret = score_loop(prepare_ls_row, opts);
-	else
+	if (admissible_only(opts)) {
+		const char *arg = lls_string_val(0, r_a);
+		ret = mop_loop(arg, aca, opts);
+	} else
 		ret = osl(osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
 			prepare_ls_row));
 	if (ret < 0)