Don't report server uptime as status item.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index e294e87c9cbbe6e9ce1e2358ceb9b10e30035a09..bfa58e400e1cc5d62a3eb5d2a3264b26d562a964 100644 (file)
--- a/command.c
+++ b/command.c
@@ -37,7 +37,6 @@ static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
-extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
@@ -97,7 +96,7 @@ static char *vss_get_status_flags(unsigned int flags)
 
 static char *get_status(struct misc_meta_data *nmmd)
 {
-       char *basename, *dirname, *ret, mtime[30] = "";
+       char *ret, mtime[30] = "";
        char *status, *flags; /* vss status info */
        char *ut = uptime_str();
        long offset = (nmmd->offset + 500) / 1000;
@@ -107,51 +106,39 @@ static char *get_status(struct misc_meta_data *nmmd)
        /* report real status */
        status = vss_status_tohuman(nmmd->vss_status_flags);
        flags = vss_get_status_flags(nmmd->vss_status_flags);
-       basename = para_basename(nmmd->afd.path);
-       dirname = para_dirname(nmmd->afd.path);
-       if (basename) {
+       if (nmmd->size) { /* parent currently has an audio file open */
                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:%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:%u\n",
+               "%s: %zu\n" /* file size */
+               "%s: %s\n" /* mtime */
+               "%s: %s\n" /* status */
+               "%s: %s\n" /* status flags */
+               "%s: %li\n" /* offset */
+               "%s: %s\n" /* afs mode */
+               "%s: %lu.%lu\n" /* stream start */
+               "%s: %lu.%lu\n" /* current server time */
+               "%s\n", /* afs status info */
                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_NUM_PLAYED], nmmd->num_played,
-
-               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_IMAGE_ID], nmmd->afd.afsi.image_id,
 
                status_item_list[SI_OFFSET], offset,
-               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_UPTIME], ut,
                status_item_list[SI_STREAM_START],
                        (long unsigned)nmmd->stream_start.tv_sec,
                        (long unsigned)nmmd->stream_start.tv_usec,
                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_DIRECTORY], dirname? dirname : "(none)",
-               status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
+               nmmd->afd.verbose_ls_output
 
        );
-       free(basename);
-       free(dirname);
        free(flags);
        free(status);
        free(ut);
@@ -376,13 +363,16 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler)
        for (cmd = server_cmds; cmd->name; cmd++)
                if (!strcmp(cmd->name, name)) {
                        if (handler)
-                               *handler = para_strdup("para_server"); /* server commands */
+                               *handler = para_strdup("server"); /* server commands */
                        return cmd;
                }
        /* not found, look for commands supported by afs */
        for (cmd = afs_cmds; cmd->name; cmd++)
-               if (!strcmp(cmd->name, name))
+               if (!strcmp(cmd->name, name)) {
+                       if (handler)
+                               *handler = para_strdup("afs");
                        return cmd;
+               }
        return NULL;
 }