- Extended fat32safe to convert Unicode characters to ASCII equival…

…ent when `Text::Unidecode` is available.
trizen · May 6, 2023 · 3324f40 · 3324f40
1 parent 2e50448
commit 3324f40
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/Build.PL b/Build.PL
@@ -19,18 +19,18 @@ my $builder = Module::Build->new(
                        'Test::More' => 0,
                       },
 
-    extra_manify_args => { utf8 => 1 },
+    extra_manify_args => {utf8 => 1},
 
     configure_requires => {
                            'Module::Build' => 0,
                           },
 
     get_options => {
-        'gtk3' => {
-                  type  => '!',
-                  store => \$gtk3,
-                 },
-    },
+                    'gtk3' => {
+                               type  => '!',
+                               store => \$gtk3,
+                              },
+                   },
 
     requires => {
         'perl'                  => 5.016,
@@ -64,21 +64,18 @@ my $builder = Module::Build->new(
     },
 
     recommends => {
-                   'LWP::UserAgent::Cached'  => 0,    # cache support
-                   'Term::ReadLine::Gnu'     => 0,    # for better STDIN support (+history)
-                   'JSON::XS'                => 0,    # faster JSON to HASH conversion
-                   'Unicode::GCString'       => 0,    # fixed-width format
+        'LWP::UserAgent::Cached' => 0,    # cache support
+        'Term::ReadLine::Gnu'    => 0,    # for better STDIN support (+history)
+        'JSON::XS'               => 0,    # faster JSON to HASH conversion
+        'Unicode::GCString'      => 0,    # fixed-width format
+        'Text::Unidecode'        => 0,    # for the `fat32safe` option
                   },
 
     add_to_cleanup     => ['WWW-YoutubeViewer-*'],
     create_makefile_pl => 'traditional',
 );
 
-$builder->script_files(
-                       ['bin/youtube-viewer',
-                        ($gtk3 ? ('bin/gtk-youtube-viewer') : ()),
-                       ]
-                      );
+$builder->script_files(['bin/youtube-viewer', ($gtk3 ? ('bin/gtk-youtube-viewer') : ())]);
 
 $builder->share_dir('share') if $gtk3;
 $builder->create_build_script();
diff --git a/bin/youtube-viewer b/bin/youtube-viewer
@@ -892,7 +892,7 @@ usage: $execname [options] ([url] | [keywords])
        --copy-caption!   : copy and rename the caption for downloaded videos
        --downloads-dir=s : downloads directory (set: '$opt{downloads_dir}')
        --filename=s      : set a custom format for the video filename (see: -T)
-       --fat32safe!      : makes filenames FAT32 safe (includes Unicode)
+       --fat32safe!      : makes filenames FAT32 safe
        --mkv-merge!      : merge audio and video into an MKV container
        --merge-captions! : include closed-captions in the MKV container
 
@@ -5451,6 +5451,8 @@ Load proxy settings from C<*_proxy> environment variables (if any).
 
 When downloading a video, make the filename compatible with the FAT32 filesystem.
 
+Additionally, if L<Text::Unidecode> is available, then Unicode characters are converted to ASCII equivalents.
+
 =head2 ffmpeg_cmd
 
 Path to the C<ffmpeg> program.

diff --git a/lib/WWW/YoutubeViewer/Utils.pm b/lib/WWW/YoutubeViewer/Utils.pm
@@ -281,6 +281,13 @@ sub normalize_filename {
     }
 
     if ($fat32safe) {
+
+        state $has_unidecode = eval { require Text::Unidecode; 1 };
+
+        if ($has_unidecode) {
+            $title = Text::Unidecode::unidecode($title);
+        }
+
         $title =~ s/: / - /g;
         $title =~ tr{:"*/?\\|}{;'+%!%%};    # "
         $title =~ tr/<>//d;