afs.c: Avoid noisy log message.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index 04846a7658e34979f6bdcab62669b2c1c826a1a6..0f15cd28e96cf726275508faa63b07d4a75e190b 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -69,7 +69,7 @@ int load_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
        char *buf = obj->data;
        if (obj->size < AFSI_SIZE)
 {
        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);
        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);


@@ -376,7 +376,7 @@ int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
  *
  * \return The return value of the underlying call to osl_get_object().
  */
  *
  * \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);
 }
 {
        return osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj);
 }


@@ -445,7 +445,7 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
  *
  * \sa get_hash_of_row().
  */
  *
  * \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 osl_get_object(audio_file_table, row, AFTCOL_HASH, obj);
 }


@@ -461,7 +461,7 @@ int get_hash_object_of_aft_row(const void *row, struct osl_object *obj)
  * \return The return value of the underlying call to
  * get_hash_object_of_aft_row().
  */
  * \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);
 {
        struct osl_object obj;
        int ret = get_hash_object_of_aft_row(row, &obj);


@@ -482,7 +482,7 @@ static int get_hash_of_row(const void *row, HASH_TYPE **hash)
  *
  * \sa get_chunk_table_of_row().
  */
  *
  * \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,
 {
        struct osl_object obj;
        int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,


@@ -503,7 +503,7 @@ int get_afhi_of_row(const void *row, struct audio_format_info *afhi)
  *
  * \sa get_afhi_of_row().
  */
  *
  * \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,
 {
        struct osl_object obj;
        int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,


@@ -572,15 +572,14 @@ err:
        return ret;
 }
 
        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;
 {
        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;
                if (!strftime(buf, size, "%b %e %k:%M", &t))
                        return -E_STRFTIME;
                return 1;


@@ -600,25 +599,27 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size)
                } \
        }
 
                } \
        }
 

-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;
 {
        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);
        /* 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 char *make_attribute_line(const char *att_bitmap, struct afs_info *afsi)


@@ -652,7 +653,7 @@ static char *make_image_line(struct afs_info *afsi)
 }
 
 static int print_list_item(struct ls_data *d, struct ls_options *opts,
 }
 
 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];
 {
        int ret;
        char att_buf[65];


@@ -670,10 +671,10 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        }
        get_attribute_bitmap(&afsi->attributes, att_buf);
        ret = get_local_time(&afsi->last_played, last_played_time,
        }
        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;
        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);
        if (have_score) {
                if (opts->mode == LS_MODE_LONG)
                        sprintf(score_buf, "%*li ", w->score_width, d->score);


@@ -681,6 +682,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        sprintf(score_buf, "%li ", 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 */
        if (opts->mode == LS_MODE_LONG) {
                para_printf(b,
                        "%s"    /* score */


@@ -825,7 +827,7 @@ static int ls_path_compare(const void *a, const void *b)
 static int sort_matching_paths(struct ls_options *options)
 {
        size_t nmemb = options->num_matching_paths;
 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;
 
        int (*compar)(const void *, const void *);
        int i;
 


@@ -941,8 +943,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
        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);
        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);
        w->duration_width = PARA_MAX(w->duration_width, tmp);
        if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) {
                GET_NUM_DIGITS(score, &num_digits);


@@ -960,6 +962,8 @@ static int com_ls_callback(const struct osl_object *query,
        char *p, *pattern_start = (char *)query->data + sizeof(*opts);
        struct para_buffer b = {.buf = NULL, .size = 0};
        int i = 0, ret;
        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) {
 
        PARA_NOTICE_LOG("%d patterns\n", opts->num_patterns);
        if (opts->num_patterns) {


@@ -986,15 +990,16 @@ static int com_ls_callback(const struct osl_object *query,
        ret = sort_matching_paths(opts);
        if (ret < 0)
                goto out;
        ret = sort_matching_paths(opts);
        if (ret < 0)
                goto out;

+       time(&current_time);

        if (opts->flags & LS_FLAG_REVERSE)
                for (i = opts->num_matching_paths - 1; i >= 0; i--) {
        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++) {
                        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;
                }
                        if (ret < 0)
                                break;
                }


@@ -1010,7 +1015,7 @@ out:
 }
 
 /*
 }
 
 /*

- * 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
  *
  * long list: list hash, attributes as (xx--x-x-), file size, lastplayed
  * full list: list everything, including afsi, afhi, atts as clear text


@@ -1114,7 +1119,6 @@ int com_afs_ls(int fd, int argc, char * const * const argv)
                }
                return -E_AFT_SYNTAX;
        }
                }
                return -E_AFT_SYNTAX;
        }

-       time(&now);

        opts.flags = flags;
        opts.sorting = sort;
        opts.mode = mode;
        opts.flags = flags;
        opts.sorting = sort;
        opts.mode = mode;


@@ -1266,7 +1270,7 @@ static int com_add_callback(const struct osl_object *query,
        objs[AFTCOL_PATH].data = path;
        objs[AFTCOL_PATH].size = strlen(path) + 1;
 
        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)
        hs = find_hash_sister(hash);
        ret = aft_get_row_of_path(path, &pb);
        if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)


@@ -1323,24 +1327,22 @@ static int com_add_callback(const struct osl_object *query,
                        return ret;
        }
        if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */
                        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)
                /* 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)
                                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 = 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;
        }
        /* new entry, use default afsi */
        default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;


@@ -1693,6 +1695,54 @@ err:
        return ret;
 }
 
        return ret;
 }
 

+/* TODO: optionally fix problems by removing offending rows */
+static int check_audio_file(struct osl_row *row, void *data)
+{
+       char *path;
+       struct para_buffer *pb = data;
+       struct stat statbuf;
+       int ret = get_audio_file_path_of_row(row, &path);
+       struct afs_info afsi;
+       char *blob_name;
+
+       if (ret < 0) {
+               para_printf(pb, "%s\n", PARA_STRERROR(-ret));
+               return 1;
+       }
+       if (stat(path, &statbuf) < 0)
+               para_printf(pb, "%s: stat error (%s)\n", path, strerror(errno));
+       else {
+               if (!S_ISREG(statbuf.st_mode))
+                       para_printf(pb, "%s: not a regular file\n", path);
+       }
+       ret = get_afsi_of_row(row, &afsi);
+       if (ret < 0) {
+               para_printf(pb, "%s: %s\n", path, PARA_STRERROR(-ret));
+               return 1;
+       }
+       ret = lyr_get_name_by_id(afsi.lyrics_id, &blob_name);
+       if (ret < 0)
+               para_printf(pb, "%s lyrics id %u: %s\n", path, afsi.lyrics_id,
+                       PARA_STRERROR(-ret));
+       ret = img_get_name_by_id(afsi.image_id, &blob_name);
+       if (ret < 0)
+               para_printf(pb, "%s image id %u: %s\n", path, afsi.image_id,
+                       PARA_STRERROR(-ret));
+       return 1;
+}
+
+int aft_check_callback(__a_unused const struct osl_object *query, struct osl_object *result)
+{
+       struct para_buffer pb = {.buf = NULL};
+
+       para_printf(&pb, "checking audio file table...\n");
+       audio_file_loop(&pb, check_audio_file);
+       result->data = pb.buf;
+       result->size = pb.size;
+       return 1;
+
+}
+

 /**
  * Close the audio file table.
  *
 /**
  * Close the audio file table.
  *


@@ -1703,6 +1753,7 @@ err:
 void aft_shutdown(enum osl_close_flags flags)
 {
        osl_close_table(audio_file_table, flags);
 void aft_shutdown(enum osl_close_flags flags)
 {
        osl_close_table(audio_file_table, flags);

+       audio_file_table = NULL;

 }
 
 /**
 }
 
 /**