Updating bashcompletion and example config file for new actions

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index 2a94236881e612da136ec5f320d9ce59b63d2c94..bd311cd97d6bfdffb8017d7d32f97b38526e1af9 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -51,9 +51,11 @@ enum host {
 };
 
 enum action {
-     ACTION_UPDATE = 0,
-     ACTION_PUBLIC = 1,
-     ACTION_FRIENDS = 2,
+       ACTION_UPDATE = 0,
+       ACTION_FRIENDS = 1,
+       ACTION_USER = 2,
+       ACTION_REPLIES = 4,
+       ACTION_PUBLIC = 8
 };
 
 struct session {
@@ -64,6 +66,7 @@ struct session {
        char *time;
        char *homedir;
        char *logfile;
+       char *user;
        int bash;
        enum host host;
        enum action action;
@@ -89,6 +92,7 @@ static void display_help(void)
        fprintf(stdout, "  --logfile logfile\n");
        fprintf(stdout, "  --bash\n");
        fprintf(stdout, "  --action action\n");
+       fprintf(stdout, "  --user screenname\n");
        fprintf(stdout, "  --debug\n");
        fprintf(stdout, "  --version\n");
        fprintf(stdout, "  --help\n");
@@ -119,6 +123,7 @@ static void session_free(struct session *session)
        free(session->proxy);
        free(session->time);
        free(session->homedir);
+       free(session->user);
        free(session);
 }
 
@@ -150,13 +155,17 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
        free(buffer);
 }
 
+static const char *twitter_user_url    = "http://twitter.com/statuses/user_timeline/";
 static const char *twitter_update_url  = "https://twitter.com/statuses/update.xml";
 static const char *twitter_public_url  = "http://twitter.com/statuses/public_timeline.xml";
 static const char *twitter_friends_url = "https://twitter.com/statuses/friends_timeline.xml";
+static const char *twitter_replies_url = "http://twitter.com/statuses/replies.xml";
 
+static const char *identica_user_url    = "http://identi.ca/api/statuses/user_timeline/";
 static const char *identica_update_url  = "http://identi.ca/api/statuses/update.xml";
 static const char *identica_public_url  = "http://identi.ca/api/statuses/public_timeline.xml";
 static const char *identica_friends_url = "http://identi.ca/api/statuses/friends_timeline.xml";
+static const char *identica_replies_url = "http://identi.ca/api/statuses/replies.xml";
 
 static CURL *curl_init(void)
 {
@@ -175,31 +184,34 @@ static CURL *curl_init(void)
 
 void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
 {
-       xmlChar *text;
-       xmlChar *user;
+       xmlChar *text = NULL;
+       xmlChar *user = NULL;
        xmlNodePtr userinfo;
+
        current = current->xmlChildrenNode;
        while (current != NULL) {
                if (current->type == XML_ELEMENT_NODE) {
-                       if (!xmlStrcmp(current->name, (const xmlChar *)"text")) {
+                       if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
                                text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
-                               printf("%s", text);
-                               xmlFree(text);
-                       }
                        if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
                                userinfo = current->xmlChildrenNode;
                                while (userinfo != NULL) {
                                        if ((!xmlStrcmp(userinfo->name, (const xmlChar *)"screen_name"))) {
+                                               if (user)
+                                                       xmlFree(user);
                                                user = xmlNodeListGetString(doc, userinfo->xmlChildrenNode, 1);
-                                               printf(" [%s]\n", user);
-                                               xmlFree(user);
                                        }
-
                                        userinfo = userinfo->next;
                                }
                        }
+                       if (user && text) {
+                               printf("[%s] %s\n", user, text);
+                               xmlFree(user);
+                               xmlFree(text);
+                               user = NULL;
+                               text = NULL;
+                       }
                }
-
                current = current->next;
        }
 
@@ -258,8 +270,7 @@ size_t curl_callback(void *buffer, size_t size, size_t nmemb, void *userp)
        curl_buf->data = temp;
        memcpy(&curl_buf->data[curl_buf->length], (char *)buffer, buffer_size);
        curl_buf->length += buffer_size;
-       if ((curl_buf->action == ACTION_FRIENDS) ||
-               (curl_buf->action == ACTION_PUBLIC))
+       if (curl_buf->action)
                parse_timeline(curl_buf->data);
 
        dbg("%s\n", curl_buf->data);
@@ -271,6 +282,8 @@ static int send_request(struct session *session)
 {
        char user_password[500];
        char data[500];
+       /* is there usernames longer than 22 chars? */
+       char user_url[70];
        struct bti_curl_buffer *curl_buf;
        CURL *curl = NULL;
        CURLcode res;
@@ -331,6 +344,33 @@ static int send_request(struct session *session)
                }
                curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
 
+               break;
+       case ACTION_USER:
+               switch (session->host) {
+               case HOST_TWITTER:
+                       sprintf(user_url, "%s%s.xml", twitter_user_url, session->user);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
+                       break;
+               case HOST_IDENTICA:
+                       sprintf(user_url, "%s%s.xml", identica_user_url, session->user);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
+                       break;
+               }
+
+               break;
+       case ACTION_REPLIES:
+               snprintf(user_password, sizeof(user_password), "%s:%s",
+                        session->account, session->password);
+               switch (session->host) {
+               case HOST_TWITTER:
+                       curl_easy_setopt(curl, CURLOPT_URL, twitter_replies_url);
+                       break;
+               case HOST_IDENTICA:
+                       curl_easy_setopt(curl, CURLOPT_URL, identica_replies_url);
+                       break;
+               }
+               curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
+
                break;
        case ACTION_PUBLIC:
                switch (session->host) {
@@ -381,6 +421,7 @@ static void parse_configfile(struct session *session)
        char *proxy = NULL;
        char *logfile = NULL;
        char *action = NULL;
+       char *user = NULL;
        char *file;
 
        /* config file is ~/.bti  */
@@ -442,6 +483,11 @@ static void parse_configfile(struct session *session)
                        c += 7;
                        if (c[0] != '\0')
                                action = strdup(c);
+               } else if (!strncasecmp(c, "user", 4) &&
+                               (c[4] == '=')) {
+                       c += 5;
+                       if (c[0] != '\0')
+                               user = strdup(c);
                }
        } while (!feof(config_file));
 
@@ -468,10 +514,17 @@ static void parse_configfile(struct session *session)
                        session->action = ACTION_UPDATE;
                if (strcasecmp(action, "friends") == 0)
                        session->action = ACTION_FRIENDS;
+               if (strcasecmp(action, "user") == 0)
+                       session->action = ACTION_USER;
+               if (strcasecmp(action, "replies") == 0)
+                       session->action = ACTION_REPLIES;
                if (strcasecmp(action, "public") == 0)
                        session->action = ACTION_PUBLIC;
                free(action);
        }
+       if (user) {
+               session->user = user;
+       }
 
        /* Free buffer and close file.  */
        free(line);
@@ -535,6 +588,7 @@ int main(int argc, char *argv[], char *envp[])
                { "host", 1, NULL, 'H' },
                { "proxy", 1, NULL, 'P' },
                { "action", 1, NULL, 'A' },
+               { "user", 1, NULL, 'u' },
                { "logfile", 1, NULL, 'L' },
                { "help", 0, NULL, 'h' },
                { "bash", 0, NULL, 'b' },
@@ -580,7 +634,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:h",
+               option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:h",
                                          options, NULL);
                if (option == -1)
                        break;
@@ -611,10 +665,20 @@ int main(int argc, char *argv[], char *envp[])
                                session->action = ACTION_UPDATE;
                        if (strcasecmp(optarg, "friends") == 0)
                                session->action = ACTION_FRIENDS;
+                       if (strcasecmp(optarg, "user") == 0)
+                               session->action = ACTION_USER;
+                       if (strcasecmp(optarg, "replies") == 0)
+                               session->action = ACTION_REPLIES;
                        if (strcasecmp(optarg, "public") == 0)
                                session->action = ACTION_PUBLIC;
                        dbg("action = %d\n", session->action);
                        break;
+               case 'u':
+                       if (session->user)
+                               free(session->user);
+                       session->user = strdup(optarg);
+                       dbg("user = %s\n", session->user);
+                       break;
                case 'L':
                        if (session->logfile)
                                free(session->logfile);
@@ -673,6 +737,9 @@ int main(int argc, char *argv[], char *envp[])
                dbg("tweet = %s\n", session->tweet);
        }
 
+       if (!session->user)
+               session->user = session->account;
+
        dbg("account = %s\n", session->account);
        dbg("password = %s\n", session->password);
        dbg("host = %d\n", session->host);