/*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file mood.c Paraslash's mood handling functions. */
#include <fnmatch.h>
+#include <osl.h>
#include "para.h"
#include "error.h"
#include "string.h"
#include "afh.h"
#include "afs.h"
#include "list.h"
+#include "ipc.h"
/**
* Contains statistical data of the currently admissible audio files.
* 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.
+ * store a pointer to its structure via the void** pointer.
*
* \sa mood_open(), mood_cleanup_function, mood_score_function.
*/
-typedef int mood_parser(const char *, void **);
+typedef int mood_parser(int, char **, void **);
/**
* Deallocate resources which were allocated by the mood_parser.
* Used for scoring and to determine whether a file is admissible.
*/
struct mood_method {
- /* The name of the method. */
+ /** The name of the method. */
const char *name;
/** Pointer to the mood parser. */
mood_parser *parser;
return res;
}
-static int mm_no_attributes_set_parser(const char *arg, __a_unused void **ignored)
+static int mm_no_attributes_set_parser(int argc, __a_unused char **argv,
+ __a_unused void **ignored)
{
- if (arg && *arg)
- PARA_WARNING_LOG("ignored junk at eol: %s\n", arg);
- return 1;
+ return argc? -E_MOOD_SYNTAX : 1;
}
static int mm_no_attributes_set_score_function(__a_unused const char *path,
return -100;
}
-static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored)
+static int mm_played_rarely_parser(int argc, __a_unused char **argv,
+ __a_unused void **ignored)
{
- if (arg && *arg)
- PARA_WARNING_LOG("ignored junk at eol: %s\n", arg);
- return 1;
+ return argc? -E_MOOD_SYNTAX : 1;
}
-static int mm_name_like_score_function(const char *path,
+static int mm_path_matches_score_function(const char *path,
__a_unused const struct afs_info *afsi,
__a_unused const struct afh_info *afhi,
const void *data)
return 100;
}
-static int mm_name_like_parser(const char *arg, void **data)
+static int mm_path_matches_parser(int argc, char **argv, void **data)
{
- *data = para_strdup(arg);
+ if (argc != 1)
+ return -E_MOOD_SYNTAX;
+ *data = para_strdup(argv[1]);
return 1;
}
-static void mm_name_like_cleanup(void *data)
+static void mm_path_matches_cleanup(void *data)
{
free(data);
}
-static int mm_is_set_parser(const char *arg, void **bitnum)
+static int mm_is_set_parser(int argc, char **argv, void **bitnum)
{
- unsigned char *c = para_malloc(1);
- int ret = get_attribute_bitnum_by_name(arg, c);
+ int ret;
+ unsigned char c, *res;
- if (ret >= 0)
- *bitnum = c;
- else
- free(c);
- return ret;
+ if (argc != 1)
+ return -E_MOOD_SYNTAX;
+ ret = get_attribute_bitnum_by_name(argv[1], &c);
+ if (ret < 0)
+ return ret;
+ res = para_malloc(1);
+ *res = c;
+ *bitnum = res;
+ return 1;
}
static int mm_is_set_score_function(__a_unused const char *path,
{DEFINE_MOOD_METHOD(no_attributes_set)},
{DEFINE_MOOD_METHOD(played_rarely)},
{DEFINE_MOOD_METHOD(is_set)},
- {DEFINE_MOOD_METHOD_WITH_CLEANUP(name_like)},
+ {DEFINE_MOOD_METHOD_WITH_CLEANUP(path_matches)},
{.parser = NULL}
};
ML_SCORE
};
+/** Data passed to the parser of a mood line. */
struct mood_line_parser_data {
+ /** The mood this mood line belongs to. */
struct mood *m;
+ /** The line number in the mood definition. */
unsigned line_num;
};
{
struct mood_line_parser_data *mlpd = data;
char **argv;
- char *delim = " \t";
unsigned num_words;
char **w;
int i, ret;
enum mood_line_type mlt = ML_INVALID;
struct mood_item *mi = NULL;
- char *buf = para_strdup(mood_line);
mlpd->line_num++;
- num_words = split_args(buf, &argv, delim);
- ret = 1;
+ ret = create_argv(mood_line, " \t", &argv);
+ if (ret < 0)
+ return ret;
+ num_words = ret;
if (!num_words) /* empty line */
goto out;
w = argv;
w++;
if (!*w)
goto out;
- if (!strcmp(*w, "with")) {
- w++;
- if (!*w)
- goto out;
- }
+ if (strcmp(*w, "with"))
+ goto check_for_if;
+ w++;
+ if (!*w)
+ goto out;
+ if (strcmp(*w, "score"))
+ goto out;
}
if (mlt == ML_SCORE || !strcmp(*w, "score")) {
ret = -E_MOOD_SYNTAX;
w++;
if (!*w)
goto out;
+check_for_if:
if (!strcmp(*w, "if")) {
ret = -E_MOOD_SYNTAX;
w++;
ret = -E_MOOD_SYNTAX;
if (!mood_methods[i].parser)
goto out;
- w++;
- ret = mood_methods[i].parser(*w, &mi->parser_data);
+ ret = mood_methods[i].parser(num_words - 1 - (w - argv), w,
+ &mi->parser_data);
if (ret < 0)
goto out;
mi->method = &mood_methods[i];
(mlt == ML_DENY? "deny" : "score"), mi->method);
ret = 1;
out:
- free(argv);
- free(buf);
+ free_argv(argv);
if (ret >= 0)
return ret;
if (mi) {
osl_close_disk_object(&mood_def);
if (ret < 0) {
PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
- PARA_STRERROR(-ret));
+ para_strerror(-ret));
destroy_mood(mlpd.m);
return ret;
}
int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
if (ret < 0) {
- para_printf(pb, "failed to get mood definition\n");
+ para_printf(pb, "failed to get mood definition: %s\n",
+ para_strerror(-ret));
return ret;
}
if (!*mood_name) /* ignore dummy row */
goto out;
- para_printf(pb, "checking mood %s...\n", mood_name);
+ ret = para_printf(pb, "checking mood %s...\n", mood_name);
+ if (ret < 0)
+ goto out;
ret = for_each_line_ro(mood_def.data, mood_def.size,
parse_mood_line, &mlpd);
if (ret < 0)
para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
- PARA_STRERROR(-ret));
+ para_strerror(-ret));
out:
osl_close_disk_object(&mood_def);
- return 1;
+ return ret;
}
/**
* Check all moods for syntax errors.
*
+ * \param fd The afs socket.
* \param query Unused.
- * \param result: Contains check messages.
*/
-int mood_check_callback(__a_unused const struct osl_object *query,
- struct osl_object *result)
+void mood_check_callback(int fd, __a_unused const struct osl_object *query)
{
- struct para_buffer pb = {.buf = NULL};
+ struct para_buffer pb = {
+ .max_size = SHMMAX,
+ .private_data = &fd,
+ .max_size_handler = pass_buffer_as_shm
+ };
- para_printf(&pb, "checking moods...\n");
+ int ret = para_printf(&pb, "checking moods...\n");
+ if (ret < 0)
+ return;
osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
check_mood);
- result->data = pb.buf;
- result->size = pb.size;
- return 1;
+ if (pb.offset)
+ pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ free(pb.buf);
}
#if 0
.data = mood_name,
.size = strlen(mood_name) + 1
};
- ret = osl_get_row(moods_table, BLOBCOL_NAME, &obj, &row);
+ ret = osl(osl_get_row(moods_table, BLOBCOL_NAME, &obj, &row));
if (ret < 0) {
PARA_NOTICE_LOG("no such mood: %s\n", mood_name);
return ret;
int ret;
char *mood_name = NULL;
- PARA_NOTICE_LOG("reloading current mood\n");
if (!current_mood)
return 1;
+ PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
+ current_mood->name : "(dummy)");
if (current_mood->name)
mood_name = para_strdup(current_mood->name);
close_current_mood();
default:
return 1;
}
- return 1;
}
projects / paraslash.git / blobdiff