/** \file afs.c Paraslash's audio file selector. */
+#include <regex.h>
#include <signal.h>
#include <fnmatch.h>
#include <openssl/rc4.h>
+#include <osl.h>
#include "server.cmdline.h"
#include "para.h"
#include "sched.h"
#include "signal.h"
#include "fd.h"
+#include "mood.h"
/** The osl tables used by afs. \sa blob.c. */
enum afs_table_num {
};
static struct afs_table afs_tables[NUM_AFS_TABLES] = {
- [TBLNUM_AUDIO_FILES] = {.init = aft_init},
- [TBLNUM_ATTRIBUTES] = {.init = attribute_init},
- [TBLNUM_SCORES] = {.init = score_init},
- [TBLNUM_MOODS] = {.init = moods_init},
- [TBLNUM_LYRICS] = {.init = lyrics_init},
- [TBLNUM_IMAGES] = {.init = images_init},
- [TBLNUM_PLAYLIST] = {.init = playlists_init},
+ [TBLNUM_AUDIO_FILES] = {.init = aft_init, .name = "audio_files"},
+ [TBLNUM_ATTRIBUTES] = {.init = attribute_init, .name = "attributes"},
+ [TBLNUM_SCORES] = {.init = score_init, .name = "scores"},
+ [TBLNUM_MOODS] = {.init = moods_init, .name = "moods"},
+ [TBLNUM_LYRICS] = {.init = lyrics_init, .name = "lyrics"},
+ [TBLNUM_IMAGES] = {.init = images_init, .name = "images"},
+ [TBLNUM_PLAYLIST] = {.init = playlists_init, .name = "playlists"},
};
struct command_task {
static enum play_mode current_play_mode;
static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
-
/**
* A random number used to "authenticate" the connection.
*
struct pattern_match_data *pmd = data;
struct osl_object name_obj;
const char *p, *name;
- int ret = osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj);
+ int ret = osl(osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj));
const char *pattern_txt = (const char *)pmd->patterns.data;
if (ret < 0)
*
* \param pmd Describes what to match and how.
*
- * \return The return value of the underlying call to osl_rbtree_loop()
- * or osl_rbtree_loop_reverse().
+ * \return Standard.
*/
int for_each_matching_row(struct pattern_match_data *pmd)
{
if (pmd->pm_flags & PM_REVERSE_LOOP)
- return osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
- action_if_pattern_matches);
- return osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
- action_if_pattern_matches);
+ return osl(osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
+ action_if_pattern_matches));
+ return osl(osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
+ action_if_pattern_matches));
}
/**
else {
char *home = para_homedir();
database_dir = make_message(
- "%s/.paraslash/afs_database", home);
+ "%s/.paraslash/afs_database-0.4", home);
free(home);
}
}
{
uint32_t table_mask = *(uint32_t *)query->data;
int i, ret;
- char *buf;
+ struct para_buffer pb = {.buf = NULL};
close_afs_tables();
for (i = 0; i < NUM_AFS_TABLES; i++) {
ret = t->create(database_dir);
if (ret < 0)
goto out;
+ para_printf(&pb, "successfully created %s table\n", t->name);
}
ret = open_afs_tables();
out:
- if (ret >= 0)
- buf = make_message("successfully created afs table(s)\n");
- else
- buf = make_message("%s\n", para_strerror(-ret));
- pass_buffer_as_shm(buf, strlen(buf), &fd);
- free(buf);
+ if (ret < 0)
+ para_printf(&pb, "%s\n", para_strerror(-ret));
+ if (pb.buf)
+ pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ free(pb.buf);
}
int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)