Changeset 12 in mp3-find for trunk/lib/MP3

Timestamp:

02/14/06 20:19:23 (19 years ago)

Author:

peter

Message:

• added "exclude_path" option to Filesystem backend
• added an excluded directory to the test suite ("t/dont_look_here")
• fixed dying DB test (still a workaround for a DBD::SQLite problem)

Location:

trunk/lib/MP3/Find

Files:

• DB.pm (modified) (2 diffs)
• Filesystem.pm (modified) (3 diffs)

trunk/lib/MP3/Find/DB.pm

@@ -123 +123 @@
         warn "Multiple records for $$mp3{FILENAME}\n" if @$records > 1;
         
+        #TODO: maybe print status updates somewhere else?
         if (@$records == 0) {
             $insert_sth->execute(map { $mp3->{$$_[0]} } @COLUMNS);
@@ -138 +139 @@
     # (see http://rt.cpan.org/Ticket/Display.html?id=9643#txn-120724)
     foreach ($mtime_sth, $insert_sth, $update_sth) {
+        $_->{RaiseError} = 0;  # don't die on error
         $_->{Active} = 1;
         $_->finish;

trunk/lib/MP3/Find/Filesystem.pm

@@ -30 +30 @@
     }
     
+    if ($$options{exclude_path}) {
+        my $ref = ref $$options{exclude_path};
+        if ($ref eq 'ARRAY') {
+            $$options{exclude_path} = '(' . join('|', @{ $$options{exclude_path} }) . ')';
+        }
+        unless ($ref eq 'Regexp') {
+            $$options{exclude_path} = qr[$$options{exclude_path}];
+        }
+    }
+    
     # run the actual find
     my @results;
-    find(sub { match_mp3($File::Find::name, $query, \@results) }, $_) foreach @$dirs;
+    find(sub { match_mp3($File::Find::name, $query, \@results, $options) }, $_) foreach @$dirs;
     
     # sort the results
@@ -54 +64 @@
 
 sub match_mp3 {
-    my ($filename, $query, $results) = @_;
+    my ($filename, $query, $results, $options) = @_;
     
     return unless $filename =~ m{[^/]\.mp3$};
+    if ($$options{exclude_path}) {
+        return if $filename =~ $$options{exclude_path};
+    }
+    
     my $mp3 = {
         FILENAME => $filename,
@@ -103 +117 @@
 =head2 Special Options
 
-There are no special options for B<MP3::Find::Filesystem>. See
-L<MP3::Find> for the description of the general options.
+=over
+
+=item C<exclude_path>
+
+Scalar or arrayref; any file whose name matches any of these paths
+will be skipped.
 
 =head1 SEE ALSO