X-Git-Url: http://lab.mitty.jp/git/?a=blobdiff_plain;ds=sidebyside;f=Dev%2Ftwitter%2Fdump_timeline.pl;h=0564d5dadf240fc88e711cca71cc2b4ec7e91b38;hb=52c76fd42f32a43fdb145980161126a4e7503065;hp=246a1d49c31560f1dd44eeaf1b1abbc4c98afbd3;hpb=f1b126ae0a301c7164a1cbc401d79a0e49a5c215;p=lab.git

diff --git a/Dev/twitter/dump_timeline.pl b/Dev/twitter/dump_timeline.pl
index 246a1d4..0564d5d 100755
--- a/Dev/twitter/dump_timeline.pl
+++ b/Dev/twitter/dump_timeline.pl
@@ -15,10 +15,10 @@ use YAML::Tiny;
 use Data::Dumper;
 use Encode;
 
-if ($ARGV[0] && ($ARGV[0] eq '--help' || $ARGV[0] eq '-h') ) {
+my $help = sub {
     die <<EOM;
 usage: $0
-    [user_timeline(default)|retweeted_by_me|mentions
+    [{u}ser_timeline(default)|{r}etweeted_by_me|{m}sentions|{s}earch
         [screen_name
             [number_of_pages|all
                 [dump]
@@ -26,7 +26,11 @@ usage: $0
         ]
     ]
 EOM
+};
+if ($ARGV[0] && ($ARGV[0] eq '--help' || $ARGV[0] eq '-h') ) {
+    &{$help};
 }
+
 my $method = $ARGV[0] || 'user_timeline';
 my $screen_name = $ARGV[1] || '';
 my $pages = $ARGV[2] || 1;
@@ -37,12 +41,12 @@ my $dump = $ARGV[3] || 0;
 
 my $conf = loadconf("$Bin/config.yml");
 if (! defined $conf) {
-    die "$0: cannot parse config file.\n";
+    die "$0: cannot parse config file.";
 }
 
 my $bot = login($conf);
 if (! $bot->authorized) {
-    die "$0: this client is not yet authorized.\n";
+    die "$0: this client is not yet authorized.";
 }
 
 
@@ -57,17 +61,31 @@ eval {
         ;
     
         my $res;
-        if ($method eq 'user_timeline') {
+        if ($method eq 'user_timeline' || $method eq 'u') {
             $res = $bot->user_timeline($param);
         }
-        elsif ($method eq 'retweeted_by_me') {
+        elsif ($method eq 'retweeted_by_me' || $method eq 'r') {
             $res = $bot->retweeted_by_me($param);
         }
-        elsif ($method eq 'mentions') {
+        elsif ($method eq 'mentions' || $method eq 'm') {
             $res = $bot->mentions($param);
         }
+        elsif ($method eq 'search' || $method eq 's') {
+            my $key;
+            foreach my $word (@{ $conf->{hashtag} }) {
+                if ($key) {
+                    $key .= " OR $word";
+                }
+                else {
+                    $key = $word;
+                }
+            }
+            $param->{q} = $key;
+            $res = $bot->search($param)->{results};
+        }
         else {
-            die "$0: unknown method => $method\n";
+            warn "$0: unknown method '$method'";
+            &{$help};
         }
         
         if ($dump) {
@@ -79,12 +97,13 @@ eval {
         else {
             foreach my $status (@{$res}) {
                 my $text = "";
+                $text .= "(". $status->{id} . ") ";
+                $text .= $status->{user}{screen_name} . "|";
                 $text .= $status->{user}{name};
                 $text .= " [" . $status->{created_at} . "]";
-                $text .= " (". $status->{id} . ")";
-                $text .= " ". encode('utf8', $status->{text});
+                $text .= " ".  $status->{text};
                 $text =~ s/\n//;
-                print $text, "\n";
+                print encode('utf8', $text), "\n";
             }
         }
     }
@@ -92,7 +111,6 @@ eval {
 if ($@) {
     evalrescue($@);
 }
-print "done\n";
 
 
 sub loadconf {
@@ -105,7 +123,7 @@ sub loadconf {
     my $yaml = YAML::Tiny->read($file);
     
     if ($!) {
-        warn "$0: '$file' $!\n";
+        warn "$0: '$file' $!";
     }
     
     return $yaml->[0];