improved info text for the random selector.

[paraslash.git] / random_selector.c

diff --git a/random_selector.c b/random_selector.c
index 37e9116bc24d9ea21e388b7b85576fdeae541525..3bd637d54d47edb62f217b2831c3588cc508c7ca 100644 (file)
--- a/random_selector.c
+++ b/random_selector.c
@@ -33,7 +33,7 @@ extern struct misc_meta_data *mmd;
 static unsigned int num_audio_files, audio_file_count;
 static char **audio_file_list;
 
 static unsigned int num_audio_files, audio_file_count;
 static char **audio_file_list;
 

-static int count_audio_files(__unused const char *dir, __unused const char *name)
+static int count_audio_files(__a_unused const char *dir, __a_unused const char *name)

 {
        num_audio_files++;
        return 1;
 {
        num_audio_files++;
        return 1;


@@ -64,7 +64,7 @@ static struct server_command cmds[] = {
 }
 };
 
 }
 };
 

-static int com_random_info(int fd, __unused int argc, __unused char *argv[])
+static int com_random_info(int fd, __a_unused int argc, __a_unused char *argv[])

 {
        return send_buffer(fd, "Don't use for huge directories as it is "
                "very inefficient in this case.\n");
 {
        return send_buffer(fd, "Don't use for huge directories as it is "
                "very inefficient in this case.\n");


@@ -98,7 +98,7 @@ static char **random_get_audio_file_list(unsigned int num)
                goto out;
        /* careful, files might got deleted underneath */
        num_audio_files = audio_file_count; /* can only decrease */
                goto out;
        /* careful, files might got deleted underneath */
        num_audio_files = audio_file_count; /* can only decrease */

-       len = MIN(num, num_audio_files);
+       len = PARA_MIN(num, num_audio_files);

        ret = -E_NOTHING_FOUND;
        if (!len) /* nothing found, return NULL */
                goto out;
        ret = -E_NOTHING_FOUND;
        if (!len) /* nothing found, return NULL */
                goto out;


@@ -109,42 +109,56 @@ static char **random_get_audio_file_list(unsigned int num)
                        / (RAND_MAX + 1.0)));
                ret_list[i] = para_strdup(audio_file_list[r]);
        }
                        / (RAND_MAX + 1.0)));
                ret_list[i] = para_strdup(audio_file_list[r]);
        }

+       ret = 1;

 out:
        if (audio_file_list) {
                for (i = 0; i < num_audio_files; i++)
                        free(audio_file_list[i]);
                free(audio_file_list);
        }
 out:
        if (audio_file_list) {
                for (i = 0; i < num_audio_files; i++)
                        free(audio_file_list[i]);
                free(audio_file_list);
        }

-//     if (ret < 0)
-//             PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       if (ret > 0) {
+       } else
+               sprintf(mmd->selector_info, "dbinfo1:%s\n", PARA_STRERROR(-ret));

        return ret_list;
 }
 
        return ret_list;
 }
 

+void random_update_audio_file(char *audio_file)
+{
+       char *dn = para_dirname(audio_file);
+       snprintf(mmd->selector_info, MMD_INFO_SIZE - 1,
+               "dbinfo1:current dir: %s\n"
+               "dbinfo2:random_dir: %s\n"
+               "dbinfo3:%d files available\n",
+               dn, conf.random_dir_arg, num_audio_files);
+       free(dn);
+       mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
+}

 static void random_shutdown(void)
 {
 }
 
 static void random_shutdown(void)
 {
 }
 

-/** random's (constant) database info text */
-#define DBINFO "dbinfo1:database info? You're kidding. I'm still dopey!\ndbinfo2:\ndbinfo3:\n"
-

 /**
  *  the init function for the random audio file selector
  *
 /**
  *  the init function for the random audio file selector
  *

- * Init all function pointers of \a db, init the dbinfo text and seed the
+ * Init all function pointers of \a s, init the info text and seed the

  * PRNG.
  *
  * PRNG.
  *

- * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c
+ * \sa struct audio_file_selector, misc_meta_data::selector_info, mysql.c

  */
  */

-int random_selector_init(struct audio_file_selector *db)
+int random_selector_init(struct audio_file_selector *s)

 {
        struct timeval now;
 
        PARA_INFO_LOG("%s", "registering random handlers ;)\n");
 {
        struct timeval now;
 
        PARA_INFO_LOG("%s", "registering random handlers ;)\n");

-       sprintf(mmd->dbinfo, DBINFO);

        gettimeofday(&now, NULL);
        srand(now.tv_usec);
        gettimeofday(&now, NULL);
        srand(now.tv_usec);

-       db->cmd_list = cmds;
-       db->get_audio_file_list = random_get_audio_file_list;
-       db->shutdown = random_shutdown;
+       s->cmd_list = cmds;
+       s->get_audio_file_list = random_get_audio_file_list;
+       s->shutdown = random_shutdown;
+       s->update_audio_file = random_update_audio_file;
+       snprintf(mmd->selector_info, MMD_INFO_SIZE - 1,
+               "dbinfo1: Welcome to the random selector\n"
+               "dbinfo2: random_dir: %s\n", conf.random_dir_arg);
+       mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';

        return 1;
 }
        return 1;
 }