/*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file aft.c Audio file table functions. */
+#include <regex.h>
#include <dirent.h> /* readdir() */
-#include <osl.h>
-#include "para.h"
-#include "error.h"
-#include "string.h"
+#include <openssl/rc4.h>
#include <sys/mman.h>
#include <fnmatch.h>
#include <sys/shm.h>
+#include <osl.h>
+#include "para.h"
+#include "error.h"
+#include "crypt.h"
+#include "string.h"
#include "afh.h"
#include "afs.h"
#include "net.h"
-#include "vss.h"
#include "fd.h"
#include "ipc.h"
#include "portable_io.h"
static struct osl_table *audio_file_table;
+static char *status_items;
+static char *parser_friendly_status_items;
/** The different sorting methods of the ls command. */
enum ls_sorting_method {
/** -lm */
LS_MODE_MBOX,
/** -lc */
- LS_MODE_CHUNKS
+ LS_MODE_CHUNKS,
+ /** -lp */
+ LS_MODE_PARSER,
};
/** The flags accepted by the ls command. */
LS_FLAG_ADMISSIBLE_ONLY = 2,
/** -r */
LS_FLAG_REVERSE = 4,
+ /** -d */
+ LS_FLAG_UNIXDATE = 8,
};
/**
*
* \sa osl_compare_func, uint32_compare().
*/
-int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
{
return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data);
}
AFHI_BITRATE_OFFSET = 4,
/** Position of the frequency. */
AFHI_FREQUENCY_OFFSET = 8,
- /** Location of the audio file header. */
- AFHI_HEADER_OFFSET_OFFSET = 12,
+ /** Was: Location of the audio file header. */
+ AFHI_UNUSED1_OFFSET = 12,
/* Length of the audio file header. Zero means: No header. */
AFHI_HEADER_LEN_OFFSET = 16,
/** The total number of chunks (4 bytes). */
CHUNKS_TOTAL_OFFSET = 20,
/** The length of the audio file header (4 bytes). */
HEADER_LEN_OFFSET = 24,
- /** The start of the audio file header (4 bytes). */
- HEADER_OFFSET_OFFSET = 28,
+ /** Was: The start of the audio file header (4 bytes). */
+ AFHI_UNUSED2_OFFSET = 28,
/** The seconds part of the chunk time (4 bytes). */
CHUNK_TV_TV_SEC_OFFSET = 32,
/** The microseconds part of the chunk time (4 bytes). */
write_u32(buf + AFHI_SECONDS_TOTAL_OFFSET, afhi->seconds_total);
write_u32(buf + AFHI_BITRATE_OFFSET, afhi->bitrate);
write_u32(buf + AFHI_FREQUENCY_OFFSET, afhi->frequency);
- write_u32(buf + AFHI_HEADER_OFFSET_OFFSET, afhi->header_offset);
+ write_u32(buf + AFHI_UNUSED1_OFFSET, 0);
write_u32(buf + AFHI_HEADER_LEN_OFFSET, afhi->header_len);
write_u8(buf + AFHI_CHANNELS_OFFSET, afhi->channels);
write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
write_u32(buf + HEADER_LEN_OFFSET, afhi->header_len);
- write_u32(buf + HEADER_OFFSET_OFFSET, afhi->header_offset);
+ write_u32(buf + AFHI_UNUSED2_OFFSET, 0);
write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
p = buf + AFHI_INFO_STRING_OFFSET;
afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
afhi->frequency = read_u32(buf + AFHI_FREQUENCY_OFFSET);
- afhi->header_offset = read_u32(buf + AFHI_HEADER_OFFSET_OFFSET);
afhi->header_len = read_u32(buf + AFHI_HEADER_LEN_OFFSET);
afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
afhi->chunks_total = read_u32(buf + CHUNKS_TOTAL_OFFSET);
afhi->header_len = read_u32(buf + HEADER_LEN_OFFSET);
- afhi->header_offset = read_u32(buf + HEADER_OFFSET_OFFSET);
afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET);
- afhi->techinfo = buf + AFHI_INFO_STRING_OFFSET;
+ afhi->techinfo = (char *)buf + AFHI_INFO_STRING_OFFSET;
afhi->tags.artist = afhi->techinfo + strlen(afhi->techinfo) + 1;
afhi->tags.title = afhi->tags.artist + strlen(afhi->tags.artist) + 1;
afhi->tags.year = afhi->tags.title + strlen(afhi->tags.title) + 1;
return 4 * (afhi->chunks_total + 1);
}
-static void save_chunk_table(struct afh_info *afhi, char *buf)
+static uint32_t save_chunk_table(struct afh_info *afhi, char *buf)
{
int i;
-
- for (i = 0; i <= afhi->chunks_total; i++)
- write_u32(buf + 4 * i, afhi->chunk_table[i]);
+ uint32_t max = 0, old = 0;
+
+ for (i = 0; i <= afhi->chunks_total; i++) {
+ uint32_t val = afhi->chunk_table[i];
+ write_u32(buf + 4 * i, val);
+ /*
+ * If the first chunk is the header, do not consider it for the
+ * calculation of the largest chunk size.
+ */
+ if (i == 0 || (i == 1 && afhi->header_len > 0)) {
+ old = val;
+ continue;
+ }
+ max = PARA_MAX(max, val - old);
+ old = val;
+ }
+ return max;
}
static void load_chunk_table(struct afh_info *afhi, char *buf)
*
* \return Standard.
*/
-int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
+static int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
{
const struct osl_object obj = {.data = hash, .size = HASH_SIZE};
return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
*
* \return Positive on success, negative on errors.
*/
-int get_afsi_object_of_path(const char *path, struct osl_object *obj)
+static int get_afsi_object_of_path(const char *path, struct osl_object *obj)
{
struct osl_row *row;
int ret = aft_get_row_of_path(path, &row);
ret = shm_attach(shmid, ATTACH_RW, &shm_afd);
if (ret < 0)
goto err;
- *(struct audio_file_data *)shm_afd = *afd;
buf = shm_afd;
buf += sizeof(*afd);
- save_chunk_table(&afd->afhi, buf);
+ afd->max_chunk_size = save_chunk_table(&afd->afhi, buf);
+ *(struct audio_file_data *)shm_afd = *afd;
shm_detach(shm_afd);
return shmid;
err:
return ret;
}
+/**
+ * Extract a afd stored in a shared memory area.
+ *
+ * Attach the shared memory area given by \a shmid, load the audio file data
+ * stored therein and detach the area afterwards. Called by vss, after
+ * receiving a positive response to the request for the next audio file.
+ +
+ * \param shmid The identifier of the shared memory area containing the afd.
+ * \param afd Result pointer.
+ *
+ * \return Standard.
+ */
int load_afd(int shmid, struct audio_file_data *afd)
{
void *shm_afd;
}
}
-static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
+
+static int write_attribute_items(struct para_buffer *b,
+ const char *att_bitmap, struct afs_info *afsi)
{
- char *att_text, *att_lines;
+ char *att_text;
+ int ret;
- get_attribute_text(&afsi->attributes, " ", &att_text);
- if (!att_text)
- return para_strdup(att_bitmap);
- att_lines = make_message("%s: %s\n%s: %s",
- status_item_list[SI_ATTRIBUTES_BITMAP], att_bitmap,
- status_item_list[SI_ATTRIBUTES_TXT], att_text);
+ ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap);
+ if (ret < 0)
+ return ret;
+ ret = get_attribute_text(&afsi->attributes, " ", &att_text);
+ if (ret < 0)
+ return ret;
+ ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text);
free(att_text);
- return att_lines;
+ return ret;
}
-static char *make_lyrics_lines(struct afs_info *afsi)
+static int write_lyrics_items(struct para_buffer *b, struct afs_info *afsi)
{
char *lyrics_name;
+ int ret;
+ ret = WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id);
+ if (ret < 0)
+ return ret;
lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
- return make_message("%s: %u\n%s: %s\n",
- status_item_list[SI_LYRICS_ID], afsi->lyrics_id,
- status_item_list[SI_LYRICS_NAME], lyrics_name?
- lyrics_name : "(none)");
+ return WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name?
+ lyrics_name : "(none)");
}
-static char *make_image_lines(struct afs_info *afsi)
+static int write_image_items(struct para_buffer *b, struct afs_info *afsi)
{
char *image_name;
+ int ret;
+
+ ret = WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id);
+ if (ret < 0)
+ return ret;
img_get_name_by_id(afsi->image_id, &image_name);
- return make_message("%s: %u\n%s: %s\n",
- status_item_list[SI_IMAGE_ID], afsi->image_id,
- status_item_list[SI_IMAGE_NAME], image_name?
- image_name : "(none)");
+ return WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name?
+ image_name : "(none)");
}
-static char *make_filename_lines(const char *path, unsigned flags)
+static int write_filename_items(struct para_buffer *b, const char *path,
+ unsigned flags)
{
- char *dirname, *ret;
- const char *basename;
+ char *val;
+ int ret;
if (!(flags & LS_FLAG_FULL_PATH))
- return make_message("%s: %s\n",
- status_item_list[SI_BASENAME], path);
- basename = para_basename(path),
- dirname = para_dirname(path);
- ret = make_message("%s: %s\n%s: %s\n%s: %s\n",
- status_item_list[SI_PATH], path,
- status_item_list[SI_DIRECTORY], dirname? dirname : "?",
- status_item_list[SI_BASENAME], basename? basename : "?");
- free(dirname);
+ return WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path);
+ ret = WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path);
+ if (ret < 0)
+ return ret;
+ val = para_basename(path);
+ ret = WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : "");
+ if (ret < 0)
+ return ret;
+ val = para_dirname(path);
+ ret = WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : "");
+ free(val);
return ret;
}
return ret;
}
+static int write_score(struct para_buffer *b, struct ls_data *d,
+ struct ls_options *opts)
+{
+ if (!(opts->flags & LS_FLAG_ADMISSIBLE_ONLY)) /* no score*/
+ return 0;
+ return WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score);
+}
+
static int print_list_item(struct ls_data *d, struct ls_options *opts,
struct para_buffer *b, time_t current_time)
{
char att_buf[65];
char last_played_time[30];
char duration_buf[30]; /* nobody has an audio file long enough to overflow this */
- char score_buf[30] = "";
struct afs_info *afsi = &d->afsi;
struct afh_info *afhi = &d->afhi;
- struct ls_widths *w = &opts->widths;
- int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
char asc_hash[2 * HASH_SIZE + 1];
- char *att_lines, *lyrics_lines, *image_lines, *filename_lines;
if (opts->mode == LS_MODE_SHORT) {
ret = para_printf(b, "%s\n", d->path);
goto out;
}
get_attribute_bitmap(&afsi->attributes, att_buf);
- ret = get_local_time(&afsi->last_played, last_played_time,
- sizeof(last_played_time), current_time, opts->mode);
- if (ret < 0)
- goto out;
- get_duration_buf(afhi->seconds_total, duration_buf, opts);
- if (have_score) {
- if (opts->mode == LS_MODE_LONG)
- sprintf(score_buf, "%*li ", w->score_width, d->score);
- else
- sprintf(score_buf, "%li ", d->score);
+ if (opts->flags & LS_FLAG_UNIXDATE)
+ sprintf(last_played_time, "%llu",
+ (long long unsigned)afsi->last_played);
+ else {
+ ret = get_local_time(&afsi->last_played, last_played_time,
+ sizeof(last_played_time), current_time, opts->mode);
+ if (ret < 0)
+ goto out;
}
-
+ get_duration_buf(afhi->seconds_total, duration_buf, opts);
if (opts->mode == LS_MODE_LONG) {
+ struct ls_widths *w = &opts->widths;
+ if (opts->flags & LS_FLAG_ADMISSIBLE_ONLY) {
+ ret = para_printf(b, "%*li ",
+ opts->widths.score_width, d->score);
+ if (ret < 0)
+ goto out;
+ }
ret = para_printf(b,
- "%s" /* score */
"%s " /* attributes */
"%*u " /* amp */
"%*d " /* image_id */
"%*d " /* num_played */
"%s " /* last_played */
"%s\n", /* path */
- score_buf,
att_buf,
w->amp_width, afsi->amp,
w->image_id_width, afsi->image_id,
);
goto out;
}
- hash_to_asc(d->hash, asc_hash);
- att_lines = make_attribute_lines(att_buf, afsi);
- lyrics_lines = make_lyrics_lines(afsi);
- image_lines = make_image_lines(afsi);
- filename_lines = make_filename_lines(d->path, opts->flags);
if (opts->mode == LS_MODE_MBOX) {
const char *bn = para_basename(d->path);
ret = para_printf(b,
if (ret < 0)
goto out;
}
- ret = para_printf(b,
- "%s" /* filename stuff */
- "%s%s%s%s" /* score */
- "%s\n" /* attributes */
- "%s: %s\n" /* hash */
- "%s" /* image id, image name */
- "%s" /* lyrics */
- "%s: %dkbit/s\n" /* bitrate */
- "%s: %s\n" /* format */
- "%s: %dHz\n" /* frequency */
- "%s: %d\n" /* channels */
- "%s: %s\n" /* duration */
- "%s: %lu\n" /* seconds total */
- "%s: %s\n" /* last played time */
- "%s: %d\n" /* num_played */
- "%s: %u\n" /* amplification */
- "%s: %lu\n" /* chunk time */
- "%s: %lu\n" /* num chunks */
- "%s: %s\n" /* techinfo */
- "%s: %s\n" /* artist */
- "%s: %s\n" /* title */
- "%s: %s\n" /* year */
- "%s: %s\n" /* album */
- "%s: %s\n", /* comment */
- filename_lines,
- have_score? status_item_list[SI_SCORE] : "",
- have_score? ": " : "",
- score_buf,
- have_score? "\n" : "",
- att_lines,
- status_item_list[SI_HASH], asc_hash,
- image_lines,
- lyrics_lines,
- status_item_list[SI_BITRATE], afhi->bitrate,
- status_item_list[SI_FORMAT], audio_format_name(afsi->audio_format_id),
- status_item_list[SI_FREQUENCY], afhi->frequency,
- status_item_list[SI_CHANNELS], afhi->channels,
- status_item_list[SI_DURATION], duration_buf,
- status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total,
- status_item_list[SI_LAST_PLAYED], last_played_time,
- status_item_list[SI_NUM_PLAYED], afsi->num_played,
- status_item_list[SI_AMPLIFICATION], afsi->amp,
- status_item_list[SI_CHUNK_TIME], tv2ms(&afhi->chunk_tv),
- status_item_list[SI_NUM_CHUNKS], afhi->chunks_total,
- status_item_list[SI_TECHINFO], afhi->techinfo,
- status_item_list[SI_ARTIST], afhi->tags.artist,
- status_item_list[SI_TITLE], afhi->tags.title,
- status_item_list[SI_YEAR], afhi->tags.year,
- status_item_list[SI_ALBUM], afhi->tags.album,
- status_item_list[SI_COMMENT], afhi->tags.comment
- );
+ ret = write_filename_items(b, d->path, opts->flags);
+ if (ret < 0)
+ goto out;
+ ret = write_score(b, d, opts);
+ if (ret < 0)
+ goto out;
+ ret = write_attribute_items(b, att_buf, afsi);
+ if (ret < 0)
+ goto out;
+ ret = write_image_items(b, afsi);
+ if (ret < 0)
+ goto out;
+ ret = write_lyrics_items(b, afsi);
+ if (ret < 0)
+ goto out;
+ hash_to_asc(d->hash, asc_hash);
+ ret = WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n",
+ audio_format_name(afsi->audio_format_id));
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%lu\n",
+ afhi->seconds_total);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%d\n", afsi->num_played);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n",
+ tv2ms(&afhi->chunk_tv));
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%lu\n",
+ afhi->chunks_total);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album);
+ if (ret < 0)
+ goto out;
+ ret = WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment);
if (ret < 0)
goto out;
if (opts->mode == LS_MODE_MBOX) {
osl_close_disk_object(&lyrics_def);
}
}
- free(att_lines);
- free(lyrics_lines);
- free(image_lines);
- free(filename_lines);
out:
return ret;
}
-/**
- * Write a list of audio-file related status items with empty values.
- *
- * \param buf Result pointer.
- *
- * This is used by vss when currently no audio file is open.
- */
-void make_empty_status_items(char *buf)
-{
- sprintf(buf,
- "%s: \n" /* path */
- "%s: \n" /* dirname */
- "%s: \n" /* basename */
- "%s: \n" /* score */
- "%s: \n" /* attributes bitmap */
- "%s: \n" /* attributes txt */
- "%s: \n" /* hash */
- "%s: \n" /* image id */
- "%s: \n" /* image name */
- "%s: \n" /* lyrics id */
- "%s: \n" /* lyrics name */
- "%s: \n" /* bitrate */
- "%s: \n" /* format */
- "%s: \n" /* frequency */
- "%s: \n" /* channels */
- "%s: \n" /* duration */
- "%s: \n" /* seconds total */
- "%s: \n" /* num played */
- "%s: \n" /* last played */
- "%s: \n" /* techinfo */
- "%s: \n" /* artist */
- "%s: \n" /* title */
- "%s: \n" /* year */
- "%s: \n" /* album */
- "%s: \n" /* comment */
- "%s: \n" /* amplification */
- ,
- status_item_list[SI_PATH],
- status_item_list[SI_DIRECTORY],
- status_item_list[SI_BASENAME],
- status_item_list[SI_SCORE],
- status_item_list[SI_ATTRIBUTES_BITMAP],
- status_item_list[SI_ATTRIBUTES_TXT],
- status_item_list[SI_HASH],
- status_item_list[SI_IMAGE_ID],
- status_item_list[SI_IMAGE_NAME],
- status_item_list[SI_LYRICS_ID],
- status_item_list[SI_LYRICS_NAME],
- status_item_list[SI_BITRATE],
- status_item_list[SI_FORMAT],
- status_item_list[SI_FREQUENCY],
- status_item_list[SI_CHANNELS],
- status_item_list[SI_DURATION],
- status_item_list[SI_SECONDS_TOTAL],
- status_item_list[SI_NUM_PLAYED],
- status_item_list[SI_LAST_PLAYED],
- status_item_list[SI_TECHINFO],
- status_item_list[SI_ARTIST],
- status_item_list[SI_TITLE],
- status_item_list[SI_YEAR],
- status_item_list[SI_ALBUM],
- status_item_list[SI_COMMENT],
- status_item_list[SI_AMPLIFICATION]
- );
-}
-
static int make_status_items(struct audio_file_data *afd,
struct afs_info *afsi, char *path, long score,
HASH_TYPE *hash)
.flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY,
.mode = LS_MODE_VERBOSE,
};
- struct para_buffer pb = {.max_size = VERBOSE_LS_OUTPUT_SIZE - 1};
+ struct para_buffer pb = {.max_size = SHMMAX - 1};
time_t current_time;
int ret;
time(¤t_time);
ret = print_list_item(&d, &opts, &pb, current_time);
if (ret < 0)
- goto out;
- strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
- afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
-out:
- free(pb.buf);
- return ret;
+ return ret;
+ free(status_items);
+ status_items = pb.buf;
+ memset(&pb, 0, sizeof(pb));
+ pb.max_size = SHMMAX - 1;
+ pb.flags = PBF_SIZE_PREFIX;
+ ret = print_list_item(&d, &opts, &pb, current_time);
+ if (ret < 0) {
+ free(status_items);
+ status_items = NULL;
+ return ret;
+ }
+ free(parser_friendly_status_items);
+ parser_friendly_status_items = pb.buf;
+ return 1;
}
/**
ret = get_audio_file_path_of_row(aft_row, &path);
if (ret < 0)
return ret;
+ PARA_NOTICE_LOG("%s\n", path);
ret = get_afsi_object_of_row(aft_row, &afsi_obj);
if (ret < 0)
return ret;
new_afsi.last_played = time(NULL);
save_afsi(&new_afsi, &afsi_obj); /* in-place update */
+ afd->audio_format_id = old_afsi.audio_format_id;
load_chunk_table(&afd->afhi, chunk_table_obj.data);
ret = make_status_items(afd, &old_afsi, path, score, file_hash);
if (ret < 0)
struct ls_options *opts = query->data;
char *p, *pattern_start = (char *)query->data + sizeof(*opts);
struct para_buffer b = {.max_size = SHMMAX,
+ .flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0,
.max_size_handler = pass_buffer_as_shm, .private_data = &fd};
int i = 0, ret;
time_t current_time;
-
if (opts->num_patterns) {
opts->patterns = para_malloc(opts->num_patterns * sizeof(char *));
for (i = 0, p = pattern_start; i < opts->num_patterns; i++) {
/*
* TODO: flags -h (sort by hash)
*/
-int com_ls(int fd, int argc, char * const * const argv)
+int com_ls(struct rc4_context *rc4c, int argc, char * const * const argv)
{
int i, ret;
unsigned flags = 0;
case 'c':
mode = LS_MODE_CHUNKS;
continue;
+ case 'p':
+ mode = LS_MODE_PARSER;
+ continue;
default:
return -E_AFT_SYNTAX;
}
flags |= LS_FLAG_REVERSE;
continue;
}
+ if (!strcmp(arg, "-d")) {
+ flags |= LS_FLAG_UNIXDATE;
+ continue;
+ }
if (!strncmp(arg, "-s", 2)) {
if (!*(arg + 2) || *(arg + 3))
return -E_AFT_SYNTAX;
opts.mode = mode;
opts.num_patterns = argc - i;
ret = send_option_arg_callback_request(&query, opts.num_patterns,
- argv + i, com_ls_callback, send_result, &fd);
+ argv + i, com_ls_callback, rc4_send_result, rc4c);
return ret;
}
/** Used by com_add(). */
struct private_add_data {
- /** The socket file descriptor. */
- int fd;
+ /** The socket file descriptor, including rc4 keys. */
+ struct rc4_context *rc4c;
/** The given add flags. */
uint32_t flags;
};
ret = 1;
if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
if (pad->flags & ADD_FLAG_VERBOSE)
- send_ret = send_va_buffer(pad->fd, "lazy-ignore: %s\n", path);
+ send_ret = rc4_send_va_buffer(pad->rc4c,
+ "lazy-ignore: %s\n", path);
goto out_free;
}
/* We still want to add this file. Compute its hash. */
ret = 1;
if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) {
if (pad->flags & ADD_FLAG_VERBOSE)
- send_ret = send_va_buffer(pad->fd,
+ send_ret = rc4_send_va_buffer(pad->rc4c,
"%s exists, not forcing update\n", path);
goto out_unmap;
}
munmap(map.data, map.size);
close(fd);
if (pad->flags & ADD_FLAG_VERBOSE) {
- send_ret = send_va_buffer(pad->fd, "adding %s\n", path);
+ send_ret = rc4_send_va_buffer(pad->rc4c, "adding %s\n", path);
if (send_ret < 0)
goto out_free;
}
save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj);
/* Ask afs to consider this entry for adding. */
- ret = send_callback_request(com_add_callback, &obj, send_result, &pad->fd);
+ ret = send_callback_request(com_add_callback, &obj, rc4_send_result, pad->rc4c);
goto out_free;
out_unmap:
munmap(map.data, map.size);
out_free:
if (ret < 0 && send_ret >= 0)
- send_ret = send_va_buffer(pad->fd, "failed to add %s (%s)\n", path,
- para_strerror(-ret));
+ send_ret = rc4_send_va_buffer(pad->rc4c,
+ "failed to add %s (%s)\n", path, para_strerror(-ret));
free(obj.data);
if (afhi_ptr) {
free(afhi_ptr->chunk_table);
return send_ret;
}
-int com_add(int fd, int argc, char * const * const argv)
+int com_add(struct rc4_context *rc4c, int argc, char * const * const argv)
{
int i, ret;
- struct private_add_data pad = {.fd = fd, .flags = 0};
+ struct private_add_data pad = {.rc4c = rc4c, .flags = 0};
struct stat statbuf;
for (i = 1; i < argc; i++) {
char *path;
ret = verify_path(argv[i], &path);
if (ret < 0) {
- ret = send_va_buffer(fd, "%s: %s\n", argv[i],
+ ret = rc4_send_va_buffer(rc4c, "%s: %s\n", argv[i],
para_strerror(-ret));
if (ret < 0)
return ret;
}
ret = stat(path, &statbuf);
if (ret < 0) {
- ret = send_va_buffer(fd, "failed to stat %s (%s)\n", path,
+ ret = rc4_send_va_buffer(rc4c, "failed to stat %s (%s)\n", path,
strerror(errno));
free(path);
if (ret < 0)
else
ret = add_one_audio_file(path, &pad);
if (ret < 0) {
- send_va_buffer(fd, "%s: %s\n", path, para_strerror(-ret));
+ rc4_send_va_buffer(rc4c, "%s: %s\n", path, para_strerror(-ret));
free(path);
return ret;
}
free(tad.pb.buf);
}
-int com_touch(int fd, int argc, char * const * const argv)
+int com_touch(struct rc4_context *rc4c, int argc, char * const * const argv)
{
struct com_touch_options cto = {
.num_played = -1,
i++;
break;
}
- if (!strncmp(arg, "-n", 2)) {
- ret = para_atoi32(arg + 2, &cto.num_played);
+ if (!strncmp(arg, "-n=", 3)) {
+ ret = para_atoi32(arg + 3, &cto.num_played);
if (ret < 0)
return ret;
continue;
}
- if (!strncmp(arg, "-l", 2)) {
- ret = para_atoi64(arg + 2, &cto.last_played);
+ if (!strncmp(arg, "-l=", 3)) {
+ ret = para_atoi64(arg + 3, &cto.last_played);
if (ret < 0)
return ret;
continue;
}
- if (!strncmp(arg, "-y", 2)) {
- ret = para_atoi32(arg + 2, &cto.lyrics_id);
+ if (!strncmp(arg, "-y=", 3)) {
+ ret = para_atoi32(arg + 3, &cto.lyrics_id);
if (ret < 0)
return ret;
continue;
}
- if (!strncmp(arg, "-i", 2)) {
- ret = para_atoi32(arg + 2, &cto.image_id);
+ if (!strncmp(arg, "-i=", 3)) {
+ ret = para_atoi32(arg + 3, &cto.image_id);
if (ret < 0)
return ret;
continue;
}
- if (!strncmp(arg, "-a", 2)) {
+ if (!strncmp(arg, "-a=", 3)) {
int32_t val;
- ret = para_atoi32(arg + 2, &val);
+ ret = para_atoi32(arg + 3, &val);
if (ret < 0)
return ret;
if (val < 0 || val > 255)
if (i >= argc)
return -E_AFT_SYNTAX;
ret = send_option_arg_callback_request(&query, argc - i,
- argv + i, com_touch_callback, send_result, &fd);
+ argv + i, com_touch_callback, rc4_send_result, rc4c);
if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
return ret;
}
}
/* TODO options: -r (recursive) */
-int com_rm(int fd, int argc, char * const * const argv)
+int com_rm(struct rc4_context *rc4c, int argc, char * const * const argv)
{
uint32_t flags = 0;
struct osl_object query = {.data = &flags, .size = sizeof(flags)};
if (i >= argc)
return -E_AFT_SYNTAX;
ret = send_option_arg_callback_request(&query, argc - i, argv + i,
- com_rm_callback, send_result, &fd);
+ com_rm_callback, rc4_send_result, rc4c);
if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
return ret;
}
free(cad.pb.buf);
}
-int com_cpsi(int fd, int argc, char * const * const argv)
+int com_cpsi(struct rc4_context *rc4c, int argc, char * const * const argv)
{
unsigned flags = 0;
int i, ret;
}
break;
}
- if (i + 1 >= argc) /* need at least souce file and pattern */
+ if (i + 1 >= argc) /* need at least source file and pattern */
return -E_AFT_SYNTAX;
if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */
flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
ret = send_option_arg_callback_request(&options, argc - i, argv + i,
- com_cpsi_callback, send_result, &fd);
+ com_cpsi_callback, rc4_send_result, rc4c);
if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
return ret;
}
+static void afs_stat_callback(int fd, const struct osl_object *query)
+{
+ int *parser_friendly = query->data;
+ char *buf = *parser_friendly?
+ parser_friendly_status_items : status_items;
+
+ if (!buf)
+ return;
+ pass_buffer_as_shm(buf, strlen(buf), &fd);
+}
+
+/**
+ * Get the current afs status items from the afs process and send it using RC4.
+ *
+ * \param rc4c The rc4 context for data encryption.
+ * \param parser_friendly Whether parser-friendly output format should be used.
+ *
+ * As the contents of the afs status items change in time and the command
+ * handler only has a COW version created at fork time, it can not send
+ * up-to-date afs status items directly. Therefore the usual callback mechanism
+ * is used to pass the status items from the afs process to the command handler
+ * via a shared memory area and a pipe.
+ */
+int send_afs_status(struct rc4_context *rc4c, int parser_friendly)
+{
+ struct osl_object query = {.data = &parser_friendly,
+ .size = sizeof(parser_friendly)};
+
+ return send_callback_request(afs_stat_callback, &query, rc4_send_result, rc4c);
+}
+
/* TODO: optionally fix problems by removing offending rows */
static int check_audio_file(struct osl_row *row, void *data)
{
{
osl_close_table(audio_file_table, OSL_MARK_CLEAN);
audio_file_table = NULL;
+ free(status_items);
+ status_items = NULL;
+ free(parser_friendly_status_items);
+ parser_friendly_status_items = NULL;
}
/**
}
}
+/**
+ * Initialize the audio file table.
+ *
+ * \param t Pointer to the structure to be initialized.
+ */
void aft_init(struct afs_table *t)
{
- t->name = audio_file_table_desc.name;
t->open = aft_open;
t->close = aft_close;
t->create = aft_create;
projects / paraslash.git / blobdiff