Changeset 25 in mp3-find

Timestamp:

04/28/06 03:27:57 (19 years ago)

Author:

peter

Message:

• MP3::Find::Filesystem will warn if you ask to "use_id3v2" and MP3::Tag cannot be loaded
• mp3find now searches ID3v2 tags be default
• incremented version number
• generated new README

Location:

trunk

Files:

• Changes (modified) (1 diff)
• README (modified) (1 diff)
• bin/mp3find (modified) (2 diffs)
• lib/MP3/Find.pm (modified) (1 diff)
• lib/MP3/Find/Filesystem.pm (modified) (1 diff)

trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension MP3::Find.
+
+0.05 28 Apr 2006
+    - mp3find searches in ID3v2 tags if MP3::Tag is available
+    - using Sort::Key for sorting of results (if available)
 
 0.04  2 Apr 2006

trunk/README

@@ -1 @@
-MP3::Find version 0.04
+MP3::Find version 0.05
 ======================
 

trunk/bin/mp3find

@@ -13 +13 @@
     'sort|s=s'      => \my $SORT_TAG,
     'printf=s'      => \my $FORMAT,
-    '2'             => \my $USE_ID3V2,
 );
 
@@ -27 +26 @@
     printf      => $FORMAT,
     db_file     => catfile($ENV{HOME}, 'mp3.db'),
-    use_id3v2   => $USE_ID3V2,
+    use_id3v2   => 1,  # search using ID3v2 tags by default
 );
 

trunk/lib/MP3/Find.pm

@@ -9 +9 @@
 use Carp;
 
-$VERSION = '0.04';
+$VERSION = '0.05';
 
 @EXPORT = qw(find_mp3s);

trunk/lib/MP3/Find/Filesystem.pm

@@ -96 +96 @@
     
     if ($$options{use_id3v2}) {
-        require MP3::Tag;
-        # add ID3v2 tag info, if present
-        my $mp3_tags = MP3::Tag->new($filename);
-        $mp3_tags->get_tags;
-        if (my $id3v2 = $mp3_tags->{ID3v2}) {
-            for my $frame_id (keys %{ $id3v2->get_frame_ids }) {
-                my ($info) = $id3v2->get_frame($frame_id);
-                if (ref $info eq 'HASH') {
-                    #TODO: how should we handle these?
-                } else {
-                    $mp3->{$frame_id} = $info;
-                }
-            }
-        }
+        eval { require MP3::Tag };
+        if ($@) {
+            # we weren't able to load MP3::Tag!
+            warn "MP3::Tag is required to search ID3v2 tags";
+        } else {
+            # add ID3v2 tag info, if present
+            my $mp3_tags = MP3::Tag->new($filename);
+            $mp3_tags->get_tags;
+            if (my $id3v2 = $mp3_tags->{ID3v2}) {
+                for my $frame_id (keys %{ $id3v2->get_frame_ids }) {
+                    my ($info) = $id3v2->get_frame($frame_id);
+                    if (ref $info eq 'HASH') {
+                        #TODO: how should we handle these?
+                    } else {
+                        $mp3->{$frame_id} = $info;
+                    }
+                }
+            }
+        }
     }