Changeset 12 in mp3-find for trunk

Timestamp:

02/14/06 20:19:23 (18 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

Files:

• Changes (modified) (2 diffs)
• lib/MP3/Find/DB.pm (modified) (2 diffs)
• lib/MP3/Find/Filesystem.pm (modified) (3 diffs)
• t/02-filesystem.t (modified) (2 diffs)
• t/03-db.t (modified) (1 diff)
• t/mp3s/dont_look_here (added)
• t/mp3s/dont_look_here/testv2.4.0.mp3 (added)

trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension MP3::Find.
 
-0.01  29 Jan 2006
-    - first CPAN release
+0.03
+    - added "exclude_path" option to filesystem backend
 
 0.02  1 Feb 2006
@@ -9 +9 @@
     - DB management functions are now in the DB backend
     - rewrote (and documented) mp3db to use the new DB backend functions
+
+0.01  29 Jan 2006
+    - first CPAN release

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

trunk/t/02-filesystem.t

@@ -2 +2 @@
 use strict;
 
-use Test::More 'no_plan'; #tests => 4;
+use Test::More tests => 6;
 BEGIN { use_ok('MP3::Find::Filesystem') };
 
 my $SEARCH_DIR = 't/mp3s';
-my $MP3_COUNT = 0;
+my $EXCLUDE_DIR = 't/mp3s/dont_look_here';
+my $MP3_COUNT = 1;
+my $EXCLUDED_MP3_COUNT = 1;
 
 # exercise the object
@@ -20 +22 @@
 is(scalar(@res), $MP3_COUNT, 'dir as ARRAY ref');
 
+# exclude
+@res = $finder->find_mp3s(dir => $SEARCH_DIR, exclude_path => $EXCLUDE_DIR);
+is(scalar(@res), $MP3_COUNT - $EXCLUDED_MP3_COUNT, 'excluded directory');
+
+@res = $finder->find_mp3s(dir => $SEARCH_DIR, exclude_path => [$EXCLUDE_DIR]);
+is(scalar(@res), $MP3_COUNT - $EXCLUDED_MP3_COUNT, 'excluded directory as array');
+
 #TODO: get some test mp3s

trunk/t/03-db.t

@@ -19 +19 @@
 my $SEARCH_DIR = 't/mp3s';
 my $DB_FILE = 't/mp3.db';
-my $MP3_COUNT = 0;
+my $MP3_COUNT = 1;
 
 # exercise the object