verbose option for bash completion script

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index 0f58d70237739b2aeafd02545a66c2fa519d9bcc..2968936f661afedfc3a252d30c04249f7cb0c207 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -50,6 +50,7 @@
 
 
 static int debug;
+static int verbose;
 
 enum host {
        HOST_TWITTER  = 0,
@@ -110,6 +111,7 @@ static void display_help(void)
        fprintf(stdout, "  --page PAGENUMBER\n");
        fprintf(stdout, "  --bash\n");
        fprintf(stdout, "  --debug\n");
+       fprintf(stdout, "  --verbose\n");
        fprintf(stdout, "  --dry-run\n");
        fprintf(stdout, "  --version\n");
        fprintf(stdout, "  --help\n");
@@ -173,8 +175,8 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
        free(buffer);
 }
 
-static const char *twitter_host  = "http://twitter.com/statuses";
-static const char *identica_host = "http://identi.ca/api/statuses";
+static const char *twitter_host  = "https://twitter.com/statuses";
+static const char *identica_host = "https://identi.ca/api/statuses";
 
 static const char *user_uri    = "/user_timeline/";
 static const char *update_uri  = "/update.xml";
@@ -201,11 +203,14 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
 {
        xmlChar *text = NULL;
        xmlChar *user = NULL;
+       xmlChar *created = NULL;
        xmlNodePtr userinfo;
 
        current = current->xmlChildrenNode;
        while (current != NULL) {
                if (current->type == XML_ELEMENT_NODE) {
+                       if (!xmlStrcmp(current->name, (const xmlChar *)"created_at"))
+                               created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
                        if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
                                text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
                        if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
@@ -219,12 +224,20 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
                                        userinfo = userinfo->next;
                                }
                        }
-                       if (user && text) {
-                               printf("[%s] %s\n", user, text);
+
+                       if (user && text && created) {
+                               if (verbose)
+                                       printf("[%s] (%.16s) %s\n",
+                                               user, created, text);
+                               else
+                                       printf("[%s] %s\n",
+                                               user, text);
                                xmlFree(user);
                                xmlFree(text);
+                               xmlFree(created);
                                user = NULL;
                                text = NULL;
+                               created = NULL;
                        }
                }
                current = current->next;
@@ -488,6 +501,13 @@ static void parse_configfile(struct session *session)
                                        !strncasecmp(c, "yes", 3))
                                shrink_urls = 1;
                }
+               else if (!strncasecmp(c, "verbose", 7) &&
+                               (c[7] == '=')) {
+                       c += 8;
+                       if (!strncasecmp(c, "true", 4) ||
+                                       !strncasecmp(c, "yes", 3))
+                               verbose = 1;
+               }       
        } while (!feof(config_file));
 
        if (password)
@@ -882,6 +902,7 @@ int main(int argc, char *argv[], char *envp[])
 {
        static const struct option options[] = {
                { "debug", 0, NULL, 'd' },
+               { "verbose", 0, NULL, 'V' },
                { "account", 1, NULL, 'a' },
                { "password", 1, NULL, 'p' },
                { "host", 1, NULL, 'H' },
@@ -907,6 +928,7 @@ int main(int argc, char *argv[], char *envp[])
        int page_nr;
 
        debug = 0;
+       verbose = 0;
        rl_bind_key('\t', rl_insert);
 
        session = session_alloc();
@@ -937,7 +959,7 @@ int main(int argc, char *argv[], char *envp[])
        parse_configfile(session);
 
        while (1) {
-               option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:hg:sn",
+               option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:hg:snVv",
                                          options, NULL);
                if (option == -1)
                        break;
@@ -945,6 +967,9 @@ int main(int argc, char *argv[], char *envp[])
                case 'd':
                        debug = 1;
                        break;
+               case 'V':
+                       verbose = 1;
+                       break;
                case 'a':
                        if (session->account)
                                free(session->account);