]> git.tuebingen.mpg.de Git - paraslash.git/blobdiff - aft.c
Get rid of afd->path.
[paraslash.git] / aft.c
diff --git a/aft.c b/aft.c
index 8ac8538f7f74c37cdff2b42a827e52af28aa651e..e41073ac1d4053925d53ce7b07bfa672e5e5ddac 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -680,8 +680,6 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
        ret = get_audio_file_path_of_row(aft_row, &path);
        if (ret < 0)
                return ret;
-       strncpy(afd->path, path, sizeof(afd->path) - 1);
-       afd->path[sizeof(afd->path) - 1] = '\0';
        ret = get_afsi_object_of_row(aft_row, &afsi_obj);
        if (ret < 0)
                return ret;
@@ -811,7 +809,7 @@ static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
        get_attribute_text(&afsi->attributes, " ", &att_text);
        if (!att_text)
                return para_strdup(att_bitmap);
-       att_lines = make_message("%s\nattributes_txt: %s",
+       att_lines = make_message("attributes: %s\nattributes_txt: %s",
                att_bitmap, att_text);
        free(att_text);
        return att_lines;
@@ -834,6 +832,23 @@ static char *make_image_lines(struct afs_info *afsi)
                afsi->image_id, image_name? image_name : "(none)");
 }
 
+static char *make_filename_lines(const char *path, unsigned flags)
+{
+       char *basename, *dirname;
+       char *ret;
+
+       if (!(flags & LS_FLAG_FULL_PATH))
+               return make_message("%s: %s\n%s:\n", "basename", path,
+                       "dir");
+       basename = para_basename(path),
+       dirname = para_dirname(path);
+       ret = make_message("%s: %s\n%s: %s\n%s: %s\n", "path", path,
+               "dir", dirname, "basename", basename);
+       free(basename);
+       free(dirname);
+       return ret;
+}
+
 static int print_list_item(struct ls_data *d, struct ls_options *opts,
        struct para_buffer *b, time_t current_time)
 {
@@ -847,7 +862,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        struct ls_widths *w = &opts->widths;
        int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
        char asc_hash[2 * HASH_SIZE + 1];
-       char *att_lines, *lyrics_lines, *image_lines;
+       char *att_lines, *lyrics_lines, *image_lines, *filename_lines;
 
        if (opts->mode == LS_MODE_SHORT) {
                para_printf(b, "%s\n", d->path);
@@ -899,11 +914,12 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        att_lines = make_attribute_lines(att_buf, afsi);
        lyrics_lines = make_lyrics_lines(afsi);
        image_lines = make_image_lines(afsi);
+       filename_lines = make_filename_lines(d->path, opts->flags);
        if (opts->mode == LS_MODE_VERBOSE) {
                para_printf(b,
-                       "%s: %s\n" /* path */
+                       "%s" /* filename stuff */
                        "%s%s%s" /* score */
-                       "attributes: %s\n"
+                       "%s\n" /* attributes */
                        "hash: %s\n"
                        "%s" /* image id, image name */
                        "%s" /* lyrics */
@@ -912,11 +928,11 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        "frequency: %dHz\n"
                        "channels: %d\n"
                        "duration: %s\n"
+                       "seconds_total: %lu\n"
                        "num_played: %d\n"
                        "last_played: %s\n"
                        "tag info: %s\n",
-                       (opts->flags & LS_FLAG_FULL_PATH)?
-                               "path" : "file", d->path,
+                       filename_lines,
                        have_score? "score: " : "", score_buf,
                                have_score? "\n" : "",
                        att_lines,
@@ -928,6 +944,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        afhi->frequency,
                        afhi->channels,
                        duration_buf,
+                       afhi->seconds_total,
                        afsi->num_played,
                        last_played_time,
                        afhi->info_string
@@ -976,6 +993,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        free(att_lines);
        free(lyrics_lines);
        free(image_lines);
+       free(filename_lines);
        return 1;
 }