Changeset 807

Timestamp:

05/24/06 18:48:44

Author:

miyagawa

Message:

Now Plagger::UserAgent? and $plugin->cookie_jar can share cookies data with your browser. No need to set username and password to CustomFeed?::* plugins, etc.

Files:

• trunk/plagger/lib/Plagger/Cookies.pm (added)
• trunk/plagger/lib/Plagger/Plugin.pm (modified) (2 diffs)
• trunk/plagger/lib/Plagger/Plugin/CustomFeed/Frepa.pm (modified) (2 diffs)
• trunk/plagger/lib/Plagger/Plugin/CustomFeed/Mixi.pm (modified) (2 diffs)
• trunk/plagger/lib/Plagger/Plugin/CustomFeed/Yahoo360JP.pm (modified) (1 diff)
• trunk/plagger/lib/Plagger/Plugin/Notify/Campfire.pm (modified) (1 diff)
• trunk/plagger/lib/Plagger/Plugin/Subscription/LivedoorReader.pm (modified) (1 diff)
• trunk/plagger/lib/Plagger/UserAgent.pm (modified) (2 diffs)

trunk/plagger/lib/Plagger/Plugin.pm

@@ -5 +5 @@
-__PACKAGE__->mk_accessors( qw(conf rule rule_hook cache) );
-
+use Plagger::Cookies;
-use Plagger::Crypt;
-use Plagger::Rule;
@@ -114 +115 @@
-}
-
+sub cookie_jar {
+    my $self = shift;
+
+    my $agent_conf = Plagger->context->conf->{user_agent} || {};
+    if ($agent_conf->{cookies}) {
+        return Plagger::Cookies->create($agent_conf->{cookies});
+    }
+
+    return $self->cache->cookie_jar;
+}
+
-1;

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

@@ -25 +25 @@
-    my ($self, $context) = @_;
-
-ache->cookie_jar); # enbug???
+ookie_jar);
-    $self->{mech}->agent_alias( "Windows IE 6" );
-
@@ -132 +132 @@
-    return 0 unless $self->{mech}->success;
-
+    open FOO, ">foo";
+    print FOO $self->{mech}->content;
+
-    if ($self->{mech}->content =~ /loginside/) {
-        Plagger->context->log(debug => "cookie not found. logging in");

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

@@ -54 +54 @@
-sub load {
-    my($self, $context) = @_;
+
+    my $cookie_jar = $self->cookie_jar;
+    if (ref($cookie_jar) ne 'HTTP::Cookies') {
+        # using foreign cookies = don't have to set email/password. Fake them
+        $self->conf->{email}    ||= 'plagger@localhost';
+        $self->conf->{password} ||= 'pl4gg5r';
+    }
+
-    $self->{mixi} = WWW::Mixi->new($self->conf->{email}, $self->conf->{password});
-self->cache->
+
-
-    my $feed = Plagger::Feed->new;
@@ -79 +87 @@
-    if ($response->content =~ /action=login\.pl/) {
-        $context->log(debug => "Cookie not found. Logging in");
+
+        if ($self->conf->{email} eq 'plagger@localhost') {
+            $context->log(error => 'email/password should be set to login');
+        }
+
-        $response = $self->{mixi}->post("http://mixi.jp/login.pl", {
-            next_url => $next_url,

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

@@ -35 +35 @@
-    my $start = "http://360.yahoo.co.jp/";
-
-ache->c
+
-    $mech->agent_alias( 'Windows IE 6' );
-    $mech->get($start);

trunk/plagger/lib/Plagger/Plugin/Notify/Campfire.pm

@@ -51 +51 @@
-    my $plugin = shift;
-
-ache->c
+
-    $mech->agent_alias("Windows IE 6");
-

trunk/plagger/lib/Plagger/Plugin/Subscription/LivedoorReader.pm

@@ -25 +25 @@
-sub init_reader {
-    my $self = shift;
-ache->c
+
-
-    unless (defined($self->conf->{username}) && defined($self->conf->{password})) {

trunk/plagger/lib/Plagger/UserAgent.pm

@@ -3 +3 @@
-use base qw( LWP::UserAgent );
-
+use Plagger::Cookies;
-use URI::Fetch 0.06;
-
@@ -10 +11 @@
-    $self->agent("Plagger/$Plagger::VERSION (http://plagger.bulknews.net/)");
-    $self->timeout(15); # xxx to be config
+
+    my $conf = Plagger->context->conf->{user_agent};
+    if ($conf->{cookies}) {
+        $self->cookie_jar( Plagger::Cookies->create($conf->{cookies}) );
+    }
+
-    $self;
-}