add --no-utf8-convert to flac2mp3 and flacsplit metaflac runs

diff --git a/flac2mp3 b/flac2mp3
index 000d8ef22a0c68495e8b7e215354ecc6e64c65f5..b105b96dac94ca23d10760714a577b9b9c67a48f 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -134,7 +134,8 @@ def tformat(m, s, c):
 def get_decode_args(fn):
     l = []
 
 def get_decode_args(fn):
     l = []
 

-    p = Popen(['metaflac', '--export-cuesheet-to=-', fn], stdout=PIPE)
+    p = Popen(['metaflac', '--no-utf8-convert', '--export-cuesheet-to=-', fn],
+              stdout=PIPE)

     for line in (x.rstrip() for x in p.stdout):
         m = re.search(r'INDEX 01 (\d\d):(\d\d):(\d\d)$', line)
         if m != None:
     for line in (x.rstrip() for x in p.stdout):
         m = re.search(r'INDEX 01 (\d\d):(\d\d):(\d\d)$', line)
         if m != None:


@@ -174,7 +175,8 @@ def get_tags(fn):
 
     tags = Tags()
 
 
     tags = Tags()
 

-    p = Popen(['metaflac', '--export-tags-to=-', fn], stdout=PIPE)
+    p = Popen(['metaflac', '--no-utf8-convert', '--export-tags-to=-', fn],
+              stdout=PIPE)

     tags.load(p.stdout)
 
     # XXX dataloss!  check status
     tags.load(p.stdout)
 
     # XXX dataloss!  check status

diff --git a/flacsplit b/flacsplit
index 26d3bec0304ddf58f3f9defc4dfa22c6a7a89865..032fea26415de16f39d0a87e61a9e7c930a1378b 100755 (executable)
--- a/flacsplit
+++ b/flacsplit
@@ -42,7 +42,8 @@ sub get_decode_args {
     my $fn = shift;
     my @l;
 
     my $fn = shift;
     my @l;
 

-    open(F, '-|', 'metaflac', '--export-cuesheet-to=-', $fn);
+    open(F, '-|', 'metaflac', '--no-utf8-convert', '--export-cuesheet-to=-',
+         $fn);

     while (<F>) {
         /INDEX 01 (\d\d):(\d\d):(\d\d)$/ or next;
         push(@l, [$1, $2, $3]);
     while (<F>) {
         /INDEX 01 (\d\d):(\d\d):(\d\d)$/ or next;
         push(@l, [$1, $2, $3]);


@@ -130,10 +131,12 @@ sub flacsplit {
     my $outdir;
     my $outfile;
 
     my $outdir;
     my $outfile;
 

-    open(my $fp, '-|', 'metaflac', '--export-tags-to=-', $fn)
-      or die("open(metaflac --export-tags-to=- $fn): $!");
+    open(my $fp, '-|', 'metaflac', '--no-utf8-convert', '--export-tags-to=-',
+         $fn)
+      or die("open(metaflac --no-utf8-convert --export-tags-to=- $fn): $!");

     ($artist, $album, $discnum, @tags) = get_tags($fp, $fn);
     ($artist, $album, $discnum, @tags) = get_tags($fp, $fn);

-    close($fp) or die("close(metaflac --export-tags-to=- $fn): $?");
+    close($fp)
+        or die("close(metaflac --no-utf8-convert --export-tags-to=- $fn): $?");

     for ($artist, $album) {
         s/'/'\\''/g;
         s|/|_|g;
     for ($artist, $album) {
         s/'/'\\''/g;
         s|/|_|g;