Changeset 29 in mp3-find for trunk/lib/MP3/Find/Filesystem.pm

Timestamp:

05/21/06 05:17:23 (18 years ago)

Author:

peter

Message:

• factored out 'get_mp3_metadata' function from Filesystem.pm to Util.pm
• added 'update' function to DB.pm that combines 'update_db' and 'update_file' (for updating just specific files); idea courtesy of Matt Dietrich
• modified mp3db to let you mix and match files and directories on the command line; now also uses the 'update' function in DB.pm

File:

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

trunk/lib/MP3/Find/Filesystem.pm

@@ -9 +9 @@
 use MP3::Info;
 use Scalar::Util qw(looks_like_number);
+
+use MP3::Find::Util qw(get_mp3_metadata);
 
 eval {
@@ -97 +99 @@
         return if $filename =~ $$options{exclude_path};
     }
-    
-    my $mp3 = {
-        FILENAME => $filename,
-        %{ get_mp3tag($filename)  || {} },
-        %{ get_mp3info($filename) || {} },
-    };
-    
-    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 {
-            $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') {
-                        # 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;
-                    }
-                }
-            }
-        }
-    }
+
+    my $mp3 = get_mp3_metadata({
+        filename  => $filename,
+        use_id3v2 => $options->{use_id3v2},
+    });
 
     for my $field (keys(%{ $query })) {