Fix a few strings and configurations, and add a fl_restoreDump script

1 files changed, 10 insertions, 1 deletions

diff --git a/roles/tools/templates/youtube-viewer.conf.j2 b/roles/tools/templates/youtube-viewer.conf.j2
index 3107584..b12a0a1 100644
--- a/roles/tools/templates/youtube-viewer.conf.j2
+++ b/roles/tools/templates/youtube-viewer.conf.j2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Youtube Viewer 3.3.4 - configuration file
+# Youtube Viewer 3.5.1 - configuration file
 
 our $CONFIG = {
   auto_captions           => 0,
@@ -10,10 +10,13 @@ our $CONFIG = {
   clobber                 => 0,
   colors                  => 1,
   combine_multiple_videos => 0,
+  comments_order          => "time",
   confirm                 => 0,
   convert_cmd             => "ffmpeg -i *IN* *OUT*",
   convert_to              => undef,
   copy_caption            => 0,
+  custom_layout           => 0,
+  custom_layout_format    => "*NO*. *TITLE* (*AUTHOR*) (*RATING*) [*TIME*]\\n",
   dash_mp4_audio          => 1,
   dash_support            => 1,
   debug                   => 0,
@@ -23,6 +26,7 @@ our $CONFIG = {
   downloads_dir           => ".",
   env_proxy               => 1,
   fat32safe               => 0,
+  ffmpeg_cmd              => "/usr/bin/ffmpeg",
   fullscreen              => 0,
   get_captions            => 1,
   get_term_width          => 1,
@@ -36,8 +40,12 @@ our $CONFIG = {
   interactive             => 1,
   keep_original_video     => 0,
   maxResults              => 20,
+  merge_into_mkv          => 1,
+  merge_into_mkv_args     => "-loglevel warning -c:s srt -c:v copy -c:a copy -disposition:s forced",
+  merge_with_captions     => 1,
   order                   => undef,
   page                    => 1,
+  prefer_mp4              => 0,
   publishedAfter          => undef,
   publishedBefore         => undef,
   regionCode              => undef,
@@ -85,5 +93,6 @@ our $CONFIG = {
   videoDuration           => undef,
   videoLicense            => undef,
   videoSyndicated         => undef,
+  wget_cmd                => "wget",
   youtube_video_url       => "https://www.youtube.com/watch?v=%s",
 }