/** Data passed to the different compare functions (called by qsort()). */
struct ls_data {
/** Usual audio format handler information. */
- struct audio_format_info afhi;
+ struct afh_info afhi;
/** Audio file selector information. */
struct afs_info afsi;
/** The full path of the audio file. */
MIN_AFHI_SIZE = 14
};
-static unsigned sizeof_afhi_buf(const struct audio_format_info *afhi)
+static unsigned sizeof_afhi_buf(const struct afh_info *afhi)
{
if (!afhi)
return 0;
return strlen(afhi->info_string) + MIN_AFHI_SIZE;
}
-static void save_afhi(struct audio_format_info *afhi, char *buf)
+static void save_afhi(struct afh_info *afhi, char *buf)
{
if (!afhi)
return;
PARA_DEBUG_LOG("last byte written: %p\n", buf + AFHI_INFO_STRING_OFFSET + strlen(afhi->info_string));
}
-static void load_afhi(const char *buf, struct audio_format_info *afhi)
+static void load_afhi(const char *buf, struct afh_info *afhi)
{
afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
//#define SIZEOF_CHUNK_TABLE(afhi) (((afhi)->chunks_total + 1) * sizeof(uint32_t))
-static unsigned sizeof_chunk_info_buf(struct audio_format_info *afhi)
+static unsigned sizeof_chunk_info_buf(struct afh_info *afhi)
{
if (!afhi)
return 0;
CHUNK_TABLE_OFFSET = 20,
};
-static void save_chunk_table(struct audio_format_info *afhi, char *buf)
+static void save_chunk_table(struct afh_info *afhi, char *buf)
{
int i;
- PARA_NOTICE_LOG("%lu chunks\n", afhi->chunks_total);
+ PARA_DEBUG_LOG("%lu chunks\n", afhi->chunks_total);
for (i = 0; i <= afhi->chunks_total; i++)
write_u32(buf + 4 * i, afhi->chunk_table[i]);
}
-static void load_chunk_table(struct audio_format_info *afhi, char *buf)
+static void load_chunk_table(struct afh_info *afhi, char *buf)
{
int i;
for (i = 0; i <= afhi->chunks_total; i++)
}
/* TODO: audio format handlers could just produce this */
-static void save_chunk_info(struct audio_format_info *afhi, char *buf)
+static void save_chunk_info(struct afh_info *afhi, char *buf)
{
if (!afhi)
return;
save_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
}
-static int load_chunk_info(struct osl_object *obj, struct audio_format_info *afhi)
+static int load_chunk_info(struct osl_object *obj, struct afh_info *afhi)
{
char *buf = obj->data;
* \param row Pointer to a row in the audio file table.
* \param path Result pointer.
*
- * \return Positive on success, negative on errors.
+ * The result is a pointer to mmapped data. The caller must not attempt
+ * to free it.
+ *
+ * \return Standard.
*/
int get_audio_file_path_of_row(const struct osl_row *row, char **path)
{
*
* \sa get_chunk_table_of_row().
*/
-int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
+int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
{
struct osl_object obj;
int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
return 1;
}
-#if 0
-/**
- * Get the chunk table of an audio file, given a row of the audio file table.
- *
- * \param row Pointer to a row of the audio file table.
- * \param afhi Result pointer.
- *
- * \return The return value of the underlying call to osl_open_disk_object().
- *
- * \sa get_afhi_of_row().
- */
-static int get_chunk_table_of_row(const struct osl_row *row, struct audio_format_info *afhi)
-{
- struct osl_object obj;
- int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,
- &obj);
- if (ret < 0)
- return ret;
- ret = load_chunk_info(&obj, afhi);
- osl_close_disk_object(&obj);
- return ret;
-}
-#endif
-
/* returns shmid on success */
static int save_afd(struct audio_file_data *afd)
{
- size_t path_size = strlen(afd->path) + 1;
- size_t size = sizeof(*afd) + path_size
+ size_t size = sizeof(*afd)
+ 4 * (afd->afhi.chunks_total + 1);
- PARA_NOTICE_LOG("size: %zu\n", size);
+ PARA_DEBUG_LOG("size: %zu\n", size);
int shmid, ret = shm_new(size);
void *shm_afd;
char *buf;
*(struct audio_file_data *)shm_afd = *afd;
buf = shm_afd;
buf += sizeof(*afd);
- strcpy(buf, afd->path);
- buf += path_size;
save_chunk_table(&afd->afhi, buf);
shm_detach(shm_afd);
return shmid;
*afd = *(struct audio_file_data *)shm_afd;
buf = shm_afd;
buf += sizeof(*afd);
- afd->path = para_strdup(buf);
- buf += strlen(buf) + 1;
afd->afhi.chunk_table = para_malloc((afd->afhi.chunks_total + 1) * 4);
load_chunk_table(&afd->afhi, buf);
shm_detach(shm_afd);
int ret = get_hash_of_row(aft_row, &aft_hash);
struct afsi_change_event_data aced;
struct osl_object map, chunk_table_obj;
+ char *tmp, *path;
if (ret < 0)
return ret;
- ret = get_audio_file_path_of_row(aft_row, &afd->path);
+ ret = get_audio_file_path_of_row(aft_row, &path);
if (ret < 0)
return ret;
+ strncpy(afd->path, path, sizeof(afd->path) - 1);
+ afd->path[sizeof(afd->path) - 1] = '\0';
ret = get_afsi_object_of_row(aft_row, &afsi_obj);
if (ret < 0)
return ret;
AFTCOL_CHUNKS, &chunk_table_obj);
if (ret < 0)
return ret;
- ret = mmap_full_file(afd->path, O_RDONLY, &map.data,
+ ret = mmap_full_file(path, O_RDONLY, &map.data,
&map.size, &afd->fd);
if (ret < 0)
goto err;
ret = load_chunk_info(&chunk_table_obj, &afd->afhi);
if (ret < 0)
goto err;
+ ret = get_attribute_text(&afd->afsi.attributes, " ", &tmp);
+ if (ret < 0)
+ goto err;
+ tmp[sizeof(afd->attributes_string) - 1] = '\0';
+ strcpy(afd->attributes_string, tmp); /* OK */
+ free(tmp);
aced.aft_row = aft_row;
aced.old_afsi = &afd->afsi;
seconds % 60);
}
-static char *make_attribute_line(const char *att_bitmap, struct afs_info *afsi)
+static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
{
- char *att_text, *att_line;
+ char *att_text, *att_lines;
get_attribute_text(&afsi->attributes, " ", &att_text);
if (!att_text)
return para_strdup(att_bitmap);
- att_line = make_message("%s (%s)", att_bitmap, att_text);
+ att_lines = make_message("%s\nattributes_txt: %s",
+ att_bitmap, att_text);
free(att_text);
- return att_line;
+ return att_lines;
}
static char *make_lyrics_line(struct afs_info *afsi)
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 audio_format_info *afhi = &d->afhi;
+ 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_line, *lyrics_line, *image_line;
+ char *att_lines, *lyrics_line, *image_line;
if (opts->mode == LS_MODE_SHORT) {
para_printf(b, "%s\n", d->path);
return 1;
}
hash_to_asc(d->hash, asc_hash);
- att_line = make_attribute_line(att_buf, afsi);
+ att_lines = make_attribute_lines(att_buf, afsi);
lyrics_line = make_lyrics_line(afsi);
image_line = make_image_line(afsi);
+ /* TODO: Merge this with status items */
if (opts->mode == LS_MODE_VERBOSE) {
-
para_printf(b,
"%s: %s\n" /* path */
"%s%s%s" /* score */
"path" : "file", d->path,
have_score? "score: " : "", score_buf,
have_score? "\n" : "",
- att_line,
+ att_lines,
asc_hash,
image_line,
lyrics_line,
"Received: from\nTo: bar\nFrom: a\n"
"Subject: %s\n\n" /* path */
"%s%s%s" /* score */
- "attributes: %s\n"
+ "%s"
"hash: %s\n"
"image_id: %s\n"
"lyrics_id: %s\n"
d->path,
have_score? "score: " : "", score_buf,
have_score? "\n" : "",
- att_line,
+ att_lines,
asc_hash,
image_line,
lyrics_line,
if (lyrics_def.data)
osl_close_disk_object(lyrics_def.data);
}
- free(att_line);
+ free(att_lines);
free(lyrics_line);
free(image_line);
return 1;
* full list: list everything, including afsi, afhi, atts as clear text
*
* */
-int com_afs_ls(int fd, int argc, char * const * const argv)
+int com_ls(int fd, int argc, char * const * const argv)
{
int i, ret;
unsigned flags = 0;
/* never save the afsi, as the server knows it too. Note that afhi might be NULL.
* In this case, afhi won't be stored in the buffer */
static void save_audio_file_info(HASH_TYPE *hash, const char *path,
- struct audio_format_info *afhi, uint32_t flags,
+ struct afh_info *afhi, uint32_t flags,
uint8_t audio_format_num, struct osl_object *obj)
{
size_t path_len = strlen(path) + 1;
int ret, ret2;
uint8_t format_num = -1;
const struct private_add_data *pad = private_data;
- struct audio_format_info afhi, *afhi_ptr = NULL;
+ struct afh_info afhi, *afhi_ptr = NULL;
struct osl_row *pb = NULL, *hs = NULL; /* path brother/hash sister */
struct osl_object map, obj = {.data = NULL}, query, result = {.data = NULL};
HASH_TYPE hash[HASH_SIZE];
if (ret > 0) {
send_buffer(fd, (char *)result.data);
free(result.data);
- } else
+ } else if (ret < 0)
send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
return ret;
}
}
/* TODO options: -r (recursive) */
-int com_afs_rm(int fd, int argc, char * const * const argv)
+int com_rm(int fd, int argc, char * const * const argv)
{
uint32_t flags = 0;
struct osl_object query = {.data = &flags, .size = sizeof(flags)},
projects / paraslash.git / blobdiff