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

Timestamp:

04/29/06 20:44:39 (19 years ago)

Author:

peter

Message:

• check for presence of MP3::Tag when Filesystem.pm is loaded
• use the "Text" value of hash MP3::Tag::ID3v2 frames for searching
• check for definedness of MP3::Tag before trying to read tags (keep from dying in the middle of a search)

File:

• trunk/lib/MP3/Find/Filesystem.pm (modified) (4 diffs)

trunk/lib/MP3/Find/Filesystem.pm

@@ -17 +17 @@
 my $USE_SORT_KEY = $@ ? 0 : 1;
 
+
+eval { require MP3::Tag };
+my $CAN_USE_ID3V2 = $@ ? 0 : 1;
+
 use_winamp_genres();
 
@@ -47 +51 @@
     }
     
+    if ($$options{use_id3v2} and not $CAN_USE_ID3V2) {
+        # they want to use ID3v2, but don't have MP3::Tag
+        warn "MP3::Tag is required to search ID3v2 tags\n";
+    }
+        
     # run the actual find
     my @results;
@@ -95 +104 @@
     };
     
-    if ($$options{use_id3v2}) {
-        eval { require MP3::Tag };
-        if ($@) {
-            # we weren't able to load MP3::Tag!
-            warn "MP3::Tag is required to search ID3v2 tags";
+    if ($CAN_USE_ID3V2 and $$options{use_id3v2}) {
+        # add ID3v2 tag info, if present
+        my $mp3_tags = MP3::Tag->new($filename);
+        unless (defined $mp3_tags) {
+            warn "Can't get MP3::Tag object for $filename\n";
         } else {
-            # add ID3v2 tag info, if present
-            my $mp3_tags = MP3::Tag->new($filename);
             $mp3_tags->get_tags;
             if (my $id3v2 = $mp3_tags->{ID3v2}) {
@@ -108 +115 @@
                     my ($info) = $id3v2->get_frame($frame_id);
                     if (ref $info eq 'HASH') {
-                        #TODO: how should we handle these?
+                        # use the "Text" value as the value for this frame, if present
+                        $mp3->{$frame_id} = $info->{Text} if exists $info->{Text};
                     } else {
                         $mp3->{$frame_id} = $info;