#include "server.cmdline.h"
#include "server.h"
#include "vss.h"
-#include "db.h"
+#include "afs.h"
#include <mysql/mysql.h>
#include <mysql/mysql_version.h>
#include <regex.h>
const char *replacement;
};
-static struct para_macro macro_list[] = {
+static const struct para_macro mysql_macro_list[] = {
{ .name = "IS_N_SET",
.replacement = "(data.%s != '1')"
}, {
* \return \p NULL if one of the underlying calls to \p s_a_r returned \p NULL.
* Otherwise the completely expanded version of \p src is returned.
*/
-__must_check __malloc static char *s_a_r_list(struct para_macro *macro_list, char *src)
+__must_check __malloc static char *s_a_r_list(const struct para_macro *macro_list,
+ char *src)
{
- struct para_macro *mp = macro_list;
+ const struct para_macro *mp = macro_list;
char *ret = NULL, *tmp = para_strdup(src);
while (mp->name) {
return ret;
}
-/* get attributes by name. If verbose is not 0, get_a writes a string
- * into atts of the form 'att1="0",att2="1"', which is used in com_cam
- * for contructing a mysql update query.
- * never returns NULL in *NON VERBOSE* mode
+/*
+ * get attributes by name. If verbose is not 0, this function returns a string
+ * of the form 'att1="0",att2="1"'... which is used in com_cam() for
+ * constructing a mysql update query. Otherwise the space-separated list of all
+ * attributes which are set in the audio file given by name is returned. Never
+ * returns NULL in *NON VERBOSE* mode.
*/
static char *get_atts(char *name, int verbose)
{
char *atts = NULL, *buf, *ebn;
void *result = NULL, *result2 = NULL;
MYSQL_ROW row, row2;
- int i, ret;
- unsigned int num_fields;
+ int i;
+ unsigned num_fields;
- ret = -E_NOATTS;
result2 = get_all_attributes();
if (!result2)
goto out;
- ret = -E_ESCAPE;
- if (!(ebn = escaped_basename(name)))
+ ebn = escaped_basename(name);
+ if (!ebn)
goto out;
buf = make_message("select * from data where name='%s'", ebn);
free(ebn);
- ret = -E_NORESULT;
result = get_result(buf);
free(buf);
if (!result)
goto out;
- ret = -E_EMPTY_RESULT;
num_fields = mysql_num_fields(result);
if (num_fields < 5)
goto out;
mysql_data_seek(result2, 4); /* skip Lastplayed, Numplayed... */
row = mysql_fetch_row(result);
- ret = -E_NOROW;
if (!row)
goto out;
for (i = 4; i < num_fields; i++) {
if (verbose)
atts = para_strcat(atts, is_set? "=\"1\"" : "=\"0\"");
}
- ret = 1;
out:
if (result2)
mysql_free_result(result2);
continue;
arg = line + n;
if (!strcmp(command, "accept:")) {
- char *tmp2 = s_a_r_list(macro_list, arg);
+ char *tmp2 = s_a_r_list(mysql_macro_list, arg);
if (accept_opts)
accept_opts = para_strcat(
accept_opts, " or ");
continue;
}
if (!strcmp(command, "deny:")) {
- char *tmp2 = s_a_r_list(macro_list, arg);
+ char *tmp2 = s_a_r_list(mysql_macro_list, arg);
if (deny_opts)
deny_opts = para_strcat(deny_opts, " or ");
deny_opts = para_strcat(deny_opts, tmp2);
continue;
}
if (!score && !strcmp(command, "score:"))
- score = s_a_r_list(macro_list, arg);
+ score = s_a_r_list(mysql_macro_list, arg);
}
if (!score) {
- score = s_a_r_list(macro_list, conf.mysql_default_score_arg);
+ score = s_a_r_list(mysql_macro_list, conf.mysql_default_score_arg);
if (!score)
goto out;
}
return info;
}
-
/* might return NULL */
static char *get_current_audio_file(void)
{
return name;
}
+/* If called as child, mmd_lock must be held */
+static void update_mmd(char *info)
+{
+ PARA_DEBUG_LOG("%s", "updating shared memory area\n");
+ strncpy(mmd->selector_info, info, MMD_INFO_SIZE - 1);
+ mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
+}
+
+static void refresh_selector_info(void)
+{
+ char *name = get_current_audio_file();
+ char *info;
+
+ if (!name)
+ return;
+ info = get_selector_info(name);
+ free(name);
+ mmd_lock();
+ update_mmd(info);
+ mmd_unlock();
+ free(info);
+}
+
/* list attributes / print database info */
static int com_la_info(int fd, int argc, char *argv[])
{
char *name = NULL, *meta = NULL, *atts = NULL, *dir = NULL;
- int ret, com_la = strcmp(argv[0], "info");
+ int ret, la = strcmp(argv[0], "info");
if (argc < 2) {
ret = -E_GET_AUDIO_FILE;
meta = get_meta(name, 1);
atts = get_atts(name, 0);
dir = get_dir(name);
- if (com_la)
+ if (la)
ret = send_va_buffer(fd, "%s\n", atts);
else
ret = send_va_buffer(fd, "dir: %s\n" "%s\n" "attributes: %s\n",
*/
int com_snp(int fd, int argc, char *argv[])
{
- return com_set(fd, argc, argv);
+ int ret = com_set(fd, argc, argv);
+ if (ret >= 0)
+ refresh_selector_info();
+ return ret;
}
/*
return ret;
}
-/* If called as child, mmd_lock must be held */
-static void update_mmd(char *info)
-{
- PARA_DEBUG_LOG("%s", "updating shared memory area\n");
- strncpy(mmd->selector_info, info, MMD_INFO_SIZE - 1);
- mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
-}
-
static void update_audio_file_server_handler(char *name)
{
char *info;
return -E_ESCAPE;
ret = update_audio_file(argv[1]);
free(tmp);
+ if (ret >= 0)
+ refresh_selector_info();
return ret;
}
-static void refresh_selector_info(void)
-{
- char *name = get_current_audio_file();
- char *info;
-
- if (!name)
- return;
- info = get_selector_info(name);
- free(name);
- mmd_lock();
- update_mmd(info);
- mmd_unlock();
- free(info);
-}
-
/* select previous / next stream */
static int com_ps_ns(__a_unused int fd, int argc, char *argv[])
{
projects / paraslash.git / blobdiff