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

Timestamp:

2012-10-02T05:43:31+13:00 (12 years ago)

Author:

davidb

Message:

Some mods that resulted from testing under Cygwin

File:

• gs2-extensions/music-ir-src/trunk/perllib/plugins/jSongMinerExtractor.pm (modified) (1 diff)

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

@@ -176 +176 @@
     elsif (chdir($jmir_directory)) {
 
+    my $source_file_path_os = $source_file_path;
+    if ($^O eq "cygwin") {
+        $source_file_path_os = `cygpath -w "$source_file_path"`;
+        $source_file_path_os =~ s/\s+$//;
+    }
+    my $target_txt_file_path_os = $target_txt_file_path;
+    if ($^O eq "cygwin") {
+        $target_txt_file_path_os = `cygpath -w "$target_txt_file_path"`;
+        $target_txt_file_path_os =~ s/\s+$//;
+    }
+    my $target_acexml_file_path_os = $target_acexml_file_path;
+    if ($^O eq "cygwin") {
+        $target_acexml_file_path_os = `cygpath -w "$target_acexml_file_path"`;
+        $target_acexml_file_path_os =~ s/\s+$//;
+    }
 
     my $jsongminer_cmd = "java -Xmx1024M -jar jSongMiner.jar $convert_options";
-    $jsongminer_cmd .= " -title \"$id3_title\"";
-    $jsongminer_cmd .= " -artist \"$id3_artist\"";
-    $jsongminer_cmd .= " -audio \"$source_file_path\"";
-    $jsongminer_cmd .= " -savetxtfile \"$target_txt_file_path\"";
-    $jsongminer_cmd .= " -saveacexmlfile \"$target_acexml_file_path\"";
+    $jsongminer_cmd .= " -title \"$id3_title\"" if defined $id3_title;
+    $jsongminer_cmd .= " -artist \"$id3_artist\"" if defined $id3_artist;
+    $jsongminer_cmd .= " -audio \"$source_file_path_os\"";
+    $jsongminer_cmd .= " -savetxtfile \"$target_txt_file_path_os\"";
+    $jsongminer_cmd .= " -saveacexmlfile \"$target_acexml_file_path_os\"";
     
     if ($verbosity>2) {