/** \file aft.c Audio file table functions. */
#include <dirent.h> /* readdir() */
+#include <osl.h>
#include "para.h"
#include "error.h"
#include "string.h"
NUM_AFT_COLUMNS
};
+/**
+ * Compare two osl objects pointing to hash values.
+ *
+ * \param obj1 Pointer to the first hash object.
+ * \param obj2 Pointer to the second hash object.
+ *
+ * \return The values required for an osl compare function.
+ *
+ * \sa osl_compare_func, uint32_compare().
+ */
+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);
+}
+
static struct osl_column_description aft_cols[] = {
[AFTCOL_HASH] = {
.storage_type = OSL_MAPPED_STORAGE,
.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
.name = "hash",
- .compare_function = osl_hash_compare,
+ .compare_function = aft_hash_compare,
.data_size = HASH_SIZE
},
[AFTCOL_PATH] = {
* \param path The full path of the audio file.
* \param row Result pointer.
*
- * \return The return value of the underlying call to osl_get_row().
+ * \return Standard.
*/
int aft_get_row_of_path(const char *path, struct osl_row **row)
{
struct osl_object obj = {.data = (char *)path, .size = strlen(path) + 1};
- return osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row);
+ return osl(osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row));
}
/**
* \param hash The hash value of the desired audio file.
* \param row resul pointer.
*
- * \return The return value of the underlying call to osl_get_row().
+ * \return Standard.
*/
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_get_row(audio_file_table, AFTCOL_HASH, &obj, row);
+ return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
}
/**
* \param row Pointer to a row in the audio file table.
* \param obj Result pointer.
*
- * \return The return value of the underlying call to osl_get_object().
+ * \return Standard.
*/
int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
{
- return osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj);
+ return osl(osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj));
}
/**
int get_audio_file_path_of_row(const struct osl_row *row, char **path)
{
struct osl_object path_obj;
- int ret = osl_get_object(audio_file_table, row, AFTCOL_PATH,
- &path_obj);
+ int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_PATH,
+ &path_obj));
if (ret < 0)
return ret;
*path = path_obj.data;
*
* \sa get_hash_of_row().
*/
-static int get_hash_object_of_aft_row(const struct osl_row *row, struct osl_object *obj)
+static int get_hash_object_of_aft_row(const struct osl_row *row,
+ struct osl_object *obj)
{
- return osl_get_object(audio_file_table, row, AFTCOL_HASH, obj);
+ return osl(osl_get_object(audio_file_table, row, AFTCOL_HASH, obj));
}
/**
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,
- &obj);
+ int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_AFHI,
+ &obj));
if (ret < 0)
return ret;
load_afhi(obj.data, afhi);
);
}
+static void fixup_taginfo(char *begin, char *end)
+{
+ char *p = begin;
+
+ for (;;) {
+ p = strchr(p, '\n');
+ if (!p)
+ break;
+ if (p >= end - 1)
+ break;
+ *p = ' ';
+ p++;
+ }
+}
+
+/* crap, remove this ASAP. */
+static int fixup_info_string(char *info_string)
+{
+ char *t1, *t2, *end;
+
+ if (strncmp(info_string, "audio_file_info:", 16))
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+ t1 = strstr(info_string, "\ntaginfo1:");
+ if (!t1)
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+ t2 = strstr(info_string, "\ntaginfo2: ");
+ if (!t2)
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+
+ end = t2 + strlen(t2) + 1;
+ fixup_taginfo(info_string + 16, t1);
+ fixup_taginfo(t1 + 10, t2);
+ fixup_taginfo(t2 + 10, end);
+
+ if (t1 - info_string < 80 && t2 - t1 < 80 && end - t2 < 80)
+ return 0;
+ if (t1 - info_string >= 80) {
+ memmove(info_string + 80, t1, end - t1);
+ t1 = info_string + 80;
+ t2 -= t1 - info_string - 80;
+ end -= t1 - info_string - 80;
+ }
+ if (t2 - t1 >= 80) {
+ memmove(t1 + 80, t2, end - t2);
+ end -= t2 - t1 - 80;
+ t2 = t1 + 80;
+ }
+ if (end - t2 >= 80) {
+ t2[78] = '\n';
+ t2[79] = '\0';
+ }
+ return 1;
+}
+
static int make_status_items(struct audio_file_data *afd,
struct afs_info *afsi, char *path, long score,
HASH_TYPE *hash)
{
struct ls_data d = {
- .afhi = afd->afhi, /* struct copy */
+ .afhi = afd->afhi,
.afsi = *afsi,
.path = path,
.score = score,
time_t current_time;
int ret;
+ ret = fixup_info_string(afd->afhi.info_string);
+ if (ret < 0) {
+ PARA_WARNING_LOG("ignoring invalid tag info\n");
+ afd->afhi.info_string[0] = '\0';
+ } else if (ret)
+ PARA_NOTICE_LOG("truncated overlong tag info\n");
time(¤t_time);
ret = print_list_item(&d, &opts, &pb, current_time); /* frees info string */
afd->afhi.info_string = NULL;
if (opts->flags & LS_FLAG_ADMISSIBLE_ONLY)
ret = admissible_file_loop(opts, prepare_ls_row);
else
- ret = osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
- prepare_ls_row);
+ ret = osl(osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
+ prepare_ls_row));
if (ret < 0)
goto out;
if (!opts->num_matching_paths)
* \param private_data An arbitrary data pointer, passed to \a func.
* \param func The custom function to be called.
*
- * \return The return value of the underlying call to osl_rbtree_loop().
+ * \return Standard.
*/
int audio_file_loop(void *private_data, osl_rbtree_loop_func *func)
{
- return osl_rbtree_loop(audio_file_table, AFTCOL_HASH, private_data,
- func);
+ return osl(osl_rbtree_loop(audio_file_table, AFTCOL_HASH, private_data,
+ func));
}
static struct osl_row *find_hash_sister(HASH_TYPE *hash)
PARA_INFO_LOG("request to add %s\n", path);
hs = find_hash_sister(hash);
ret = aft_get_row_of_path(path, &pb);
- if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+ if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
goto out;
if (hs && pb && hs == pb && !(flags & ADD_FLAG_FORCE)) {
if (flags & ADD_FLAG_VERBOSE)
if (ret < 0)
goto out;
}
- ret = osl_del_row(audio_file_table, pb);
+ ret = osl(osl_del_row(audio_file_table, pb));
if (ret < 0)
goto out;
pb = NULL;
}
/* file rename, update hs' path */
if (flags & ADD_FLAG_VERBOSE) {
- ret = osl_get_object(audio_file_table, hs,
- AFTCOL_PATH, &obj);
+ ret = osl(osl_get_object(audio_file_table, hs,
+ AFTCOL_PATH, &obj));
if (ret < 0)
goto out;
ret = para_printf(&msg, "renamed from %s\n", (char *)obj.data);
if (ret < 0)
goto out;
}
- ret = osl_update_object(audio_file_table, hs, AFTCOL_PATH,
- &objs[AFTCOL_PATH]);
+ ret = osl(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 (ret < 0)
goto out;
}
- ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI,
- &objs[AFTCOL_AFHI]);
+ ret = osl(osl_update_object(audio_file_table, row, AFTCOL_AFHI,
+ &objs[AFTCOL_AFHI]));
if (ret < 0)
goto out;
- ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
- &objs[AFTCOL_CHUNKS]);
+ ret = osl(osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
+ &objs[AFTCOL_CHUNKS]));
if (ret < 0)
goto out;
afs_event(AFHI_CHANGE, &msg, row);
objs[AFTCOL_AFSI].data = &afsi_buf;
objs[AFTCOL_AFSI].size = AFSI_SIZE;
save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
- ret = osl_add_and_get_row(audio_file_table, objs, &aft_row);
+ ret = osl(osl_add_and_get_row(audio_file_table, objs, &aft_row));
afs_event(AUDIO_FILE_ADD, &msg, aft_row);
out:
if (ret < 0)
query.size = strlen(path) + 1;
ret = send_callback_request(path_brother_callback, &query,
get_row_pointer_from_result, &pb);
- if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+ if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
goto out_free;
ret = 1;
if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
return ret;
}
afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
- ret = osl_del_row(audio_file_table, row);
+ ret = osl(osl_del_row(audio_file_table, row));
if (ret < 0)
para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret));
else
int ret;
audio_file_table_desc.dir = dir;
- ret = osl_open_table(&audio_file_table_desc, &audio_file_table);
+ ret = osl(osl_open_table(&audio_file_table_desc, &audio_file_table));
if (ret >= 0) {
unsigned num;
osl_get_num_rows(audio_file_table, &num);
static int aft_create(const char *dir)
{
audio_file_table_desc.dir = dir;
- return osl_create_table(&audio_file_table_desc);
+ return osl(osl_create_table(&audio_file_table_desc));
}
static int clear_attribute(struct osl_row *row, void *data)