Changeset 231

Timestamp:

03/02/06 09:54:09

Author:

miyagawa

Message:

• Added cookie_jar method to Plugin cache
  
• Added nasty workaroud for CAPTCHA in Yahoo! 360 login
  
• Yahoo360JP: Save cookie_jar when logged in
  

Files:

• trunk/plagger/lib/Plagger/Cache.pm (modified) (2 diffs)
• trunk/plagger/lib/Plagger/CacheProxy.pm (modified) (1 diff)
• trunk/plagger/lib/Plagger/Plugin/CustomFeed/Yahoo360JP.pm (modified) (3 diffs)

trunk/plagger/lib/Plagger/Cache.pm

@@ -2 +2 @@
-use strict;
-use File::Spec;
+use HTTP::Cookies;
-use UNIVERSAL::require;
-
@@ -62 +63 @@
-}
-
+sub cookie_jar {
+    my($self, $ns) = @_;
+    my $file = $ns ? "global.dat" : "$ns.dat";
+
+    my $dir = File::Spec->catfile($self->{base}, 'cookies');
+    mkdir $dir, 0755 unless -e $dir && -d _;
+
+    return HTTP::Cookies->new(
+        file => File::Spec->catfile($dir, $file),
+        autosave => 1,
+    );
+}
+
-1;

trunk/plagger/lib/Plagger/CacheProxy.pm

@@ -20 +20 @@
-}
-
+sub cookie_jar {
+    my $self = shift;
+    $self->{cache}->cookie_jar($self->{namespace});
+}
+
-1;

trunk/plagger/lib/Plagger/Plugin/CustomFeed/Yahoo360JP.pm

@@ -28 +28 @@
-    my($self, $context, $args) = @_;
-
-# TODO: save cookies
-
-
-my $mech = WWW::Mechanize->new
+my $start = "http://360.yahoo.co.jp/";
+
+
+$mech->agent_alias( 'Windows IE 6' )
-    $mech->get($start);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-
@@ -142 +134 @@
-}
-
+sub login {
+    my($self, $mech) = @_;
+
+    $mech->submit_form(
+        fields => {
+            login  => $self->conf->{username},
+            passwd => $self->conf->{password},
+            '.persistent' => 'y',
+        },
+    );
+
+    while ($mech->content =~ m!<span class="error">!) {
+        Plagger->context->log(error => "Login to Yahoo! failed.");
+        if ($mech->content =~ m!(https://captcha.yahoo.co.jp/img/.*\.jpg)!) {
+            my $captcha = $self->prompt_captcha($1) or return;
+            $mech->submit_form(
+                fields => {
+                    login  => $self->conf->{username},
+                    passwd => $self->conf->{password},
+                    '.secword'    => $captcha,
+                    '.persistent' => 'y',
+                },
+            );
+        } else {
+            return;
+        }
+    }
+
+    return 1;
+}
+
-sub add_entry {
-    my($self, $feed, $args, $now, $format) = @_;
@@ -179 +202 @@
-}
-
+sub prompt_captcha {
+    my($self, $url) = @_;
+    print STDERR "CAPTCHA:\n$url\nEnter the code: ";
+
+    # use alarm timeout for cron job
+    my $key;
+    eval {
+        local $SIG{ALRM} = sub { die "alarm\n" };
+        alarm 30;
+        chomp($key = <STDIN>);
+        alarm 0;
+    };
+    return if $@;
+
+    return $key;
+}
+
-1;
-