Changeset 12378

Timestamp:

08/27/10 00:28:57 (18 months ago)

Author:

adamk

Message:

Directory tree improvements

Location:

trunk/Padre

Files:

• lib/Padre/TaskHandle.pm (modified) (3 diffs)
• lib/Padre/Wx/Directory.pm (modified) (7 diffs)
• lib/Padre/Wx/Directory/Browse.pm (added)
• lib/Padre/Wx/Directory/Path.pm (modified) (1 diff)
• lib/Padre/Wx/Directory/TreeCtrl.pm (modified) (2 diffs)
• lib/Padre/Wx/TreeCtrl.pm (added)
• t/61-directory-path.t (modified) (2 diffs)

trunk/Padre/lib/Padre/TaskHandle.pm

@@ -313 +313 @@
     # Pull off the queue
     my $queue = $handle->queue or return 0;
-    push @$inbox, $queue->dequeue;
+    foreach my $message ( $queue->dequeue ) {
+        if ( $message->[0] eq 'cancel' ) {
+            $self->{cancel} = 1;
+            next;
+        }
+    }
+
+    # Check the message for valid structure
     my $message = shift @$inbox or return 0;
-
-    # Check the message for valid structure
     unless ( Params::Util::_ARRAY($message) ) {
         TRACE('Non-ARRAY message received by a worker thread') if DEBUG;
@@ -336 +341 @@
 
     # Pull from the inbox first
-    my $inbox  = $handle->inbox or return 0;
+    my $inbox = $handle->inbox or return 0;
     if ( @$inbox ) {
         return shift @$inbox;
@@ -343 +348 @@
     # Pull off the queue, non-blocking
     my $queue = $handle->queue or return 0;
-    push @$inbox, $queue->dequeue_nb;
+    foreach my $message ( $queue->dequeue ) {
+        if ( $message->[0] eq 'cancel' ) {
+            $self->{cancel} = 1;
+            next;
+        }
+    }
+
+    # Check the message for valid structure
     my $message = shift @$inbox or return 0;
-
-    # Check the message for valid structure
     unless ( Params::Util::_ARRAY($message) ) {
         TRACE('Non-ARRAY message received by a worker thread') if DEBUG;

trunk/Padre/lib/Padre/Wx/Directory.pm

@@ -104 +104 @@
     # Create the tree control
     $self->{tree} = Padre::Wx::Directory::TreeCtrl->new($self);
+    $self->{tree}->SetPlData(
+        $self->{tree}->GetRootItem,
+        Wx::TreeItemData->new(
+            Padre::Wx::Directory::Path->directory,
+        ),
+    );
+    Wx::Event::EVT_TREE_ITEM_EXPANDED(
+        $self,
+        $self->{tree},
+        sub {
+            shift->on_expand(@_);
+        }
+    );
 
     # Fill the panel
@@ -183 +196 @@
             $search->ShowCancelButton(0);
             $self->task_reset;
-            $self->refresh_render;
+            $self->clear;
+            $self->browse;
         } else {
             # Changing search term
@@ -204 +218 @@
 }
 
+sub on_expand {
+    my $self  = shift;
+    my $event = shift;
+    my $item  = $event->GetItem;
+    my $path  = $self->{tree}->GetPlData($item);
+    return $self->browse( $path );
+}
+
 
 
@@ -276 +298 @@
         if ( $ide->project_exists( $self->{root} ) ) {
             my $stash = Padre::Cache::stash(
-                __PACKAGE__,
-                $ide->project( $self->{root} ),
+                __PACKAGE__ => $ide->project( $self->{root} ),
             );
             %$stash = (
@@ -295 +316 @@
         if ($project) {
             my $stash = Padre::Cache::stash(
-                __PACKAGE__,
-                $project,
+                __PACKAGE__ => $project,
             );
             if ( $stash->{root} ) {
@@ -306 +326 @@
         }
 
-        # Flush the search box and rerender the tree
-        $self->{search}->SetValue('');
-        $self->{search}->ShowCancelButton(0);
-        $self->refresh_render;
-
-        # Trigger the refresh task to update the temporary state
-        $self->task_request(
-            task      => 'Padre::Wx::Directory::Task',
-            on_finish => 'refresh_finish',
-            recursive => 1,
-            @options,
-        );
-
+        # Flush the search box and start the rerender
+        $self->clear;
+        $self->browse;
     }
 
@@ -394 +404 @@
 
     return 1;
+}
+
+
+
+
+
+######################################################################
+# Browse Methods
+
+sub browse {
+    TRACE( $_[0] ) if DEBUG;
+    my $self = shift;
+    my $path = shift || Padre::Wx::Directory::Path->directory;
+    return if $self->searching;
+
+    # Switch tasks to the browse task
+    $self->task_reset;
+    $self->task_request(
+        task       => 'Padre::Wx::Directory::Browse',
+        on_message => 'browse_message',
+        on_finish  => 'browse_finish',
+        list       => [ $path ],
+    );
+
+    return;
+}
+
+sub browse_message {
+    TRACE( $_[0] ) if DEBUG;
+    my $self   = shift;
+    my $task   = shift;
+    my $parent = shift;
+
+    # Find the parent, discarding the message if we can't find it
+    my $tree   = $self->{tree};
+    my $cursor = $tree->GetRootItem;
+    foreach my $name ( $parent->path ) {
+        # Locate the child to descend to.
+        # Discard the entire message if the target child doesn't exist.
+        $cursor = $tree->GetChildByText( $cursor, $name ) or return 1;
+    }
+
+    # Temporarily skip if we've already filled this node.
+    # TODO: Upgrade this to make it update the list instead.
+    if ( $tree->GetChildrenCount($cursor) ) {
+        return;
+    }
+
+    # Add the files to the cursor
+    while ( @_ ) {
+        my $path  = shift;
+        my $image = $path->type ? 'folder' : 'package';
+
+        # Add the child to the parent
+        $tree->AppendItem(
+            $cursor,                      # Parent node
+            $path->name,                  # Label
+            $tree->{images}->{$image},    # Icon
+            -1,                           # Wx Identifier
+            Wx::TreeItemData->new($path), # Embedded data
+        );
+    }
+
+    return 1;
+}
+
+sub browse_finish {
+    TRACE( $_[0] ) if DEBUG;
+    my $self = shift;
+    my $task = shift;
 }
 

trunk/Padre/lib/Padre/Wx/Directory/Path.pm

@@ -33 +33 @@
     return bless [
         DIRECTORY,
-        File::Spec::Unix->catfile(@_),
+        File::Spec::Unix->catfile( @_ ? @_ : ('') ),
         @_,
     ], $class;

trunk/Padre/lib/Padre/Wx/Directory/TreeCtrl.pm

@@ -6 +6 @@
 use File::Spec                 ();
 use Padre::Constant            ();
-use Padre::Wx                  ();
+use Padre::Wx::TreeCtrl        ();
 use Padre::Wx::Role::Main      ();
 use Padre::Wx::Directory::Path ();
@@ -13 +13 @@
 our @ISA     = qw{
     Padre::Wx::Role::Main
-    Wx::TreeCtrl
+    Padre::Wx::TreeCtrl
 };
 

trunk/Padre/t/61-directory-path.t

@@ -3 +3 @@
 use strict;
 use warnings;
-use Test::More tests => 18;
+use Test::More tests => 25;
 use Test::NoWarnings;
 use Storable                   ();
@@ -62 +62 @@
     is_deeply( $file, $round, 'File round-trips ok' );
 }
+
+
+
+
+
+######################################################################
+# Test the null directory case
+
+SCOPE: {
+    my $directory = Padre::Wx::Directory::Path->directory;
+    isa_ok( $directory, 'Padre::Wx::Directory::Path' );
+    is( $directory->type, Padre::Wx::Directory::Path::DIRECTORY, '->type ok' );
+    is( $directory->name, '',                                    '->name ok' );
+    is( $directory->unix, '',                                    '->unix ok' );
+    is_deeply( [ $directory->path ], [ ], '->path ok' );
+    is( $directory->is_file,      0, '->is_file ok' );
+    is( $directory->is_directory, 1, '->is_directory ok' );
+}