Changeset 5831


Ignore:
Timestamp:
07/04/09 16:58:55 (3 years ago)
Author:
submersible_toaster
Message:

irc might work . hosed the makefile somehow :)

Location:
trunk/Padre-Plugin-Swarm
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r5826 r5831  
    77use Padre::Swarm::Transport::Multicast (); 
    88use Padre::Swarm::Service (); 
     9 
    910my $marshal = JSON::XS->new->allow_blessed->convert_blessed; 
    1011     
    … …  
    2627    my $self = shift; 
    2728    Padre::Util::debug('Starting chat service'); 
     29    my $config = Padre::Config->read; 
    2830    $self->_attach_transports; 
    2931    Padre::Util::debug('Chat transports attached');   
    … …  
    3840    $self->queue->enqueue( { type=>'disco' , want=>['chat'] } ); 
    3941     
    40     $self->queue->enqueue( { user => getlogin , type=>'announce',  } ); 
     42    $self->queue->enqueue( { type=>'announce',  } ); 
    4143     
    4244} 
    … …  
    101103    my ($self,$text) = @_; 
    102104    $self->send( 
    103         { user => getlogin, message=>$text } 
     105        {message=>$text } 
    104106    ); 
    105107} 
    … …  
    108110    my ($self,$text,$entity) = @_; 
    109111    $self->send(  
    110         { user => getlogin, message=>$text, to=>$entity } 
     112        { message=>$text, to=>$entity } 
    111113    ); 
    112114} 

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

    r5826 r5831  
    1414sub new { 
    1515    my ($class,%args) = @_; 
    16     my %obj; 
     16    my %obj = %args; 
    1717    my $selector = IO::Select->new(); 
    1818    $obj{subscriptions} = {}; 

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

    r5827 r5831  
    1111       connection => 'connection', 
    1212       condvar  => 'condvar', 
     13       nickname    => 'nickname', 
    1314   }; 
    1415    
    … …  
    2526    $con->connect ( 
    2627        "irc.perl.org" => 6667 , 
    27         { nick => 'swarm_submersible' , 
     28        { nick =>  $self->nickname, 
    2829          user => 'Padre-Swarm-Transport-IRC' , 
    2930          real => getlogin()  
    … …  
    4849sub _register_irc_callbacks { 
    4950    my ($self,$con) = @_; 
    50 warn "REGISTER CALLBACKS"; 
    51  
    5251    $con->reg_cb ( 
    5352       connect => sub { 
    5453          my ($con, $err) = @_; 
    5554          if (defined $err) { 
    56          warn "Connect ERROR! => $err\n"; 
     55         Padre::Util::debug("Connect ERROR! => $err\n"); 
    5756         $self->condvar->broadcast; 
    5857          } else { 
    … …  
    6059          } 
    6160 
    62         $con->send_srv( JOIN => '#padre' ); 
    6361#       $con->register(  
    6462#         $self->nickname, 
    … …  
    6664#         , getlogin()  
    6765#       ); 
     66 
     67        $self->update_channels; 
    6868         
    6969       }, 
    … …  
    103103    my $con = $self->connection; 
    104104    my $room = '#padre_swarm_' . $channel; 
    105     warn "Join #padre"; 
    106     $con->send_srv( JOIN => '#padre' ); 
     105    $con->send_srv( JOIN => $room ); 
    107106} 
    108107 
     108sub update_channels { 
     109    my ($self) = @_; 
     110    while ( my ($channel,$loop) = each %{ $self->channels } ) { 
     111        $self->subscribe_channel($channel,$loop); 
     112    } 
     113     
     114} 
    109115 
    110116 

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

    r5826 r5831  
    66use Params::Util qw{_INSTANCE}; 
    77use Padre::Wx (); 
     8use Padre::Config (); 
    89use Padre::Service::Swarm; 
    910use Padre::Swarm::Service::Chat; 
    … …  
    5657    $self->SetSizer($sizer); 
    5758     
     59    my $config = Padre::Config->read; 
    5860    my $service = Padre::Swarm::Service::Chat->new( 
    5961        use_transport => { 
    60             #'Padre::Swarm::Transport::Multicast'=>{}, 
    61             'Padre::Swarm::Transport::IRC'=>{}, 
     62            'Padre::Swarm::Transport::Multicast'=>{ 
     63            #'Padre::Swarm::Transport::IRC'=>{ 
     64                nickname => $config->identity_nickname 
     65            }, 
    6266        } 
    6367    ); 
    … …  
    156160    my $body = shift; 
    157161    my $args = shift; 
    158     my $message = {message=>$body,user=>getlogin}; 
     162    my $message = {message=>$body}; 
    159163    my $service = $self->service->tell($message)  
    160164} 

  • trunk/Padre-Plugin-Swarm/t/07_service_irc.t

    r5828 r5831  
    2323my $chat = Padre::Swarm::Service::Chat->new( 
    2424    use_transport => { 
    25         'Padre::Swarm::Transport::IRC' => {}, 
     25        'Padre::Swarm::Transport::IRC' => { 
     26            nickname => 'swarm_'.$$ , 
     27        }, 
    2628    } 
    2729); 
    2830 
    2931$chat->schedule; 
    30 $chat->queue->enqueue({user=>getlogin(),type=>'chat',message=>'test'}); 
     32$chat->queue->enqueue({type=>'chat',message=>'test'}); 
    3133 
    32 sleep 90; # sooo long 
     34sleep 30; # sooo long 
    3335$chat->queue->enqueue('HANGUP'); 
    3436$chat->shutdown; 
Note: See TracChangeset for help on using the changeset viewer.