}
};
-static const struct osl_table_description audio_file_table_desc = {
- .dir = DATABASE_DIR,
+static struct osl_table_description audio_file_table_desc = {
.name = "audio_files",
.num_columns = NUM_AFT_COLUMNS,
.flags = OSL_LARGE_TABLE,
return 1;
}
-static int verify_path(const char *path, char **resolved_path)
+static int verify_path(const char *orig_path, char **resolved_path)
{
- const char *orig_path = path;
char c;
const char prefix[] = AFS_AUDIO_FILE_DIR "/";
+ const char *path = orig_path;
const size_t prefix_len = strlen(prefix);
- PARA_DEBUG_LOG("path: %s\n", path);
c = *path++;
if (!c)
- return -E_BAD_PATH;
+ goto bad_path;
while (c) {
if (c == '/') {
c = *path++;
switch (c) {
default:
continue;
- case '/': case '\0':
- break;
+ case '/': /* double slash */
+ goto bad_path;
case '.':
- if (verify_dotfile(path) > 0)
- continue;
+ if (verify_dotfile(path) < 0)
+ goto bad_path;
}
- *resolved_path = NULL;
- return -E_BAD_PATH;
}
c = *path++;
}
- if (*orig_path == '/')
- *resolved_path = prefix_path("", 0, orig_path);
- else
+ if (*orig_path != '/')
*resolved_path = prefix_path(prefix, prefix_len, orig_path);
- PARA_DEBUG_LOG("resolved: %s\n", *resolved_path);
- return *resolved_path? 1: -E_BAD_PATH;
+ else
+ *resolved_path = para_strdup(orig_path);
+ return 1;
+bad_path:
+ return -E_BAD_PATH;
}
enum afhi_offsets {
}
/** The offsets of the data contained in the AFTCOL_CHUNKS column. */
-enum chunk_info_offsets {
+enum chunk_info_offsets{
/** The total number of chunks (4 bytes). */
CHUNKS_TOTAL_OFFSET = 0,
/** The length of the audio file header (4 bytes). */
{
struct osl_object obj = {.data = path, .size = strlen(path) + 1};
- PARA_NOTICE_LOG("audio_file_table: %p\n", audio_file_table);
return osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row);
}
} \
}
-static short unsigned get_duration(int seconds_total, char *buf, short unsigned max_width)
+static short unsigned get_duration_width(int seconds)
{
short unsigned width;
- int s = seconds_total;
- unsigned hours = s / 3600, mins = (s % 3600) / 60, secs = s % 60;
-
- if (s < 3600) { /* less than one hour => m:ss or mm:ss */
- GET_NUM_DIGITS(mins, &width); /* 1 or 2 */
- width += 3; /* 4 or 5 */
- if (buf)
- sprintf(buf, "%*u:%02u", max_width - width + 1, mins, secs);
- return width;
- }
+ unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
+
+ if (!hours) /* less than one hour => m:ss or mm:ss => 4 or 5 digits */
+ return 4 + (mins > 9);
/* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
GET_NUM_DIGITS(hours, &width);
- width += 6;
- if (buf)
- sprintf(buf, "%*u:%02u:%02u", max_width - width + 1, hours, mins, secs);
- return width;
+ return width + 6;
+}
+
+static void get_duration_buf(int seconds, char *buf, short unsigned max_width)
+{
+ unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
+
+ if (!hours) /* m:ss or mm:ss */
+ sprintf(buf, "%*u:%02u", max_width - 3, mins, seconds % 60);
+ else /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
+ sprintf(buf, "%*u:%02u:%02u", max_width - 6, hours, mins,
+ seconds % 60);
}
static char *make_attribute_line(const char *att_bitmap, struct afs_info *afsi)
sizeof(last_played_time));
if (ret < 0)
return ret;
- get_duration(afhi->seconds_total, duration_buf, w->duration_width);
+ get_duration_buf(afhi->seconds_total, duration_buf, w->duration_width);
if (have_score) {
if (opts->mode == LS_MODE_LONG)
sprintf(score_buf, "%*li ", w->score_width, d->score);
w->image_id_width, afsi->image_id,
w->lyrics_id_width, afsi->lyrics_id,
w->bitrate_width, afhi->bitrate,
- audio_format_name(afsi->audio_format_id), /* FIXME */
+ audio_format_name(afsi->audio_format_id),
w->frequency_width, afhi->frequency,
afhi->channels,
duration_buf,
image_line,
lyrics_line,
afhi->bitrate,
- "mp3", /* FIXME */
+ audio_format_name(afsi->audio_format_id),
afhi->frequency,
afhi->channels,
duration_buf,
w->frequency_width = PARA_MAX(w->frequency_width, num_digits);
GET_NUM_DIGITS(d->afsi.num_played, &num_digits);
w->num_played_width = PARA_MAX(w->num_played_width, num_digits);
- /* just get the number of chars to print this amount of time */
- tmp = get_duration(d->afhi.seconds_total, NULL, 0);
+ /* get the number of chars to print this amount of time */
+ tmp = get_duration_width(d->afhi.seconds_total);
w->duration_width = PARA_MAX(w->duration_width, tmp);
if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) {
GET_NUM_DIGITS(score, &num_digits);
prepare_ls_row);
if (ret < 0)
goto out;
- ret = opts->num_patterns? -E_NO_MATCH : 1;
+ ret = opts->num_patterns? -E_NO_MATCH : 0;
if (!opts->num_matching_paths) {
PARA_NOTICE_LOG("no match, ret: %d\n", ret);
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);
opts.num_patterns = argc - i;
ret = send_option_arg_callback_request(&query, opts.num_patterns,
argv + i, com_ls_callback, &ls_output);
- if (ret >= 0 && ls_output.data) {
- send_buffer(fd, (char *)ls_output.data);
+ if (ret > 0) {
+ ret = send_buffer(fd, (char *)ls_output.data);
free(ls_output.data);
}
return ret;
#define ADD_FLAG_FORCE 2
#define ADD_FLAG_VERBOSE 4
+/* TODO: change log messages so that they get written to the result buffer */
+
static int com_add_callback(const struct osl_object *query,
__a_unused struct osl_object *result)
{
default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
default_afsi.audio_format_id = read_u8(buf + AFTROW_AUDIO_FORMAT_OFFSET);
- if (flags & ADD_FLAG_VERBOSE)
- PARA_NOTICE_LOG("adding %s\n", path);
objs[AFTCOL_AFSI].data = &afsi_buf;
objs[AFTCOL_AFSI].size = AFSI_SIZE;
save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
return 1;
}
-
static int add_one_audio_file(const char *arg, const void *private_data)
{
int ret;
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, query, result;
- char *path;
+ struct osl_object map, obj = {.data = NULL}, query, result;
+ char *path = NULL;
HASH_TYPE hash[HASH_SIZE];
afhi.header_offset = 0;
afhi.header_len = 0;
ret = verify_path(arg, &path);
if (ret < 0)
- return ret;
+ goto out_free;
query.data = path;
query.size = strlen(path) + 1;
ret = send_callback_request(path_brother_callback, &query, &result);
ret = 1;
if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
if (pad->flags & ADD_FLAG_VERBOSE)
- PARA_NOTICE_LOG("lazy-ignore: %s\n", path);
+ ret = send_va_buffer(pad->fd, "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)
- PARA_NOTICE_LOG("not forcing update: %s\n", path);
+ ret = send_va_buffer(pad->fd,
+ "not forcing update: %s\n", path);
goto out_unmap;
}
/*
*/
if (!hs || (pad->flags & ADD_FLAG_FORCE)) {
ret = compute_afhi(path, map.data, map.size, &afhi);
- if (ret < 0) {
- PARA_WARNING_LOG("audio format of %s not recognized, skipping\n", path);
- ret = 1;
+ if (ret < 0)
goto out_unmap;
- }
format_num = ret;
afhi_ptr = &afhi;
}
+ if (pad->flags & ADD_FLAG_VERBOSE)
+ send_va_buffer(pad->fd, "adding %s\n", path);
munmap(map.data, map.size);
save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj);
/* Ask afs to consider this entry for adding. */
out_unmap:
munmap(map.data, map.size);
out_free:
+ if (ret < 0)
+ send_va_buffer(pad->fd, "failed to add %s (%s)\n", path?
+ path : arg, PARA_STRERROR(-ret));
free(obj.data);
free(path);
if (afhi_ptr)
free(afhi_ptr->chunk_table);
- return ret;
+ return 1; /* it's not an error if not all files could be added */
}
int com_add(int fd, int argc, char * const * const argv)
struct private_add_data pad = {.fd = fd, .flags = 0};
struct stat statbuf;
- PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (arg[0] != '-')
if (argc <= i)
return -E_AFT_SYNTAX;
for (; i < argc; i++) {
- ret = stat(argv[i], &statbuf);
+ char *path = para_strdup(argv[i]);
+ size_t len = strlen(path);
+ while (len > 1 && path[--len] == '/')
+ path[len] = '\0';
+ ret = stat(path, &statbuf);
if (ret < 0)
- return -E_AFS_STAT;
- if (S_ISDIR(statbuf.st_mode)) {
- ret = for_each_file_in_dir(argv[i],
- add_one_audio_file, &pad);
- if (ret < 0)
- return ret;
- continue;
- }
- ret = add_one_audio_file(argv[i], &pad);
- if (ret < 0)
- goto out;
+ PARA_NOTICE_LOG("failed to stat %s (%s)", path,
+ strerror(errno));
+ else
+ if (S_ISDIR(statbuf.st_mode))
+ for_each_file_in_dir(path, add_one_audio_file,
+ &pad);
+ else
+ add_one_audio_file(path, &pad);
+ free(path);
}
ret = 1;
-out:
return ret;
}
/**
* Open the audio file table.
*
- * \param ti Gets initialized by this function
+ * \param ti Gets initialized by this function.
+ * \param db The database directory.
*
* \return Positive on success, negative on errors.
*
* \sa osl_open_table().
*/
-int aft_init(struct table_info *ti)
+int aft_init(struct table_info *ti, const char *db)
{
int ret;
+ audio_file_table_desc.dir = db;
ti->desc = &audio_file_table_desc;
ret = osl_open_table(ti->desc, &ti->table);
if (ret >= 0) {
projects / paraslash.git / blobdiff