Changeset 28549 for gs2-extensions

Timestamp:

2013-10-29T13:29:50+13:00 (10 years ago)

Author:

davidb

Message:

Added mapping for ID3v1 genre number to text-string

Location:

gs2-extensions/music-ir-src/trunk/perllib/plugins

Files:

• MusicIRPlugin.pm (modified) (1 diff)
• jSongMinerExtractor.pm (modified) (2 diffs)

gs2-extensions/music-ir-src/trunk/perllib/plugins/MusicIRPlugin.pm

@@ -178 +178 @@
     }
 
+    ### $self->check_for_existing_id3_genre($doc_obj);
+
     $doc_obj->associate_file($metadata_acexml_filename, "jsongminer.xml", 
                  "text/xml", $top_section);

gs2-extensions/music-ir-src/trunk/perllib/plugins/jSongMinerExtractor.pm

@@ -93 +93 @@
 }
 
+sub map_id3v1_genre_num
+{
+    my ($genre_num) = @_;
+
+    $genre_num =~ s/(/\(/g;
+    $genre_num =~ s/)/\)/g;
+    $genre_num =~ s/^[\(\[\{](.*)[\)\]\}]$/$1/;
+
+    if (($genre_num =~ m/^\d+$/) && ($genre_num >= 148)) {
+    return "Unknown";
+    }
+
+    my $lookup_id3v1_genre = {
+    "0"  => "Blues",
+    "1"  => "Classic Rock",
+    "2"  => "Country",
+    "3"  => "Dance",
+    "4"  => "Disco",
+    "5"  => "Funk",
+    "6"  => "Grunge",
+    "7"  => "Hip-Hop",
+    "8"  => "Jazz",
+    "9"  => "Metal",
+    "10" => "New Age",
+    "11" => "Oldies",
+    "12" => "Other",
+    "13" => "Pop",
+    "14" => "R&B",
+    "15" => "Rap",
+    "16" => "Reggae",
+    "17" => "Rock",
+    "18" => "Techno",
+    "19" => "Industrial",
+    "20" => "Alternative",
+    "21" => "Ska",
+    "22" => "Death Metal",
+    "23" => "Pranks",
+    "24" => "Soundtrack",
+    "25" => "Euro-Techno",
+    "26" => "Ambient",
+    "27" => "Trip-Hop",
+    "28" => "Vocal",
+    "29" => "Jazz+Funk",
+    "30" => "Fusion",
+    "31" => "Trance",
+    "32" => "Classical",
+    "33" => "Instrumental",
+    "34" => "Acid",
+    "35" => "House",
+    "36" => "Game",
+    "37" => "Sound Clip",
+    "38" => "Gospel",
+    "39" => "Noise",
+    "40" => "Alternative Rock",
+    "41" => "Bass",
+    "42" => "Soul",
+    "43" => "Punk",
+    "44" => "Space",
+    "45" => "Meditative",
+    "46" => "Instrumental Pop",
+    "47" => "Instrumental Rock",
+    "48" => "Ethnic",
+    "49" => "Gothic",
+    "50" => "Darkwave",
+    "51" => "Techno-Industrial",
+    "52" => "Electronic",
+    "53" => "Pop-Folk",
+    "54" => "Eurodance",
+    "55" => "Dream",
+    "56" => "Southern Rock",
+    "57" => "Comedy",
+    "58" => "Cult",
+    "59" => "Gangsta",
+    "60" => "Top 40",
+    "61" => "Christian Rap",
+    "62" => "Pop/Funk",
+    "63" => "Jungle",
+    "64" => "Native US",
+    "65" => "Cabaret",
+    "66" => "New Wave",
+    "67" => "Psychadelic",
+    "68" => "Rave",
+    "69" => "Showtunes",
+    "70" => "Trailer",
+    "71" => "Lo-Fi",
+    "72" => "Tribal",
+    "73" => "Acid Punk",
+    "74" => "Acid Jazz",
+    "75" => "Polka",
+    "76" => "Retro",
+    "77" => "Musical",
+    "78" => "Rock & Roll",
+    "79" => "Hard Rock",
+    "80" => "Folk",
+    "81" => "Folk-Rock",
+    "82" => "National Folk",
+    "83" => "Swing",
+    "84" => "Fast Fusion",
+    "85" => "Bebob",
+    "86" => "Latin",
+    "87" => "Revival",
+    "88" => "Celtic",
+    "89" => "Bluegrass",
+    "90" => "Avantgarde",
+    "91" => "Gothic Rock",
+    "92" => "Progressive Rock",
+    "93" => "Psychedelic Rock",
+    "94" => "Symphonic Rock",
+    "95" => "Slow Rock",
+    "96" => "Big Band",
+    "97" => "Chorus",
+    "98" => "Easy Listening",
+    "99" => "Acoustic",
+    "100" => "Humour",
+    "101" => "Speech",
+    "102" => "Chanson",
+    "103" => "Opera",
+    "104" => "Chamber Music",
+    "105" => "Sonata",
+    "106" => "Symphony",
+    "107" => "Booty Bass",
+    "108" => "Primus",
+    "109" => "Porn Groove",
+    "110" => "Satire",
+    "111" => "Slow Jam",
+    "112" => "Club",
+    "113" => "Tango",
+    "114" => "Samba",
+    "115" => "Folklore",
+    "116" => "Ballad",
+    "117" => "Power Ballad",
+    "118" => "Rhythmic Soul",
+    "119" => "Freestyle",
+    "120" => "Duet",
+    "121" => "Punk Rock",
+    "122" => "Drum Solo",
+    "123" => "Acapella",
+    "124" => "Euro-House",
+    "125" => "Dance Hall",
+    "126" => "Goa",
+    "127" => "Drum & Bass",
+    "128" => "Club - House",
+    "129" => "Hardcore",
+    "130" => "Terror",
+    "131" => "Indie",
+    "132" => "BritPop",
+    "133" => "Negerpunk",
+    "134" => "Polsk Punk",
+    "135" => "Beat",
+    "136" => "Christian Gangsta Rap",
+    "137" => "Heavy Metal",
+    "138" => "Black Metal",
+    "139" => "Crossover",
+    "140" => "Contemporary Christian",
+    "141" => "Christian Rock",
+    "142" => "Merengue",
+    "143" => "Salsa",
+    "144" => "Thrash Metal",
+    "145" => "Anime",
+    "146" => "JPop",
+    "147" => "Synthpop" 
+    };
+
+    my $mapped_genre;
+
+    if (defined $lookup_id3v1_genre->{$genre_num}) {
+    print STDERR "*** changing $genre_num -> ", $lookup_id3v1_genre->{$genre_num}, "\n";
+    $mapped_genre = $lookup_id3v1_genre->{$genre_num};
+    }
+    else {
+    $mapped_genre = $genre_num;
+    }
+
+    return $mapped_genre;
+}
+
+sub check_for_existing_id3_genre
+{
+    my $self = shift @_;
+    my ($doc_obj) = @_;
+
+    my $top_section=$doc_obj->get_top_section();
+
+    # Look for ex.ID3.Genre as well, as special case
+    my $genre_md_list = $doc_obj->get_metadata($top_section,"ex.ID3.Genre");
+    my @new_genre_md_list = ();
+    
+    foreach my $gv (@$genre_md_list) {
+    print STDERR "*** got match on ex.ID3.Genre -> '$gv'\n";
+    my $new_gv = map_id3v1_genre_num($gv);
+        
+    push(@new_genre_md_list,$new_gv);
+    }
+    
+    $doc_obj->delete_metadata($top_section,"ex.ID3.Genre");
+    foreach my $gv (@new_genre_md_list) {
+    $doc_obj->add_utf8_metadata($top_section,"ex.ID3.Genre",$gv);
+    }
+}
+
+
 sub parse_txt_metadata
 {
     my $self = shift @_;
     my ($doc_obj,$target_txt_file_path) = @_;
+
+    print STDERR "**#####** jSongMiner parsing txt metadata\n";
 
     if (open(MIN,"<$target_txt_file_path")) {
@@ -121 +324 @@
         $md_name =~ s/(API)?\^/./;
 
+#       print STDERR "*** md_name = '$md_name'\n";
+
+        if ($md_name =~ m/genre$/i) {
+        print STDERR "*** got match on $md_name -> $md_value\n";
+        $md_value = map_id3v1_genre_num($md_value);
+        }
+
         $doc_obj->add_utf8_metadata($top_section,$md_name,$md_value);
     }
 
     close(MIN);
+
+    $self->check_for_existing_id3_genre($doc_obj);
+
     }
     else {