{
char *buf = obj->data;
if (obj->size < AFSI_SIZE)
- return -E_BAD_AFS;
+ return -E_BAD_AFSI;
afsi->last_played = read_u64(buf + AFSI_LAST_PLAYED_OFFSET);
afsi->attributes = read_u64(buf + AFSI_ATTRIBUTES_OFFSET);
afsi->num_played = read_u32(buf + AFSI_NUM_PLAYED_OFFSET);
{
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);
}
*
* \return The return value of the underlying call to osl_get_object().
*/
-int get_afsi_object_of_row(const void *row, struct osl_object *obj)
+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);
}
*
* \sa get_hash_of_row().
*/
-int get_hash_object_of_aft_row(const void *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 The return value of the underlying call to
* get_hash_object_of_aft_row().
*/
-static int get_hash_of_row(const void *row, HASH_TYPE **hash)
+static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
{
struct osl_object obj;
int ret = get_hash_object_of_aft_row(row, &obj);
*
* \sa get_chunk_table_of_row().
*/
-int get_afhi_of_row(const void *row, struct audio_format_info *afhi)
+static int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
{
struct osl_object obj;
int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
*
* \sa get_afhi_of_row().
*/
-int get_chunk_table_of_row(const void *row, struct audio_format_info *afhi)
+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,
return ret;
}
-time_t now;
-
-static int get_local_time(uint64_t *seconds, char *buf, size_t size)
+static int get_local_time(uint64_t *seconds, char *buf, size_t size,
+ time_t current_time)
{
struct tm t;
if (!localtime_r((time_t *)seconds, &t))
return -E_LOCALTIME;
- if (*seconds + 6 * 30 * 24 * 3600 > now) {
+ if (*seconds + 6 * 30 * 24 * 3600 > current_time) {
if (!strftime(buf, size, "%b %e %k:%M", &t))
return -E_STRFTIME;
return 1;
} \
}
-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)
}
static int print_list_item(struct ls_data *d, struct ls_options *opts,
- struct para_buffer *b)
+ struct para_buffer *b, time_t current_time)
{
int ret;
char att_buf[65];
}
get_attribute_bitmap(&afsi->attributes, att_buf);
ret = get_local_time(&afsi->last_played, last_played_time,
- sizeof(last_played_time));
+ sizeof(last_played_time), current_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);
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 */
static int sort_matching_paths(struct ls_options *options)
{
size_t nmemb = options->num_matching_paths;
- size_t size = sizeof(uint32_t);
+ size_t size = sizeof(*options->data_ptr);
int (*compar)(const void *, const void *);
int i;
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);
char *p, *pattern_start = (char *)query->data + sizeof(*opts);
struct para_buffer b = {.buf = NULL, .size = 0};
int i = 0, ret;
+ time_t current_time;
+
PARA_NOTICE_LOG("%d patterns\n", opts->num_patterns);
if (opts->num_patterns) {
ret = sort_matching_paths(opts);
if (ret < 0)
goto out;
+ time(¤t_time);
if (opts->flags & LS_FLAG_REVERSE)
for (i = opts->num_matching_paths - 1; i >= 0; i--) {
- ret = print_list_item(opts->data_ptr[i], opts, &b);
+ ret = print_list_item(opts->data_ptr[i], opts, &b, current_time);
if (ret < 0)
break;
}
else
for (i = 0; i < opts->num_matching_paths; i++) {
- ret = print_list_item(opts->data_ptr[i], opts, &b);
+ ret = print_list_item(opts->data_ptr[i], opts, &b, current_time);
if (ret < 0)
break;
}
}
/*
- * TODO: flags -h (sort by hash)
+ * TODO: flags -h (sort by hash) -lm (list in mbox format)
*
* long list: list hash, attributes as (xx--x-x-), file size, lastplayed
* full list: list everything, including afsi, afhi, atts as clear text
}
return -E_AFT_SYNTAX;
}
- time(&now);
opts.flags = flags;
opts.sorting = sort;
opts.mode = mode;
objs[AFTCOL_PATH].data = path;
objs[AFTCOL_PATH].size = strlen(path) + 1;
- PARA_DEBUG_LOG("request to add %s with hash %s\n", path, asc);
+ 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)
return ret;
}
if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */
- const void *row = pb? pb : hs;
+ const struct osl_row *row = pb? pb : hs;
/* update afhi and chunk_table */
if (flags & ADD_FLAG_VERBOSE)
- PARA_NOTICE_LOG("updating audio format handler info (%zd bytes)\n",
+ PARA_DEBUG_LOG("updating audio format handler info (%zd bytes)\n",
objs[AFTCOL_AFHI].size);
ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI,
&objs[AFTCOL_AFHI]);
if (ret < 0)
return ret;
if (flags & ADD_FLAG_VERBOSE)
- PARA_NOTICE_LOG("updating chunk table\n");
+ PARA_DEBUG_LOG("updating chunk table\n");
ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
&objs[AFTCOL_CHUNKS]);
if (ret < 0)
return ret;
- ret = mood_update_audio_file(row, NULL);
- if (ret < 0)
- return ret;
+ return mood_update_audio_file(row, NULL);
}
/* new entry, use default afsi */
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]);
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. */
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] != '-')
void aft_shutdown(enum osl_close_flags flags)
{
osl_close_table(audio_file_table, flags);
+ audio_file_table = NULL;
}
/**
projects / paraslash.git / blobdiff