/*
- * Copyright (C) 1999-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1999-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/** \endcond */
#include "server.cmdline.h"
#include "server.h"
-#include "afs.h"
+#include "vss.h"
#include "db.h"
#include <mysql/mysql.h>
#include <mysql/mysql_version.h>
+#include <regex.h>
#include "error.h"
#include "net.h"
#include "string.h"
#include "user_list.h"
+#include "mysql_selector_command_list.h"
/** pointer to the shared memory area */
extern struct misc_meta_data *mmd;
static void *mysql_ptr = NULL;
-static int com_cam(int, int, char **);
-static int com_cdb(int, int, char **);
-static int com_cs(int, int, char **);
-static int com_da(int, int, char **);
-static int com_hist(int, int, char **);
-static int com_info(int, int, char **);
-static int com_laa(int, int, char **);
-static int com_last(int, int, char **);
-static int com_ls(int, int, char **);
-static int com_mbox(int, int, char **);
-static int com_mv(int, int, char **);
-static int com_na(int, int, char **);
-static int com_pic(int, int, char **);
-static int com_picch(int, int, char **);
-static int com_picdel(int, int, char **);
-static int com_piclist(int, int, char **);
-static int com_ps(int, int, char **);
-static int com_rm_ne(int, int, char **);
-static int com_sa(int, int, char **);
-static int com_set(int, int, char **);
-static int com_sl(int, int, char **);
-static int com_stradd_picadd(int, int, char **);
-static int com_streams(int, int, char **);
-static int com_strdel(int, int, char **);
-static int com_strq(int, int, char **);
-static int com_summary(int, int, char **);
-static int com_upd(int, int, char **);
-static int com_us(int, int, char **);
-static int com_verb(int, int, char **);
-static int com_vrfy(int, int, char **);
-
-static struct server_command cmds[] = {
-{
-.name = "cam",
-.handler = com_cam,
-.perms = DB_READ|DB_WRITE,
-.description = "copy all metadata",
-.synopsis = "cam source dest1 [dest2 ...]",
-.help =
-
-"Copy attributes and other meta data from source file to destination\n"
-"file(s). Useful for files that have been renamed.\n"
-
-},
-{
-.name = "cdb",
-.handler = com_cdb,
-.perms = DB_READ|DB_WRITE,
-.description = "create database",
-.synopsis = "cdb [name]",
-.help =
-
-"\tCreate database name containing the initial columns for basic\n"
-"\tinteroperation with server. This command has to be used only once\n"
-"\twhen you use the mysql audio file selector for the very first time.\n"
-"\n"
-"\tThe optional name defaults to 'paraslash' if not given.\n"
-
-},
-{
-.name = "clean",
-.handler = com_vrfy,
-.perms = DB_READ | DB_WRITE,
-.description = "nuke invalid entries in database",
-.synopsis = "clean",
-.help =
-
-"If the vrfy command shows you any invalid entries in your database,\n"
-"you can get rid of them with clean. Always run 'upd' and 'vrfy'\n"
-"before running this command. Use with caution!\n"
-
-},
-{
-.name = "cs",
-.handler = com_cs,
-.perms = AFS_WRITE | DB_READ | DB_WRITE,
-.description = "change stream",
-.synopsis = "cs [s]",
-.help =
-
-"Selects stream s or prints current stream when s was not given.\n"
-
-},
-{
-.name = "csp",
-.handler = com_cs,
-.perms = AFS_WRITE | DB_READ,
-.description = "change stream and play",
-.synopsis = "csp s",
-.help =
-
-"Select stream s and start playing. If this results in a stream-change,\n"
-"skip rest of current audio file.\n"
-
-},
-{
-.name = "da",
-.handler = com_da,
-.perms = DB_READ | DB_WRITE,
-.description = "drop attribute from database",
-.synopsis = "da att",
-.help =
-
-"Use with caution. All info on attribute att will be lost.\n"
-
-},
-{
-.name = "hist",
-.handler = com_hist,
-.perms = DB_READ,
-.description = "print history",
-.synopsis = "hist",
-.help =
-
-"Print list of all audio files together with number of days since each\n"
-"file was last played.\n"
-
-},
-{
-.name = "info",
-.handler = com_info,
-.perms = DB_READ,
-.description = "print database info",
-.synopsis = "info [af]",
-.help =
-
-"print database informations for audio file af. Current audio file is\n"
-"used if af is not given.\n"
-
-},
-{
-.name = "la",
-.handler = com_info,
-.perms = DB_READ,
-.description = "list attributes",
-.synopsis = "la [af]",
-.help =
-
-"List attributes of audio file af or of current audio file when invoked\n"
-"without arguments.\n"
-
-},
-{
-.name = "laa",
-.handler = com_laa,
-.perms = DB_READ,
-.description = "list available attributes",
-.synopsis = "laa",
-.help =
-
-"What should I say more?\n"
-
-},
-{
-.name = "last",
-.handler = com_last,
-.perms = DB_READ,
-.description = "print list of audio files, ordered by lastplayed time",
-.synopsis = "last [n]",
-.help =
-
-"The optional number n defaults to 10 if not specified.\n"
-
-},
-{
-.name = "ls",
-.handler = com_ls,
-.perms = DB_READ,
-.description = "list all audio files that match a LIKE pattern",
-.synopsis = "ls [pattern]",
-.help =
-
-"\tIf pattern was not given, print list of all audio files known\n"
-"\tto the mysql selector. See the documentation of mysql\n"
-"\tfor the definition of LIKE patterns.\n"
-
-},
-{
-.name = "mbox",
-.handler = com_mbox,
-.perms = DB_READ,
-.description = "dump audio file list in mbox format",
-.synopsis = "mbox [p]",
-.help =
-
-"\tDump list of audio files in mbox format (email) to stdout. If\n"
-"\tthe optional pattern p is given, only those audio files,\n"
-"\twhose basename match p are going to be included. Otherwise,\n"
-"\tall files are selected.\n"
-"\n"
-"EXAMPLE\n"
-"\tThe mbox command can be used together with your favorite\n"
-"\tmailer (this example uses mutt) for browsing the audio file\n"
-"\tcollection:\n"
-"\n"
-"\t\tpara_client mbox > ~/para_mbox\n"
-"\n"
-"\t\tmutt -F ~/.muttrc.para -f ~/para_mbox\n"
-"\n"
-"\tFor playlists, you can use mutt's powerful pattern matching\n"
-"\tlanguage to select files. If you like to tag all files\n"
-"\tcontaining the pattern 'foo', type 'T', then '~s foo'.\n"
-"\n"
-"\tWhen ready with the list, type ';|' (i.e., hit the semicolon\n"
-"\tkey to apply the next mutt command to all tagged messages,\n"
-"\tthen the pipe key) to pipe the selected \"mails\" to a\n"
-"\tsuitable script which adds a paraslash stream where exactly\n"
-"\tthese files are admissable or does whatever thou wilt.\n"
-
-},
-{
-.name = "mv",
-.handler = com_mv,
-.perms = DB_READ | DB_WRITE,
-.description = "rename entry in database",
-.synopsis = "mv oldname newname",
-.help =
-
-"Rename oldname to newname. This updates the data table to reflect the\n"
-"new name. All internal data (numplayed, lastplayed, picid,..) is kept.\n"
-"If newname is a full path, the dir table is updated as well.\n"
-
-},
-{
-.name = "na",
-.handler = com_na,
-.perms = DB_READ | DB_WRITE,
-.description = "add new attribute to database",
-.synopsis = "na att",
-.help =
-
-"This adds a column named att to your mysql database. att should only\n"
-"contain letters and numbers, in paricular, '+' and '-' are not allowed.\n"
-
-},
-{
-.name = "ne",
-.handler = com_rm_ne,
-.perms = DB_READ | DB_WRITE,
-.description = "add new database entries",
-.synopsis = "ne file1 [file2 [...]]",
-.help =
-
-"Add the given filename(s) to the database, where file1,... must\n"
-"be full path names. This command might be much faster than 'upd'\n"
-"if the number of given files is small.\n"
-
-},
-{
-.name = "ns",
-.handler = com_ps,
-.perms = AFS_WRITE | DB_READ | DB_WRITE,
-.description = "change to next stream",
-.synopsis = "ns",
-.help =
-
-"Cycle forwards through stream list.\n"
-
-},
-{
-.name = "pic",
-.handler = com_pic,
-.perms = DB_READ,
-.description = "get picture by name or by identifier",
-.synopsis = "pic [name]",
-.help =
-
-"\tDump jpg image that is associated to given audio file (current\n"
-"\taudio file if not specified) to stdout. If name starts with\n"
-"\t'#' it is interpreted as an identifier instead and the picture\n"
-"\thaving that identifier is dumped to stdout.\n"
-"\n"
-"EXAMPLE\n"
-"\n"
-"\tpara_client pic '#123' > pic123.jpg\n"
-
-},
-{
-.name = "picadd",
-.handler = com_stradd_picadd,
-.perms = DB_READ | DB_WRITE,
-.description = "add picture to database",
-.synopsis = "picadd [picname]",
-.help =
-
-"\tRead jpeg file from stdin and store it as picname in database.\n"
-"\n"
-"EXAMPLE\n"
-"\n"
-"\tpara_client picadd foo.jpg < foo.jpg\n"
-
-},
-{
-.name = "picass",
-.handler = com_set,
-.perms = DB_READ | DB_WRITE,
-.description = "associate a picture to file(s)",
-.synopsis = "picass pic_id file1 [file2...]",
-.help =
-
-"Associate the picture given by pic_id to all given files.\n"
-
-},
-{
-.name = "picch",
-.handler = com_picch,
-.perms = DB_READ | DB_WRITE,
-.description = "change name of picture",
-.synopsis = "picch id new_name",
-.help =
-
-"Asign new_name to picture with identifier id.\n"
-
-},
-{
-.name = "picdel",
-.handler = com_picdel,
-.perms = DB_READ | DB_WRITE,
-.description = "delete picture from database",
-.synopsis = "picdel id1 [id2...]",
-.help =
-
-"Delete each given picture from database.\n"
-
-},
-{
-.name = "piclist",
-.handler = com_piclist,
-.perms = DB_READ,
-.description = "print list of pictures",
-.synopsis = "piclist",
-.help =
-
-"Print id, name and length of each picture contained in the database.\n"
-
-},
-{
-.name = "ps",
-.handler = com_ps,
-.perms = AFS_WRITE | DB_READ | DB_WRITE,
-.description = "change to previous stream",
-.synopsis = "ps",
-.help =
-
-"Cycle backwards through stream list.\n"
-
-},
-{
-.name = "rm",
-.handler = com_rm_ne,
-.perms = DB_READ | DB_WRITE,
-.description = "remove entries from database",
-.synopsis = "rm name1 [name2 [...]]",
-.help =
-
-"Remove name1, name2, ... from the data table. Use with caution\n"
-
-},
-{
-.name = "sa",
-.handler = com_sa,
-.perms = DB_READ | DB_WRITE,
-.description = "set/unset attributes",
-.synopsis = "sa at1<'+' | '-'> [at2<'+' | '-'> ] [af1 ...]",
-//.synopsis = "foo",
-.help =
-
-"Set ('+') or unset ('-') attribute at1, at2 etc. for given list of\n"
-"audio files. If no audio files were given the current audio file is\n"
-"used. Example:\n"
-"\n"
-"sa rock+ punk+ classic- LZ__Waldsterben.mp3\n"
-"\n"
-"sets the 'rock' and the 'punk' attribute but unsets the 'classic'\n"
-"attribute.\n"
-
-},
-{
-.name = "skip",
-.handler = com_sl,
-.perms = DB_READ | DB_WRITE,
-.description = "skip subsequent audio files(s)",
-.synopsis = "skip n [s]",
-.help =
-
-"Skip the next n audio files of stream s. This is equivalent to the\n"
-"command 'sl n s', followed by 'us name' for each name the output of sl.\n"
-
-},
-{
-.name = "sl",
-.handler = com_sl,
-.perms = DB_READ,
-.description = "print score list",
-.synopsis = "sl n [s]",
-.help =
-
-"Print sorted list of maximal n lines. Each line is an admissible entry\n"
-"with respect to stream s. The list is sorted by score-value which is\n"
-"given by the definition of s. If s is not given, the current stream\n"
-"is used. Example:\n"
-"\n"
-" sl 1\n"
-"\n"
-"shows you the audio file the server would select right now.\n"
-
-},
-{
-.name = "snp",
-.handler = com_set,
-.perms = DB_READ | DB_WRITE,
-.description = "set numplayed",
-.synopsis = "snp number af1 [af2 ...]",
-.help =
-
-"Update the numplayed field in the data table for all given audio files.\n"
-
-},
-{
-.name = "stradd",
-.handler = com_stradd_picadd,
-.perms = DB_READ | DB_WRITE,
-.description = "add stream",
-.synopsis = "stradd s",
-.help =
-
-"Add stream s to the list of available streams. The stream definition\n"
-"for s is read from stdin and is then sent to para_server. Example:\n"
-"\n"
-" echo 'deny: NAME_LIKE(%Madonna%)' | para_client stradd no_madonna\n"
-"\n"
-"adds the new stream 'no_madonna' to the list of available streams. A given\n"
-"audio file is admissible for this stream iff its basename does not contain the\n"
-"string 'Madonna'.\n"
-
-
-},
-{
-.name = "strdel",
-.handler = com_strdel,
-.perms = DB_READ | DB_WRITE,
-.description = "delete stream",
-.synopsis = "strdel s",
-.help =
-
-"Remove stream s from database.\n"
-
-},
-{
-.name = "streams",
-.handler = com_streams,
-.perms = DB_READ,
-.description = "list streams",
-.synopsis = "streams",
-.help =
-
-"Print list of available streams. Use 'cs' to switch to any of these.\n"
-
-},
-{
-.name = "strq",
-.handler = com_strq,
-.perms = DB_READ,
-.description = "query stream definition",
-.synopsis = "strq [s]",
-.help =
-
-"Print definition of stream s to stdout. Use current stream if s was\n"
-"not given.\n"
-
-},
-{
-.name = "summary",
-.handler = com_summary,
-.perms = DB_READ,
-.description = "list attributes",
-.synopsis = "summary",
-.help =
-
-"\tPrint a list of attributes together with number of audio\n"
-"\tfiles having that attribute set.\n"
-
-},
-{
-.name = "upd",
-.handler = com_upd,
-.perms = DB_READ | DB_WRITE,
-.description = "update database",
-.synopsis = "upd",
-.help =
-
-"This command uses the --audio_file_dir option of para_server to locate\n"
-"your audio files. New files are then added to the mysql database. Use\n"
-"this command if you got new files or if you have moved some files\n"
-"around.\n"
-
-},
-{
-.name = "us",
-.handler = com_us,
-.perms = DB_READ | DB_WRITE,
-.description = "update lastplayed time",
-.synopsis = "us name",
-.help =
-
-"Update lastplayed time without actually playing the thing.\n"
-
-},
-{
-.name = "verb",
-.handler = com_verb,
-.perms = DB_READ | DB_WRITE,
-.description = "send verbatim sql query",
-.synopsis = "verb cmd",
-.help =
-
-"Send cmd to mysql server. For expert/debugging only. Note that cmd\n"
-"usually must be escaped. Use only if you know what you are doing!\n"
-
-},
-{
-.name = "vrfy",
-.handler = com_vrfy,
-.perms = DB_READ,
-.description = "list invalid entries in database",
-.synopsis = "vrfy",
-.help =
-
-"Show what clean would delete. Run 'upd' before this command to make\n"
-"sure your database is up to date.\n"
-
-},
-{
-.name = NULL,
-}
+/**
+ * contains name/replacement pairs used by s_a_r_list()
+ *
+ * \sa s_a_r()
+ */
+struct para_macro {
+ /** the name of the macro */
+ const char *name;
+ /** the replacement text */
+ const char *replacement;
};
static struct para_macro macro_list[] = {
}
};
+/**
+ * simple search and replace routine
+ *
+ * \param src source string
+ * \param macro_name the name of the macro
+ * \param replacement the replacement format string
+ *
+ * In \p src, replace each occurence of \p macro_name(arg) by the string
+ * determined by the \p replacement format string. \p replacement may (but
+ * needs not) contain a single string conversion specifier (%s) which gets
+ * replaced by \p arg.
+ *
+ * \return A string in which all matches in \p src are replaced, or \p NULL if
+ * an syntax error was encountered. Caller must free the result.
+ *
+ * \sa regcomp(3)
+ */
+__must_check __malloc static char *s_a_r(const char *src, const char* macro_name,
+ const char *replacement)
+{
+ regex_t preg;
+ size_t nmatch = 1;
+ regmatch_t pmatch[1];
+ int eflags = 0;
+ char *dest = NULL;
+ const char *bufptr = src;
+
+ if (!macro_name || !replacement || !src)
+ return para_strdup(src);
+ regcomp(&preg, macro_name, 0);
+ while (regexec(&preg, bufptr, nmatch, pmatch, eflags)
+ != REG_NOMATCH) {
+ char *tmp, *arg, *o_bracket, *c_bracket;
+
+ o_bracket = strchr(bufptr + pmatch[0].rm_so, '(');
+ c_bracket = o_bracket? strchr(o_bracket, ')') : NULL;
+ if (!c_bracket)
+ goto out;
+ tmp = para_strdup(bufptr);
+ tmp[pmatch[0].rm_so] = '\0';
+ dest = para_strcat(dest, tmp);
+ free(tmp);
+
+ arg = para_strdup(o_bracket + 1);
+ arg[c_bracket - o_bracket - 1] = '\0';
+ tmp = make_message(replacement, arg);
+ free(arg);
+ dest = para_strcat(dest, tmp);
+ free(tmp);
+ bufptr = c_bracket;
+ bufptr++;
+ }
+ dest = para_strcat(dest, bufptr);
+// PARA_DEBUG_LOG("%s: returning %s\n", __func__, dest);
+out:
+ regfree(&preg);
+ return dest;
+}
+
+/**
+ * replace a string according to a list of macros
+ *
+ * \param macro_list the array containing a macro/replacement pairs.
+ * \param src the source string
+ *
+ * This function just calls s_a_r() for each element of \p macro_list.
+ *
+ * \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)
+{
+ struct para_macro *mp = macro_list;
+ char *ret = NULL, *tmp = para_strdup(src);
+
+ while (mp->name) {
+ ret = s_a_r(tmp, mp->name, mp->replacement);
+ free(tmp);
+ if (!ret) /* syntax error */
+ return NULL;
+ tmp = ret;
+ mp++;
+ }
+ //PARA_DEBUG_LOG("%s: returning %s\n", __func__, dest);
+ return ret;
+}
+
static int real_query(const char *query)
{
if (!mysql_ptr)
/*
* new attribute
*/
-static int com_na(__a_unused int fd, int argc, char *argv[])
+int com_na(__a_unused int fd, int argc, char *argv[])
{
char *q, *tmp;
int ret;
/*
* delete attribute
*/
-static int com_da(__a_unused int fd, int argc, char *argv[])
+int com_da(__a_unused int fd, int argc, char *argv[])
{
char *q, *tmp;
int ret;
return ret;
}
+/* stradd */
+int com_stradd(int fd, int argc, char *argv[])
+{
+ return com_stradd_picadd(fd, argc, argv);
+}
+
+/* pic_add */
+int com_picadd(int fd, int argc, char *argv[])
+{
+ return com_stradd_picadd(fd, argc, argv);
+}
+
/*
* print results to fd
*/
/*
* verbatim
*/
-static int com_verb(int fd, int argc, char *argv[])
+int com_verb(int fd, int argc, char *argv[])
{
void *result = NULL;
int ret;
/*
* list all attributes
*/
-static int com_laa(int fd, int argc, __a_unused char *argv[])
+int com_laa(int fd, int argc, __a_unused char *argv[])
{
void *result;
int ret;
/*
* history
*/
-static int com_hist(int fd, int argc, char *argv[]) {
+int com_hist(int fd, int argc, char *argv[]) {
int ret;
void *result = NULL;
char *q, *atts;
/*
* get last num audio files
*/
-static int com_last(int fd, int argc, char *argv[])
+int com_last(int fd, int argc, char *argv[])
{
void *result = NULL;
char *q;
return ret;
}
-static int com_mbox(int fd, int argc, char *argv[])
+int com_mbox(int fd, int argc, char *argv[])
{
void *result;
MYSQL_ROW row;
*/
static char *get_selector_info(char *name)
{
- char *meta = NULL, *atts = NULL, *info, *dir = NULL, *query, *stream = NULL;
+ char *meta, *atts, *info, *dir, *query, *stream;
void *result = NULL;
MYSQL_ROW row = NULL;
stream, meta,
(result && row && row[0])? row[0] : "(no score)",
atts);
- if (dir)
- free(dir);
- if (meta)
- free(meta);
- if (atts)
- free(atts);
- if (stream)
- free(stream);
+ free(dir);
+ free(meta);
+ free(atts);
+ free(stream);
if (result)
mysql_free_result(result);
return info;
return name;
}
-
-/* print database info */
-static int com_info(int fd, int argc, char *argv[])
+/* 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");
return ret;
}
+/* list attributes */
+int com_la(int fd, int argc, char *argv[])
+{
+ return com_la_info(fd, argc, argv);
+}
+
+/* print database info */
+int com_info(int fd, int argc, char *argv[])
+{
+ return com_la_info(fd, argc, argv);
+}
+
static int change_stream(const char *stream)
{
char *query;
return 1;
}
+/*
+ * rm
+ */
+int com_rm(int fd, int argc, char *argv[])
+{
+ return com_rm_ne(fd, argc, argv);
+}
+
+/*
+ * ne
+ */
+int com_ne(int fd, int argc, char *argv[])
+{
+ return com_ne(fd, argc, argv);
+}
+
/*
* mv: rename entry
*/
-static int com_mv(__a_unused int fd, int argc, char *argv[])
+int com_mv(__a_unused int fd, int argc, char *argv[])
{
char *q, *dn, *ebn1 = NULL, *ebn2 = NULL, *edn = NULL;
int ret;
}
/*
- * picass: associate pic to audio file
- * snp: set numplayed
+ * set field
*/
static int com_set(__a_unused int fd, int argc, char *argv[])
{
return 1;
}
+/*
+ * snp: set numplayed
+ */
+int com_picass(int fd, int argc, char *argv[])
+{
+ return com_set(fd, argc, argv);
+}
+
+/*
+ * snp: set numplayed
+ */
+int com_snp(int fd, int argc, char *argv[])
+{
+ return com_set(fd, argc, argv);
+}
+
/*
* picch: change entry's name in pics table
*/
-static int com_picch(__a_unused int fd, int argc, char *argv[])
+int com_picch(__a_unused int fd, int argc, char *argv[])
{
int ret;
long unsigned id;
/*
* piclist: print list of pics in db
*/
-static int com_piclist(__a_unused int fd, int argc, __a_unused char *argv[])
+int com_piclist(__a_unused int fd, int argc, __a_unused char *argv[])
{
void *result = NULL;
MYSQL_ROW row;
/*
* picdel: delete picture from database
*/
-static int com_picdel(int fd, int argc, char *argv[])
+int com_picdel(int fd, int argc, char *argv[])
{
char *q;
long unsigned id;
/*
* pic: get picture by name or by number
*/
-static int com_pic(int fd, int argc, char *argv[])
+int com_pic(int fd, int argc, char *argv[])
{
void *result = NULL;
MYSQL_ROW row;
}
/* strdel */
-static int com_strdel(__a_unused int fd, int argc, char *argv[])
+int com_strdel(__a_unused int fd, int argc, char *argv[])
{
char *q, *tmp;
int ret;
/*
* ls
*/
-static int com_ls(int fd, int argc, char *argv[])
+int com_ls(int fd, int argc, char *argv[])
{
char *q;
void *result;
/*
* summary
*/
-static int com_summary(__a_unused int fd, int argc, __a_unused char *argv[])
+int com_summary(__a_unused int fd, int argc, __a_unused char *argv[])
{
MYSQL_ROW row;
MYSQL_ROW row2;
update_audio_file(name);
}
-static int com_us(__a_unused int fd, int argc, char *argv[])
+int com_us(__a_unused int fd, int argc, char *argv[])
{
char *tmp;
int ret;
free(info);
}
-/* select previous/next stream */
-static int com_ps(__a_unused int fd, int argc, char *argv[])
+/* select previous / next stream */
+static int com_ps_ns(__a_unused int fd, int argc, char *argv[])
{
char *query, *stream = get_current_stream();
void *result = get_result("select name from streams");
return ret;
}
+/* select previous stream */
+int com_ps(int fd, int argc, char *argv[])
+{
+ return com_ps_ns(fd, argc, argv);
+}
+
+/* select next stream */
+int com_ns(int fd, int argc, char *argv[])
+{
+ return com_ps_ns(fd, argc, argv);
+}
+
/* streams */
-static int com_streams(int fd, int argc, __a_unused char *argv[])
+int com_streams(int fd, int argc, __a_unused char *argv[])
{
unsigned int num_rows;
int i, ret = -E_NORESULT;
}
/* query stream definition */
-static int com_strq(int fd, int argc, char *argv[])
+int com_strq(int fd, int argc, char *argv[])
{
MYSQL_ROW row;
char *query, *name;
}
/* change stream / change stream and play */
-static int com_cs(int fd, int argc, char *argv[])
+static int com_cs_csp(int fd, int argc, char *argv[])
{
int ret, stream_change;
char *query, *stream = NULL;
}
if (csp) {
mmd_lock();
- mmd->new_afs_status_flags |= AFS_PLAYING;
+ mmd->new_vss_status_flags |= VSS_PLAYING;
if (stream_change)
- mmd->new_afs_status_flags |= AFS_NEXT;
+ mmd->new_vss_status_flags |= VSS_NEXT;
mmd_unlock();
}
ret = 1;
return ret;
}
-/*
- * sl/skip
- */
-static int com_sl(int fd, int argc, char *argv[])
+/* change stream */
+int com_cs(int fd, int argc, char *argv[])
+{
+ return com_cs_csp(fd, argc, argv);
+}
+
+/* change stream and play */
+int com_csp(int fd, int argc, char *argv[])
+{
+ return com_cs_csp(fd, argc, argv);
+}
+
+/* score list / skip */
+static int com_sl_skip(int fd, int argc, char *argv[])
{
void *result = NULL;
MYSQL_ROW row;
return ret;
}
+/* score list */
+int com_sl(int fd, int argc, char *argv[])
+{
+ return com_sl_skip(fd, argc, argv);
+}
+
+/* skip */
+int com_skip(int fd, int argc, char *argv[])
+{
+ return com_sl_skip(fd, argc, argv);
+}
+
/*
* update attributes of name
*/
/*
* set attributes
*/
-static int com_sa(int fd, int argc, char *argv[])
+int com_sa(int fd, int argc, char *argv[])
{
int i, ret;
char *atts = NULL, *name;
/*
* copy attributes
*/
-static int com_cam(int fd, int argc, char *argv[])
+int com_cam(int fd, int argc, char *argv[])
{
char *name = NULL, *meta = NULL, *atts = NULL;
int i, ret;
/*
* verify / clean
*/
-static int com_vrfy(int fd, int argc, __a_unused char *argv[])
+static int com_vrfy_clean(int fd, int argc, __a_unused char *argv[])
{
char *query;
int ret, vrfy_mode = strcmp(argv[0], "clean");
return ret;
}
+/*
+ * verify
+ */
+int com_vrfy(int fd, int argc, char **argv)
+{
+ return com_vrfy_clean(fd, argc, argv);
+}
+
+/*
+ * clean
+ */
+int com_clean(int fd, int argc, char **argv)
+{
+ return com_vrfy_clean(fd, argc, argv);
+}
+
static FILE *out_file;
static int mysql_write_tmp_file(const char *dir, const char *name)
/*
* update database
*/
-static int com_upd(int fd, int argc, __a_unused char *argv[])
+int com_upd(int fd, int argc, __a_unused char *argv[])
{
char *tempname = NULL, *query = NULL;
int ret, out_fd = -1, num = 0;
}
/* create database */
-static int com_cdb(int fd, int argc, char *argv[])
+int com_cdb(int fd, int argc, char *argv[])
{
char *query;
int ret;
/**
* the init function of the mysql-based audio file selector
*
- * Check the command line options and initialize all function pointers of \a db.
- * Connect to the mysql server and initialize the info string.
+ * \param db pointer to the struct to initialize
+ *
+ * Check the command line options and initialize all function pointers of \a
+ * db. Connect to the mysql server and initialize the info string.
+ *
+ * \return This function returns success even if it could not connect
+ * to the mysql server. This is because the connect is expected to fail
+ * if there the paraslash database is not yet created. This gives the
+ * user a chance to send the "cdb" to create the database.
*
* \sa struct audio_file_selector, misc_meta_data::selector_info,
* random_selector.c
if (!conf.mysql_audio_file_dir_given)
return -E_NO_AF_DIR;
db->name = "mysql";
- db->cmd_list = cmds;
+ db->cmd_list = mysql_selector_cmds;
db->get_audio_file_list = server_get_audio_file_list;
db->update_audio_file = update_audio_file_server_handler;
db->shutdown = shutdown_connection;
projects / paraslash.git / blobdiff