← Back to branch summary

~ubuntu-branches/ubuntu/saucy/padre/saucy-proposed

« back to all changes in this revision

Viewing changes to lib/Padre/Wx/Directory/Search.pm

  • Committer: Package Import Robot
  • Author(s): Dominique Dumont, gregor herrmann, Dominique Dumont
  • Date: 2012-01-04 12:04:20 UTC
  • mfrom: (1.3.3)
  • Revision ID: package-import@ubuntu.com-20120104120420-i5oybqwf91m1d3il
Tags: 0.92.ds1-1
[ gregor herrmann ]
* Remove debian/source/local-options; abort-on-upstream-changes
  and unapply-patches are default in dpkg-source since 1.16.1.
* Swap order of alternative (build) dependencies after the perl
  5.14 transition.

[ Dominique Dumont ]
* Imported Upstream version 0.92.ds1
* removed fix-spelling patch (applied upstream)
* lintian-override: use wildcard to avoid listing a gazillion files
* updated size of some 'not-real-man-page' entries
* rules: remove dekstop cruft (replaced by a file provided in debian
  directory)
* control: removed Breaks statement. Add /me to uploaders. Updated
  dependencies
* rules: make sure that non-DFSG file (i.e. the cute butterfly, sigh)
  is not distributed

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Padre/Wx/Directory/Search.pm
11
11
use Padre::Wx::Directory::Path ();
12
12
use Padre::Logger;
13
13
 
14
 
our $VERSION = '0.90';
 
14
our $VERSION = '0.92';
15
15
our @ISA     = 'Padre::Task';
16
16
 
17
17
use constant NO_WARN => 1;
100
100
        while (@queue) {
101
101
 
102
102
                # Abort the task if we've been cancelled
103
 
                if ( $self->cancel ) {
 
103
                if ( $self->cancelled ) {
104
104
                        TRACE('Padre::Wx::Directory::Search task has been cancelled') if DEBUG;
105
 
                        $self->handle->status;
 
105
                        $self->tell_status;
106
106
                        return 1;
107
107
                }
108
108
 
114
114
                        if ( $object->name =~ $filter ) {
115
115
 
116
116
                                # Send the matching file to the parent thread
117
 
                                $self->message( OWNER => $object );
 
117
                                $self->tell_owner($object);
118
118
                        }
119
119
                        next;
120
120
                }
129
129
                closedir DIRECTORY;
130
130
 
131
131
                # Notify our parent we are working on this directory
132
 
                $self->handle->status( "Searching... " . $object->unix );
 
132
                $self->tell_status( "Searching... " . $object->unix );
133
133
 
134
134
                # Step 1 - Map the files into path objects
135
135
                my @objects = ();
137
137
                        next if $file =~ /^\.+\z/;
138
138
 
139
139
                        # Abort the task if we've been cancelled
140
 
                        if ( $self->cancel ) {
 
140
                        if ( $self->cancelled ) {
141
141
                                TRACE('Padre::Wx::Directory::Search task has been cancelled') if DEBUG;
142
 
                                $self->handle->status;
 
142
                                $self->tell_status;
143
143
                                return 1;
144
144
                        }
145
145
 
228
228
        }
229
229
 
230
230
        # Notify our parent we are finished searching
231
 
        $self->handle->status;
 
231
        $self->tell_status;
232
232
 
233
233
        return 1;
234
234
}