static char *get_status(struct misc_meta_data *nmmd)
{
- char *basename, *ret, mtime[30] = "";
+ char *basename, *dirname, *ret, mtime[30] = "";
char *status, *flags; /* vss status info */
char *ut = uptime_str();
long offset = (nmmd->offset + 500) / 1000;
struct timeval now;
struct tm mtime_tm;
- localtime_r(&nmmd->mtime, &mtime_tm);
- strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
/* report real status */
status = vss_status_tohuman(nmmd->vss_status_flags);
flags = vss_get_status_flags(nmmd->vss_status_flags);
- basename = para_basename(nmmd->filename);
+ basename = para_basename(nmmd->afd.path);
+ dirname = para_dirname(nmmd->afd.path);
+ if (basename) {
+ localtime_r(&nmmd->mtime, &mtime_tm);
+ strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+ }
gettimeofday(&now, NULL);
ret = make_message(
"%s:%zu\n" "%s:%s\n" "%s:%lu\n" "%s:%u\n"
- "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%s\n"
+ "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%u\n"
"%s:%li\n" "%s:%s\n" "%s:%s\n" "%s"
- "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n" "%s:%s\n",
+ "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n" "%s:%s\n"
+ "%s:%s\n" "%s:%u\n",
status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
status_item_list[SI_MTIME], mtime,
status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
status_item_list[SI_BASENAME], basename ? basename : "(none)",
status_item_list[SI_STATUS], status,
status_item_list[SI_STATUS_FLAGS], flags,
- status_item_list[SI_SELECTOR], "FIXME",
+ status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,
status_item_list[SI_OFFSET], offset,
- status_item_list[SI_FORMAT], audio_format_name(nmmd->afd.afsi.audio_format_id),
+ status_item_list[SI_FORMAT], basename?
+ audio_format_name(nmmd->afd.afsi.audio_format_id)
+ : "",
status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
nmmd->afd.afhi.info_string,
status_item_list[SI_CURRENT_TIME],
(long unsigned)now.tv_sec,
(long unsigned)now.tv_usec,
- status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string
+ status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
+
+ status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
+ status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
);
free(basename);
+ free(dirname);
free(flags);
free(status);
free(ut);