Changeset 22441 for gs2-extensions/music-ir

Timestamp:

2010-07-19T17:55:42+12:00 (14 years ago)

Author:

davidb

Message:

Placeholder code that printed out java command changed to actually call the command

File:

• gs2-extensions/music-ir/trunk/perllib/plugins/jSongMinerExtractor.pm (modified) (2 diffs)

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

@@ -72 +72 @@
     my $music_ir_home = $ENV{'GEXT_MUSICIR'};
 
+    $self->{'jmir_directory'} = &util::filename_cat($music_ir_home,"lib","java"); # Set the directory holding the jMIR .jar files
+
     return bless $self, $class;
 }
@@ -102 +104 @@
     }
 
-    my $jsongminer_cmd = "java -Xmx1024M -jar jSongMinor.jar $convert_options \"$id3_title\" \"$id3_artist\"";
+    my $jmir_directory = $self->{'jmir_directory'};
+
+
+    my $store_cwd = cwd();
+
+    if (!-d $jmir_directory) {
+    print STDERR "Error: Unable able to find directory '$jmir_directory'\n";
+    print STDERR "       Cannot run jAudio\n";
+    }
+    elsif (chdir($jmir_directory)) {
+
+
+    my $jsongminer_cmd = "java -Xmx1024M -jar jSongMiner.jar $convert_options";
+    $jsongminer_cmd .= " -title \"$id3_title\"";
+    $jsongminer_cmd .= " -artist \"$id3_artist\"";
+    $jsongminer_cmd .= " -file \"$source_file_path\"";
+    
+    if ($verbosity>2) {
+        print $outhandle "jSongMinerExtractor: Running ...\n";
+        print $outhandle "jSongMinerExtractor:   $jsongminer_cmd\n";
+    }
+    
+    my $print_info = { 'message_prefix' => "jSongMiner",
+               'message' => "Retrieving audio metadata for $source_file_no_path" };
+    
+    my ($regenerated,$result,$had_error) 
+        = $self->autorun_general_cmd($jsongminer_cmd,$source_file_path,$target_file_path,$print_info);
+    
+    if ($verbosity>2) {
+        print $outhandle "jSongMinerExtractor: ...done\n";
+    }
+    }
+    else {
+    print STDERR "Error: failed to change directory to '$jmir_directory'\n";
+    print STDERR "       Cannot run jAudio\n";
+    }
+
+    chdir($store_cwd);
+
         
-    print STDERR "*** cmd: $jsongminer_cmd\n";
-
-    my $print_info = { 'message_prefix' => "jSongMiner",
-               'message' => "Retrieving audio metadata for $source_file_no_path" };
-    
-#    my ($regenerated,$result,$had_error) 
-#   = $self->autorun_general_cmd($jsongminer_cmd,$source_file_path,$target_file_path,$print_info);
-    
     return ($target_file_path);
 }