/** \file aft.c Audio file table functions. */
+#include <dirent.h> /* readdir() */
#include "para.h"
#include "error.h"
+#include "string.h"
#include <sys/mman.h>
#include <fnmatch.h>
#include "afh.h"
#include "afs.h"
#include "net.h"
-#include "string.h"
#include "vss.h"
+#include "fd.h"
+#include "ipc.h"
static struct osl_table *audio_file_table;
AFSI_LYRICS_ID_OFFSET = 24,
/** Storage position of the .audio_format_id field. */
AFSI_AUDIO_FORMAT_ID_OFFSET = 28,
+ /** 3 bytes reserved space for future usage. */
+ AFSI_AUDIO_FORMAT_UNUSED_OFFSET = 29,
/** On-disk storage space needed. */
- AFSI_SIZE = 29
+ AFSI_SIZE = 32
};
/**
write_u32(buf + AFSI_LYRICS_ID_OFFSET, afsi->lyrics_id);
write_u8(buf + AFSI_AUDIO_FORMAT_ID_OFFSET,
afsi->audio_format_id);
+ memset(buf + AFSI_AUDIO_FORMAT_UNUSED_OFFSET, 0, 3);
}
/**
return -E_BAD_PATH;
}
+/** The on-disk layout of a afhi struct. */
enum afhi_offsets {
+ /** Where the number of seconds is stored. */
AFHI_SECONDS_TOTAL_OFFSET = 0,
+ /** Position of the bitrate. */
AFHI_BITRATE_OFFSET = 4,
+ /** Position of the frequency. */
AFHI_FREQUENCY_OFFSET = 8,
+ /** Number of channels is stored here. */
AFHI_CHANNELS_OFFSET = 12,
+ /** The tag info position. */
AFHI_INFO_STRING_OFFSET = 13,
+ /** Minimal on-disk size of a valid afhi struct. */
MIN_AFHI_SIZE = 14
};
strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
}
+//#define SIZEOF_CHUNK_TABLE(afhi) (((afhi)->chunks_total + 1) * sizeof(uint32_t))
+
static unsigned sizeof_chunk_info_buf(struct audio_format_info *afhi)
{
if (!afhi)
return 0;
- return 4 * afhi->chunks_total + 20;
+ return 4 * (afhi->chunks_total + 1) + 20;
}
CHUNK_TABLE_OFFSET = 20,
};
-/* TODO: audio format handlers could just produce this */
-static void save_chunk_info(struct audio_format_info *afhi, char *buf)
+static void save_chunk_table(struct audio_format_info *afhi, char *buf)
+{
+ int i;
+
+ PARA_NOTICE_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)
{
int i;
+ for (i = 0; i <= afhi->chunks_total; i++)
+ afhi->chunk_table[i] = read_u32(buf + 4 * i);
+}
+/* TODO: audio format handlers could just produce this */
+static void save_chunk_info(struct audio_format_info *afhi, char *buf)
+{
if (!afhi)
return;
write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
write_u32(buf + HEADER_OFFSET_OFFSET, afhi->header_offset);
write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
write_u32(buf + CHUNK_TV_TV_USEC, afhi->chunk_tv.tv_usec);
- for (i = 0; i < afhi->chunks_total; i++)
- write_u32(buf + CHUNK_TABLE_OFFSET + 4 * i, afhi->chunk_table[i]);
+ save_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
}
static int load_chunk_info(struct osl_object *obj, struct audio_format_info *afhi)
{
char *buf = obj->data;
- int i;
if (obj->size < CHUNK_TABLE_OFFSET)
return -E_BAD_DATA_SIZE;
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);
- if (afhi->chunks_total * 4 + CHUNK_TABLE_OFFSET > obj->size)
+ if ((afhi->chunks_total + 1) * 4 + CHUNK_TABLE_OFFSET > obj->size)
return -E_BAD_DATA_SIZE;
- afhi->chunk_table = para_malloc(afhi->chunks_total * sizeof(size_t));
- for (i = 0; i < afhi->chunks_total; i++)
- afhi->chunk_table[i] = read_u32(buf + CHUNK_TABLE_OFFSET + 4 * i);
+ afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * 4);
+ load_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
return 1;
}
return 1;
}
-/**
- * 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)
+/* returns shmid on success */
+static int save_afd(struct audio_file_data *afd)
{
- struct osl_object obj;
- int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,
- &obj);
+ size_t path_size = strlen(afd->path) + 1;
+ size_t size = sizeof(*afd) + path_size
+ + 4 * (afd->afhi.chunks_total + 1);
+
+ PARA_NOTICE_LOG("size: %zu\n", size);
+ int shmid, ret = shm_new(size);
+ void *shm_afd;
+ char *buf;
+
if (ret < 0)
return ret;
- ret = load_chunk_info(&obj, afhi);
- osl_close_disk_object(&obj);
+ shmid = ret;
+ 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);
+ strcpy(buf, afd->path);
+ buf += path_size;
+ save_chunk_table(&afd->afhi, buf);
+ shm_detach(shm_afd);
+ return shmid;
+err:
+ shm_destroy(shmid);
return ret;
}
+int load_afd(int shmid, struct audio_file_data *afd)
+{
+ void *shm_afd;
+ char *buf;
+ int ret;
+
+ ret = shm_attach(shmid, ATTACH_RO, &shm_afd);
+ if (ret < 0)
+ return ret;
+ *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);
+ return 1;
+}
+
/**
* Mmap the given audio file and update statistics.
*
struct osl_object afsi_obj;
struct afs_info new_afsi;
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;
if (ret < 0)
return ret;
ret = get_afhi_of_row(aft_row, &afd->afhi);
if (ret < 0)
return ret;
- ret = get_chunk_table_of_row(aft_row, &afd->afhi);
+ ret = osl_open_disk_object(audio_file_table, aft_row,
+ AFTCOL_CHUNKS, &chunk_table_obj);
if (ret < 0)
return ret;
- ret = mmap_full_file(afd->path, O_RDONLY, &afd->map);
+ ret = mmap_full_file(afd->path, O_RDONLY, &map.data,
+ &map.size, &afd->fd);
if (ret < 0)
goto err;
- hash_function(afd->map.data, afd->map.size, file_hash);
- ret = -E_HASH_MISMATCH;
- if (hash_compare(file_hash, aft_hash))
+ hash_function(map.data, map.size, file_hash);
+ ret = hash_compare(file_hash, aft_hash);
+ para_munmap(map.data, map.size);
+ if (ret) {
+ ret = -E_HASH_MISMATCH;
goto err;
+ }
new_afsi = afd->afsi;
new_afsi.num_played++;
new_afsi.last_played = time(NULL);
save_afsi(&new_afsi, &afsi_obj); /* in-place update */
- if (afd->current_play_mode == PLAY_MODE_PLAYLIST)
- ret = playlist_update_audio_file(aft_row);
- else
- ret = mood_update_audio_file(aft_row, &afd->afsi);
- return ret;
-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;
+ afs_event(AFSI_CHANGE, NULL, &aced);
+ ret = save_afd(afd);
+ if (ret < 0)
+ goto err;
free(afd->afhi.chunk_table);
+err:
+ osl_close_disk_object(&chunk_table_obj);
return ret;
}
return 1;
}
+/** Compute the number of (decimal) digits of a number. */
#define GET_NUM_DIGITS(x, num) { \
typeof((x)) _tmp = PARA_ABS(x); \
*num = 1; \
sprintf(score_buf, "%li ", d->score);
}
- PARA_NOTICE_LOG("id: %s, %d\n", d->path, afsi->audio_format_id);
if (opts->mode == LS_MODE_LONG) {
para_printf(b,
"%s" /* score */
time_t current_time;
- PARA_NOTICE_LOG("%d patterns\n", opts->num_patterns);
if (opts->num_patterns) {
opts->patterns = para_malloc(opts->num_patterns * sizeof(char *));
for (i = 0, p = pattern_start; i < opts->num_patterns; i++) {
opts->patterns[i] = p;
p += strlen(p) + 1;
- PARA_NOTICE_LOG("pattern %d: %s\n", i, opts->patterns[i]);
}
} else
opts->patterns = NULL;
if (ret < 0)
goto out;
ret = opts->num_patterns? -E_NO_MATCH : 0;
- if (!opts->num_matching_paths) {
- PARA_NOTICE_LOG("no match, ret: %d\n", ret);
+ if (!opts->num_matching_paths)
goto out;
- }
ret = sort_matching_paths(opts);
if (ret < 0)
goto out;
ret = 1;
out:
ls_output->data = b.buf;
- PARA_NOTICE_LOG("ls_outoute.data: %p\n", ls_output->data);
ls_output->size = b.size;
free(opts->data);
free(opts->data_ptr);
* 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;
*/
-
-#define ADD_FLAG_LAZY 1
-#define ADD_FLAG_FORCE 2
-#define ADD_FLAG_VERBOSE 4
-#define ADD_FLAG_ALL 8
-
-/* TODO: change log messages so that they get written to the result buffer */
+/** Flags passed to the add command. */
+enum com_add_flags {
+ /** Skip paths that exist already. */
+ ADD_FLAG_LAZY = 1,
+ /** Force adding. */
+ ADD_FLAG_FORCE = 2,
+ /** Print what is being done. */
+ ADD_FLAG_VERBOSE = 4,
+ /** Try to add files with unknown suffixes. */
+ ADD_FLAG_ALL = 8,
+};
static int com_add_callback(const struct osl_object *query,
struct osl_object *result)
{
char *buf = query->data, *path;
struct osl_row *pb, *aft_row;
- const struct osl_row *hs;
+ struct osl_row *hs;
struct osl_object objs[NUM_AFT_COLUMNS];
HASH_TYPE *hash;
char asc[2 * HASH_SIZE + 1];
pb = NULL;
}
/* file rename, update hs' path */
- ret = osl_get_object(audio_file_table, hs, AFTCOL_PATH, &obj);
- if (flags & ADD_FLAG_VERBOSE)
+ if (flags & ADD_FLAG_VERBOSE) {
+ ret = osl_get_object(audio_file_table, hs,
+ AFTCOL_PATH, &obj);
+ if (ret < 0)
+ goto out;
para_printf(&msg, "renamed from %s\n", (char *)obj.data);
+ }
ret = osl_update_object(audio_file_table, hs, AFTCOL_PATH,
&objs[AFTCOL_PATH]);
if (ret < 0)
goto out;
+ afs_event(AUDIO_FILE_RENAME, &msg, hs);
if (!(flags & ADD_FLAG_FORCE))
goto out;
}
goto out;
}
if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */
- const struct osl_row *row = pb? pb : hs;
+ struct osl_row *row = pb? pb : hs;
/* update afhi and chunk_table */
if (flags & ADD_FLAG_VERBOSE)
para_printf(&msg, "updating afhi and chunk table\n");
goto out;
ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
&objs[AFTCOL_CHUNKS]);
+ if (ret < 0)
+ goto out;
+ afs_event(AFHI_CHANGE, &msg, row);
goto out;
}
/* new entry, use default afsi */
return 0;
result->data = msg.buf;
result->size = msg.size;
+ afs_event(AUDIO_FILE_ADD, &msg, aft_row);
return 1;
- // mood_update_audio_file(aft_row, NULL);
}
struct private_add_data {
const struct private_add_data *pad = private_data;
struct audio_format_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;
+ struct osl_object map, obj = {.data = NULL}, query, result = {.data = NULL};
HASH_TYPE hash[HASH_SIZE];
afhi.header_offset = 0;
goto out_free;
}
/* We still want to add this file. Compute its hash. */
- ret = mmap_full_file(path, O_RDONLY, &map);
+ ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, NULL);
if (ret < 0)
goto out_free;
hash_function(map.data, map.size, hash);
save_audio_file_info(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, &result);
- if (result.data && result.size) {
+ if (ret >= 0 && result.data && result.size) {
ret2 = send_va_buffer(pad->fd, "%s", (char *)result.data);
free(result.data);
if (ret >= 0 && ret2 < 0)
}
+/**
+ * Flags used by the touch command.
+ *
+ * \sa com_touch().
+ */
enum touch_flags {
+ /** Whether the \p FNM_PATHNAME flag should be passed to fnmatch(). */
TOUCH_FLAG_FNM_PATHNAME = 1,
+ /** Activates verbose mode. */
TOUCH_FLAG_VERBOSE = 2
};
struct afs_info old_afsi, new_afsi;
int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 &&
tad->cto->lyrics_id < 0 && tad->cto->image_id < 0;
+ struct afsi_change_event_data aced;
ret = get_afsi_object_of_row(row, &obj);
if (ret < 0) {
new_afsi.last_played = tad->cto->last_played;
}
save_afsi(&new_afsi, &obj); /* in-place update */
- ret = mood_update_audio_file(row, &old_afsi);
- if (ret < 0)
- para_printf(&tad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+ aced.aft_row = row;
+ aced.old_afsi = &old_afsi;
+ afs_event(AFSI_CHANGE, &tad->pb, &aced);
return 1;
}
if (crd->flags & RM_FLAG_VERBOSE)
para_printf(&crd->pb, "removing %s\n", name);
- ret = mood_delete_audio_file(row);
- if (ret < 0)
- para_printf(&crd->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+ afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
ret = osl_del_row(audio_file_table, row);
if (ret < 0)
para_printf(&crd->pb, "%s: %s\n", name, PARA_STRERROR(-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)},
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;
}
+/**
+ * Flags used by the cpsi command.
+ *
+ * \sa com_cpsi().
+ */
enum cpsi_flags {
+ /** Whether the lyrics id should be copied. */
CPSI_FLAG_COPY_LYRICS_ID = 1,
+ /** Whether the image id should be copied. */
CPSI_FLAG_COPY_IMAGE_ID = 2,
+ /** Whether the lastplayed time should be copied. */
CPSI_FLAG_COPY_LASTPLAYED = 4,
+ /** Whether the numplayed count should be copied. */
CPSI_FLAG_COPY_NUMPLAYED = 8,
+ /** Whether the attributes should be copied. */
CPSI_FLAG_COPY_ATTRIBUTES = 16,
+ /** Activates verbose mode. */
CPSI_FLAG_VERBOSE = 32,
};
struct cpsi_action_data *cad = data;
struct osl_object target_afsi_obj;
int ret;
- struct afs_info target_afsi;
+ struct afs_info old_afsi, target_afsi;
+ struct afsi_change_event_data aced;
ret = get_afsi_object_of_row(row, &target_afsi_obj);
if (ret < 0)
return ret;
load_afsi(&target_afsi, &target_afsi_obj);
+ old_afsi = target_afsi;
if (cad->flags & CPSI_FLAG_COPY_LYRICS_ID)
target_afsi.lyrics_id = cad->source_afsi.lyrics_id;
if (cad->flags & CPSI_FLAG_COPY_IMAGE_ID)
cad->num_copied++;
if (cad->flags & CPSI_FLAG_VERBOSE)
para_printf(&cad->pb, "copied afsi to %s\n", name);
+ aced.aft_row = row;
+ aced.old_afsi = &old_afsi;
+ afs_event(AFSI_CHANGE, &cad->pb, &aced);
return 1;
}
return 1;
}
+/**
+ * Check the audio file table for inconsistencies.
+ *
+ * \param query Unused.
+ * \param result Contains message string upon return.
+ *
+ * This function always succeeds.
+ *
+ * \sa com_check().
+ */
int aft_check_callback(__a_unused const struct osl_object *query, struct osl_object *result)
{
struct para_buffer pb = {.buf = NULL};
}
-
-
/**
* Close the audio file table.
*
*
* \sa osl_close_table().
*/
-void aft_shutdown(enum osl_close_flags flags)
+static void aft_close(void)
{
- osl_close_table(audio_file_table, flags);
+ osl_close_table(audio_file_table, OSL_MARK_CLEAN);
audio_file_table = NULL;
}
/**
* Open the audio file table.
*
- * \param ti Gets initialized by this function.
- * \param db The database directory.
+ * \param dir The database directory.
*
- * \return Positive on success, negative on errors.
+ * \return Standard.
*
* \sa osl_open_table().
*/
-int aft_init(struct table_info *ti, const char *db)
+static int aft_open(const char *dir)
{
int ret;
- audio_file_table_desc.dir = db;
- ti->desc = &audio_file_table_desc;
- ret = osl_open_table(ti->desc, &audio_file_table);
+ audio_file_table_desc.dir = dir;
+ ret = osl_open_table(&audio_file_table_desc, &audio_file_table);
if (ret >= 0) {
unsigned num;
osl_get_num_rows(audio_file_table, &num);
}
PARA_INFO_LOG("failed to open audio file table\n");
audio_file_table = NULL;
- return ret == -E_NOENT? 1 : ret;
+ if (ret >= 0 || is_errno(-ret, ENOENT))
+ return 1;
+ return ret;
+}
+
+static int aft_create(const char *dir)
+{
+ audio_file_table_desc.dir = dir;
+ return osl_create_table(&audio_file_table_desc);
+}
+
+static int clear_attribute(struct osl_row *row, void *data)
+{
+ struct rmatt_event_data *red = data;
+ struct afs_info afsi;
+ struct osl_object obj;
+ int ret = get_afsi_object_of_row(row, &obj);
+ uint64_t mask = ~(1ULL << red->bitnum);
+
+ if (ret < 0)
+ return ret;
+ ret = load_afsi(&afsi, &obj);
+ if (ret < 0)
+ return ret;
+ afsi.attributes &= mask;
+ save_afsi(&afsi, &obj);
+ return 1;
+}
+
+static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
+ void *data)
+{
+ switch(event) {
+ case ATTRIBUTE_REMOVE: {
+ const struct rmatt_event_data *red = data;
+ para_printf(pb, "clearing attribute %s (bit %u) from all "
+ "entries in the audio file table\n", red->name,
+ red->bitnum);
+ return audio_file_loop(data, clear_attribute);
+ }
+ default:
+ return 1;
+ }
+}
+
+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;
+ t->event_handler = aft_event_handler;
}
projects / paraslash.git / blobdiff