Changeset 5832

Timestamp:

07/04/09 18:18:00 (3 years ago)

Author:

submersible_toaster

Message:

still mildly to largely broken

Location:

trunk/Padre-Plugin-Swarm/lib/Padre

Files:

• Swarm/Service.pm (modified) (2 diffs)
• Swarm/Service/Chat.pm (modified) (1 diff)
• Swarm/Transport/IRC.pm (modified) (8 diffs)
• Wx/Swarm/Chat.pm (modified) (1 diff)

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Service.pm

@@ -30 +30 @@
     croak "No use_transport defined" unless exists $self->{use_transport};
     my $transports = $self->{use_transport};
+    
     while ( my ($class,$args) = each %$transports ) {
         Class::Autouse->autouse($class);
@@ -35 +36 @@
         $self->set_transport( $transport );
     }
+    $self->transport->subscribe_channel( $_ , 1 )
+        for $self->service_channels;
+  
 }
 

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Service/Chat.pm

@@ -28 +28 @@
     Padre::Util::debug('Starting chat service');
     my $config = Padre::Config->read;
+
     $self->_attach_transports;
     Padre::Util::debug('Chat transports attached');  
     Padre::Util::debug( $self->transport );
     
-    $self->transport->subscribe_channel( $_ )
-        for $self->service_channels;
+
     
     Padre::Util::debug('Channels subscribed');

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Transport/IRC.pm

@@ -24 +24 @@
     
     my $con = AnyEvent::IRC::Client->new;
+
     $con->connect (
         "irc.perl.org" => 6667 ,
@@ -31 +32 @@
         }
     );
-    
+    $self->_register_irc_callbacks($con);
     $self->{connection} = $con;
-    $self->_register_irc_callbacks($con);
+
     my $c = AnyEvent->condvar;
     $self->{condvar} = $c;
@@ -45 +46 @@
     $self->connection->disconnect;
     delete $self->{connection};
+    delete $self->{condvar};
 }
 
@@ -59 +61 @@
           }
 
-#       $con->register( 
-#         $self->nickname,
-#         'Padre-Swarm-Transport-IRC',
-#         , getlogin() 
-#       );
-
-        $self->update_channels;
+        $con->register( 
+          $self->nickname,
+          'Padre-Swarm-Transport-IRC',
+          , getlogin() 
+        );
         
        },
@@ -71 +71 @@
           warn "Oh, got a disconnect: $_[1], exiting...\n";
           $self->condvar->broadcast;
+       },
+       registered => sub {
+        warn "REGISTERED!!";
+        $self->update_channels;
        }
     );
@@ -80 +84 @@
           
           my $body = join (' ',@{ $ircmsg->{params} } );
-          my $msg = { 
-            user => $ircmsg->{prefix}, 
-            message => $body , 
-            type => 'chat',
-           };
            my $frame = {
                address => $handle,
                channel => $channel,
            };
-           warn "Publick message in $channel from $handle";
-           push @{ $self->{incoming_buffer}{$channel} }, [$msg,$frame];
+           $body =~ s/\Q$channel\E //;
+           warn "Publick message in $channel '$body'";
+           push @{ $self->{incoming_buffer}{$channel} }, [$body,$frame];
             
        }
@@ -106 +106 @@
 }
 
+
+use Data::Dumper;
 sub update_channels {
     my ($self) = @_;
-    while ( my ($channel,$loop) = each %{ $self->channels } ) {
-        $self->subscribe_channel($channel,$loop);
+    while ( my ($channel,$loopback) = each %{ $self->subscriptions } ) {
+        $self->_connect_channel( $channel, $loopback );
     }
     
@@ -117 +119 @@
 sub poll {
     my ($self,$time) = @_;
-#   warn "Polling for $time:";
+    #warn "Polling for $time:";
     my $c = AnyEvent->condvar;
     my $timer = AnyEvent->timer( after=>$time,
         cb=>sub{ $c->send } );
+    #warn "$timer running";
     $c->recv;
-#   warn "Returned from poll wait";
+    #warn "Returned from poll wait";
     if ( keys %{ $self->{incoming_buffer} } ) {
-        warn "DATA IN BUFFER!";
-        return keys %{ $self->{incoming_buffer} };
+        warn "DATA IN BUFFER!", %{ $self->{incoming_buffer} };
+        return (keys %{ $self->{incoming_buffer} });
     }
+    return;
 
 }
 
+use Data::Dumper;
 sub receive_from_channel {
     my ($self,$channel) = @_;
+    warn "Search for $channel";
     return unless exists $self->{incoming_buffer}{$channel};
-    shift @{ $self->{incoming_buffer}{$channel} };
     
+    my @queue = @{ delete $self->{incoming_buffer}{$channel} };
+    my $d = shift @queue;
+    $self->{incoming_buffer}{$channel} = \@queue
+        if @queue;
+    my ($msg,$frame) = @$d;
 }
 

trunk/Padre-Plugin-Swarm/lib/Padre/Wx/Swarm/Chat.pm

@@ -60 +60 @@
     my $service = Padre::Swarm::Service::Chat->new(
         use_transport => {
-            'Padre::Swarm::Transport::Multicast'=>{
-            #'Padre::Swarm::Transport::IRC'=>{
+            #'Padre::Swarm::Transport::Multicast'=>{
+            'Padre::Swarm::Transport::IRC'=>{
                 nickname => $config->identity_nickname
             },