Changeset 9646

Timestamp:

12/13/09 00:30:47 (2 years ago)

Author:

submersible_toaster

Message:

[Padre-Plugin-Swarm] refactor some parts. add support for 'Run in other editor'

Location:

trunk/Padre-Plugin-Swarm/lib/Padre

Files:

• Plugin/Swarm.pm (modified) (3 diffs)
• Wx/Swarm/Chat.pm (modified) (3 diffs)

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

@@ -64 +64 @@
     my $self = shift;
     return $self->plugin_name => [
+            'Run in Other Editor' => sub { $self->run_in_other_editor },
         'About' => sub { $self->show_about },
     ];
@@ -80 +81 @@
         my $config = $self->config_read;
         $self->set_config( $config );
+        
+#            # Cargo WebGui
+#            # workaround Padre bug
+#            my %registered_documents = $self->registered_documents;
+#            while ( my ( $k, $v ) = each %registered_documents ) {
+#            Padre::MimeTypes->add_highlighter_to_mime_type( $k, $v );
+        }
+
         $self->_load_everything;
     }
@@ -90 +99 @@
 }
 
-sub event_on_context_menu {
-    my $self     = shift;
-    my $document = shift;
-    my $editor   = shift;
-    my $menu     = shift;
-    my $event    = shift;
-    my $diff     = $menu->Append( -1,
-        Wx::gettext("Swarm diff snippet")
-    );
-    Wx::Event::EVT_MENU(
-        $editor,
-        $diff,
-        sub {
-            instance()->get_chat->on_diff_snippet;
-        },
-    );
-}
-
-
-
-
+
+#sub registered_documents {
+#    'application/x-swarm-document' =>    
+#        'Padre::Plugin::Swarm::Document',
+#}
+#
+#
+#sub editor_enable {
+#   my ( $self, $editor, $doc ) = @_;
+#   $self->{editor}{ refaddr $editor} = 1; 
+#   return 1;
+#}
+#
+## Does this really happen ? # cargo from Plugin::Vi
+#sub editor_stop {
+#   my ( $self, $editor, $doc ) = @_;
+#   delete $self->{editor}{ refaddr $editor};
+#
+#   return 1;
+#}
+
+# oh noes!
+sub run_in_other_editor {
+    my $self = shift;
+    my $ed = $self->current->editor;
+    my $doc = $self->current->document;
+    $self->get_chat->tell_service(
+        Padre::Swarm::Message->new(
+            type => 'runme',
+            body => $ed->GetText,
+            filename => $doc->filename,
+        )
+    );
+    
+}
 
 #####################################################################

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

@@ -173 +173 @@
     return unless _INSTANCE( $message , 'Padre::Swarm::Message' );
 
-    if ( $message->type eq 'chat' ) {
-        my $user = $message->from || 'unknown';
-        my $content = $message->body;
-        return unless defined $content;
-        $self->accept_chat($message);
-    }
-    elsif ( _INSTANCE( $message , 'Padre::Swarm::Message::Diff' ) ) {
-                warn "Got diff -- " if DEBUG;
-        $self->on_receive_diff($message);
-        return;
-    }
-    elsif ( $message->type eq 'announce' ) {
-        warn "Got announce" if DEBUG;
-        $self->accept_announce($message);
-    }
-    elsif ( $message->type eq 'leave' ) {
-        $self->accept_leave( $message );
-    }
-    elsif ( $message->type eq 'promote' ) {
-        $self->accept_promote( $message );
-    }
-    else {
-        TRACE("Discarded $message") if DEBUG;
-    }
+        my $handler = 'accept_' . $message->type;
+        if ( $self->can( $handler ) ) {
+            eval {
+                $self->$handler($message);
+            };
+            if ($@) {
+                $self->write_user_styled( $message->from,$message->from );
+                $self->write_unstyled(" sent unhandled message " 
+                    . $message->type . "\n" );
+                    
+            }
+        }
+
 }
 
@@ -254 +243 @@
     my $identity = $message->from;
     $self->write_user_styled( $identity , $identity );
-    $self->write_unstyled( ' has left the swarm.' );
+    $self->write_unstyled( " has left the swarm.\n" );
+    
+}
+
+sub accept_runme {
+    my ($self,$message) = @_;
+    # Ouch..
+    my @result = eval $message->body;
+    if ( $@ ) {
+        $self->write_user_styled( $message->from , $message->from );
+        $self->write_unstyled( ' ran' . $message->{filename}
+            . ' in YOUR editor but failed!! ' . $@ );
+    }
+    else {
+        $self->write_user_styled( $message->from , $message->from );
+        $self->write_unstyled( ' ran ' . $message->{filename}
+            . ' in YOUR editor successfully, returning ', @result
+        );
+        
+    }
     
 }
@@ -334 +342 @@
 }
 
-sub on_receive_diff {
+sub accept_diff {
     my ($self,$message) = @_;
     TRACE("Received diff $message") if DEBUG;