Changeset 887 for lang/perl/plagger

Timestamp:

10/30/07 15:01:02 (13 months ago)

Author:

mizzy

Message:

lang/perl/plagger/lib/Plagger/Plugin/Filter/FFmpeg.pm: fix encoding.Thanks to lang/perl/plagger/lib/Plagger/Plugin/Filter.

Files:

• lang/perl/plagger/lib/Plagger/Plugin/Filter/FFmpeg.pm (modified) (3 diffs)

lang/perl/plagger/lib/Plagger/Plugin/Filter/FFmpeg.pm

@@ -26 +26 @@
         if $self->conf->{ext} and $self->conf->{filename};
 
-    my $encoding = $self->conf->{encoding} || 'cp932';
-
     my $enclosures = $entry->enclosures;
     $context->log( warn => 'You shuld not use filename option because the entry has several enclosures.' )
@@ -49 +47 @@
 
         my $ff = FFmpeg::Command->new($self->conf->{command});
-        $ff->input_options({ file => encode($encoding, $enclosure->local_path) });
+        $ff->input_options({ file =>  $self->convert($enclosure->local_path) });
 
         my $output_file = File::Spec->catfile($self->conf->{dir}, "$file");
         my $output_options = {
-            file    => encode($encoding, $output_file),
+            file    => $self->convert($output_file),
             device  => $self->conf->{device} || 'ipod',
-            title   => encode($encoding, $entry->title),
-            author  => encode($encoding, $entry->author),
-            comment => encode($encoding, $entry->summary),
+            title   => $self->convert($entry->title),
+            author  => $self->convert($entry->author),
+            comment => $self->convert($entry->summary),
             %{ $self->conf->{options} || {} },
         };
@@ -90 +88 @@
         $enclosure->type( Plagger::Util::mime_type_of($file) );
     }
+}
+
+
+sub convert {
+  my ($self, $str) = @_;
+  utf8::decode($str) unless utf8::is_utf8($str);
+  return encode($self->conf->{encoding} || 'cp932', $str);
 }