Changeset 254

Show
Ignore:
Timestamp:
08/31/06 13:14:31 (2 years ago)
Author:
miya
Message:

Filter::FFmpeg: Use Plagger::Util::filename_for insted of gen_filename.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • plagger/trunk/lib/Plagger/Plugin/Filter/FFmpeg.pm

    r253 r254  
    4141        my $file; 
    4242        if ($self->conf->{filename}) { 
    43             $file = $self->gen_filename($entry); 
     43            $file = Plagger::Util::filename_for($entry, $self->conf->{filename}); 
    4444        } else { 
    4545            $file = $enclosure->filename; 
     
    7676        $enclosure->type( Plagger::Util::mime_type_of($file) ); 
    7777    } 
    78 } 
    79  
    80 my %formats = ( 
    81     'u' => sub { my $s = $_[0]->url;  $s =~ s!^https?://!!; $s }, 
    82     'l' => sub { my $s = $_[0]->link; $s =~ s!^https?://!!; $s }, 
    83     't' => sub { $_[0]->title }, 
    84     'i' => sub { $_[0]->id }, 
    85 ); 
    86  
    87 my $format_re = qr/%(u|l|t|i)/; 
    88  
    89 sub gen_filename { 
    90     my($self, $feed) = @_; 
    91  
    92     my $file = $self->conf->{filename} || 
    93         '%i.' . ($self->conf->{format} eq 'RSS' ? 'rss' : 'atom'); 
    94     $file =~ s{$format_re}{ 
    95         $self->safe_filename($formats{$1}->($feed)) 
    96     }egx; 
    97     $file; 
    98 } 
    99  
    100 sub safe_filename { 
    101     my($self, $path) = @_; 
    102     $path =~ s![^\w\s]+!_!g; 
    103     $path =~ s!\s+!_!g; 
    104     $path; 
    10578} 
    10679