projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui.c: Change para command to "para_client --".
[paraslash.git]
/
mood.c
diff --git
a/mood.c
b/mood.c
index ce5c1c7e87fbd76d2ca3599309ce0eb3e0dbd691..0f907cc0d6ac204669400f0825d736cabbd06042 100644
(file)
--- a/
mood.c
+++ b/
mood.c
@@
-47,7
+47,7
@@
struct afs_statistics statistics;
* \sa struct mood_method, mood_parser.
*/
typedef int mood_score_function(const char *path, const struct afs_info *afsi,
* \sa struct mood_method, mood_parser.
*/
typedef int mood_score_function(const char *path, const struct afs_info *afsi,
- const struct a
udio_format
_info *afhi, const void *data);
+ const struct a
fh
_info *afhi, const void *data);
/**
* Pre-process a mood line.
/**
* Pre-process a mood line.
@@
-172,7
+172,7
@@
static int mm_no_attributes_set_parser(const char *arg, __a_unused void **ignore
static int mm_no_attributes_set_score_function(__a_unused const char *path,
const struct afs_info *afsi,
static int mm_no_attributes_set_score_function(__a_unused const char *path,
const struct afs_info *afsi,
- __a_unused const struct a
udio_format
_info *afhi,
+ __a_unused const struct a
fh
_info *afhi,
__a_unused const void *data)
{
if (!afsi->attributes)
__a_unused const void *data)
{
if (!afsi->attributes)
@@
-182,7
+182,7
@@
static int mm_no_attributes_set_score_function(__a_unused const char *path,
static int mm_played_rarely_score_function(__a_unused const char *path,
const struct afs_info *afsi,
static int mm_played_rarely_score_function(__a_unused const char *path,
const struct afs_info *afsi,
- __a_unused const struct a
udio_format
_info *afhi,
+ __a_unused const struct a
fh
_info *afhi,
__a_unused const void *data)
{
unsigned num;
__a_unused const void *data)
{
unsigned num;
@@
-203,9
+203,9
@@
static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored)
return 1;
}
return 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 afs_info *afsi,
- __a_unused const struct a
udio_format
_info *afhi,
+ __a_unused const struct a
fh
_info *afhi,
const void *data)
{
if (fnmatch(data, path, 0))
const void *data)
{
if (fnmatch(data, path, 0))
@@
-213,13
+213,13
@@
static int mm_name_like_score_function(const char *path,
return 100;
}
return 100;
}
-static int mm_
name_like
_parser(const char *arg, void **data)
+static int mm_
path_matches
_parser(const char *arg, void **data)
{
*data = para_strdup(arg);
return 1;
}
{
*data = para_strdup(arg);
return 1;
}
-static void mm_
name_like
_cleanup(void *data)
+static void mm_
path_matches
_cleanup(void *data)
{
free(data);
}
{
free(data);
}
@@
-238,7
+238,7
@@
static int mm_is_set_parser(const char *arg, void **bitnum)
static int mm_is_set_score_function(__a_unused const char *path,
__a_unused const struct afs_info *afsi,
static int mm_is_set_score_function(__a_unused const char *path,
__a_unused const struct afs_info *afsi,
- __a_unused const struct a
udio_format
_info *afhi,
+ __a_unused const struct a
fh
_info *afhi,
const void *data)
{
const unsigned char *bn = data;
const void *data)
{
const unsigned char *bn = data;
@@
-252,7
+252,7
@@
static int add_item_score(const struct osl_row *row, struct mood_item *item, lon
long *score_arg_sum)
{
struct afs_info afsi;
long *score_arg_sum)
{
struct afs_info afsi;
- struct a
udio_format
_info afhi;
+ struct a
fh
_info afhi;
char *path;
int ret;
char *path;
int ret;
@@
-320,7
+320,7
@@
static const struct mood_method mood_methods[] = {
{DEFINE_MOOD_METHOD(no_attributes_set)},
{DEFINE_MOOD_METHOD(played_rarely)},
{DEFINE_MOOD_METHOD(is_set)},
{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}
};
{.parser = NULL}
};
@@
-372,8
+372,11
@@
enum mood_line_type {
ML_SCORE
};
ML_SCORE
};
+/** Data passed to the parser of a mood line. */
struct mood_line_parser_data {
struct mood_line_parser_data {
+ /** The mood this mood line belongs to. */
struct mood *m;
struct mood *m;
+ /** The line number in the mood definition. */
unsigned line_num;
};
unsigned line_num;
};
@@
-419,11
+422,13
@@
static int parse_mood_line(char *mood_line, void *data)
w++;
if (!*w)
goto out;
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;
}
if (mlt == ML_SCORE || !strcmp(*w, "score")) {
ret = -E_MOOD_SYNTAX;
@@
-446,6
+451,7
@@
static int parse_mood_line(char *mood_line, void *data)
w++;
if (!*w)
goto out;
w++;
if (!*w)
goto out;
+check_for_if:
if (!strcmp(*w, "if")) {
ret = -E_MOOD_SYNTAX;
w++;
if (!strcmp(*w, "if")) {
ret = -E_MOOD_SYNTAX;
w++;
@@
-514,7
+520,7
@@
static int load_mood(const struct osl_row *mood_row, struct mood **m)
osl_close_disk_object(&mood_def);
if (ret < 0) {
PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
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;
}
destroy_mood(mlpd.m);
return ret;
}
@@
-542,7
+548,7
@@
static int check_mood(struct osl_row *mood_row, void *data)
parse_mood_line, &mlpd);
if (ret < 0)
para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
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;
out:
osl_close_disk_object(&mood_def);
return 1;
@@
-1007,9
+1013,10
@@
int reload_current_mood(void)
int ret;
char *mood_name = NULL;
int ret;
char *mood_name = NULL;
- PARA_NOTICE_LOG("reloading current mood\n");
if (!current_mood)
return 1;
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();
if (current_mood->name)
mood_name = para_strdup(current_mood->name);
close_current_mood();