Get rid of afd->afsi and rename afs_status_info to verbose_ls_output.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index 483ab2526e1c1c4259b871644cbab704e524b73d..fae883b4a4cab98202407c6bf1b82ffe3143f7e5 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -663,13 +663,14 @@ int load_afd(int shmid, struct audio_file_data *afd)
  * and the lastplayed time is set to the current time. Finally, the score of
  * the audio file is updated.
  *
- * \return Positive on success, negative on errors.
+ * \return Positive shmid on success, negative on errors.
  */
-int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *afd)
+int open_and_update_audio_file(struct osl_row *aft_row,
+       struct audio_file_data *afd, long score)
 {
        HASH_TYPE *aft_hash, file_hash[HASH_SIZE];
        struct osl_object afsi_obj;
-       struct afs_info new_afsi;
+       struct afs_info old_afsi, new_afsi;
        int ret = get_hash_of_row(aft_row, &aft_hash);
        struct afsi_change_event_data aced;
        struct osl_object map, chunk_table_obj;
@@ -680,12 +681,10 @@ 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;
-       ret = load_afsi(&afd->afsi, &afsi_obj);
+       ret = load_afsi(&old_afsi, &afsi_obj);
        if (ret < 0)
                return ret;
        ret = get_afhi_of_row(aft_row, &afd->afhi);
@@ -706,7 +705,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
                ret = -E_HASH_MISMATCH;
                goto err;
        }
-       new_afsi = afd->afsi;
+       new_afsi = old_afsi;
        new_afsi.num_played++;
        new_afsi.last_played = time(NULL);
        save_afsi(&new_afsi, &afsi_obj); /* in-place update */
@@ -717,21 +716,21 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
        {
                struct ls_data d = {
                        .afhi = afd->afhi,
-                       .afsi = afd->afsi,
+                       .afsi = old_afsi,
                        .path = path,
-                       .score = afd->score,
+                       .score = score,
                        .hash = file_hash
                };
                struct para_buffer pb = {.buf = NULL};
                ret = make_status_items(&d, &pb);
                if (ret < 0)
                        goto err;
-               strncpy(afd->afs_status_info, pb.buf, AFS_STATUS_INFO_SIZE);
-               afd->afs_status_info[AFS_STATUS_INFO_SIZE - 1] = '\0';
+               strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
+               afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
                free(pb.buf);
        }
        aced.aft_row = aft_row;
-       aced.old_afsi = &afd->afsi;
+       aced.old_afsi = &old_afsi;
        afs_event(AFSI_CHANGE, NULL, &aced);
        ret = save_afd(afd);
        if (ret < 0)
@@ -811,7 +810,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 +833,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 +863,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 +915,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 */
@@ -916,8 +933,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        "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,
@@ -978,6 +994,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;
 }