vtt2ass 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3047227acbd6bf731e5dc95113a7d70081bed94392e3b00078b760ebbc4440a4
-  data.tar.gz: e9bc514e5b41028d872d9e983cc4dbd4442fc648ab1065e2c3e5a2aca3c9b8fd
+  metadata.gz: bacdcc421becff18a39326c953658fb28c07eb06bd5a4dacc951098e661a9601
+  data.tar.gz: ef37756d00cdfa88d23a778fd2ad0718e1129e74e412aa77a5ceebfd0daeb5f7
 SHA512:
-  metadata.gz: 388af342ebe22e69e52e92e4dadf5a04ea48cb6e491398e864ed1e9d5ae3a602601cddc070ae20f7e8edef0b652a87aa3e8a66f8b8128626315dbac0dd421873
-  data.tar.gz: fa2f3b0fa33c3ee1ade343b14837e8f09d2b5145f41e60f68e1cc7236e17e23c67cb7a811f5abf145df7e7121fd651364870073b6ff74679f6c9ddfe375a2ddc
+  metadata.gz: 74ffa9400ecd804d00fe2a5649cb9a7e5b0ebb14b2cb7fd1fe4744517b047c4af4e05edf5e0f9ad1b8d34e47ece1d4c8f8e74c749b78f88a193258853fffceb9
+  data.tar.gz: e861fe563ab6ef59085062bd1e2269ca56f20eb939df05eaead50ff78fb754c8339fdb4291c3cf9f357fdd5712df7a2fcbacdf8d4bce2a2773e11c51694d37ce

data/.gitignore

@@ -1,3 +1,6 @@
+# RubyMine
+.idea/
+
 # Lock file
 Gemfile.lock
 

data/lib/vtt2ass/application.rb

@@ -39,12 +39,14 @@ class Application
     puts 'ERROR: The application stopped unexpectedly. The conversion may not have been completed.'
   rescue StandardError => e
     puts e.message
+    puts e.backtrace
   end
 
   ##
   # This method launches the conversion process on the specified input file.
   def convert(input_path)
     output = sanitize_path(@options[:output])
+    output = '.' if output.nil?
     raise StandardError, 'ERROR: Output directory does not exist.' unless File.directory?(output)
 
     ass_file = vtt_to_ass(input_path)
@@ -72,7 +74,8 @@ class Application
       @options[:height],
       css_file
     )
-    ass_file.convert_vtt_to_ass(vtt_file, @options[:font_family], @options[:font_size], @options[:line_offset])
+    ass_file.convert_vtt_to_ass(vtt_file, @options[:font_family], @options[:font_size],
+                                { line: @options[:line_offset], caption: @options[:caption_offset] })
     ass_file
   end
 end

data/lib/vtt2ass/ass_file.rb

@@ -16,6 +16,7 @@ class ASSFile
   def initialize(title, width, height, css_file_path = nil)
     @width = width
     @height = height
+    @css_file = nil
     @css_file = CSSFile.new(css_file_path) unless css_file_path.nil?
     @header = <<~HEADER
       [Script Info]
@@ -44,7 +45,7 @@ class ASSFile
   # This method receives a VTTFile object and font arguments creates new ASSLine with the params of
   # each VTTLine. All those ASSLine are stored in an array. It also creates an array of ASSStyle that
   # will be used in the ASS style list.
-  def convert_vtt_to_ass(vtt_file, font_family, font_size, line_offset = 0) # rubocop:disable Metrics/MethodLength
+  def convert_vtt_to_ass(vtt_file, font_family, font_size, offset = { line: 0, caption: 0 }) # rubocop:disable Metrics/MethodLength
     fs = font_size
     vtt_file.lines.each do |line| # rubocop:disable Metrics/BlockLength
       font_color = '&H00FFFFFF'
@@ -83,7 +84,7 @@ class ASSFile
         ASSStyle.new(
           line.style, line.params,
           font_family, font_size, font_color, is_bold, is_italic,
-          line_offset, @width, @height
+          offset, @width, @height
         )
       )
     end

data/lib/vtt2ass/ass_style.rb

@@ -16,7 +16,7 @@ class ASSStyle
   # * Requires +params+, a string of VTT styling as input.
   # * Requires a video +width+ as input.
   # * Requires a video +height+ as input.
-  def initialize(style_name, params, font_family, font_size, font_color, is_bold, is_italic, line_offset, width, height)
+  def initialize(style_name, params, font_family, font_size, font_color, is_bold, is_italic, offset, width, height)
     @width = width
     @height = height
     @font_family = font_family
@@ -25,7 +25,8 @@ class ASSStyle
     @style_name = style_name
     @s_params = ASSStyleParams.new(params, width, height)
     @s_params.vertical_margin = 50 if style_name.eql? 'MainTop'
-    @s_params.vertical_margin -= line_offset if style_name.include? 'Subtitle'
+    @s_params.vertical_margin -= offset[:line] if style_name.include?('Subtitle') || style_name.eql?('Main')
+    @s_params.vertical_margin += offset[:caption] if style_name.include?('Caption') || style_name.eql?('MainTop')
     @is_italic = is_italic
     @is_bold = is_bold
   end

data/lib/vtt2ass/ass_style_params.rb

@@ -10,6 +10,7 @@ class ASSStyleParams
   # It takes VTT style arguments and assign them to their respectful instance variable.
   # It calls methods to create ASS values from the VTT cue settings.
   def initialize(params, width, height)
+    @align = nil
     split_params(params)
     create_alignment
     create_horizontal_margin(width)

data/lib/vtt2ass/version.rb

@@ -6,5 +6,5 @@ module Vtt2ass
   ##
   # This is the version of the application.
   # This needs to be changed for each gem release.
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/lib/vtt2ass.rb

@@ -13,41 +13,56 @@ class MainCommand < Thor
   end
 
   desc 'convert INPUT', 'Run the VTT to ASS conversion for the specified file(s)'
-  method_option :output,      aliases: '-o',
-                              desc: 'Output directory of the converted file',
-                              lazy_default: './',
-                              type: :string
-  method_option :title,       aliases: '-t',
-                              desc: 'Specify a title for you file. If the input is a directory, '\
-                                    'all files will share the same title.',
-                              type: :string
-  method_option :font_size,   aliases: '-s',
-                              desc: 'Specify a font size for the subtitles',
-                              default: 52,
-                              type: :numeric
-  method_option :font_family, aliases: '-f',
-                              desc: 'Specify a font family for the subtitles',
-                              default: 'Open Sans Semibold',
-                              type: :string
-  method_option :css,         aliases: '-c',
-                              desc: 'Specify a CSS file path for Hidive subs',
-                              type: :string
-  method_option :line_offset, aliases: '-l',
-                              desc: 'Specify a line offset for the main dialog (e.g. 50 lowers the '\
-                                    'text line by 50px of the total height)',
-                              default: 0,
-                              type: :numeric
-  method_option :width,       aliases: '-w',
-                              desc: 'Specify the video width',
-                              default: 1920,
-                              type: :numeric
-  method_option :height,      aliases: '-h',
-                              desc: 'Specify the video height',
-                              default: 1080,
-                              type: :numeric
-  method_option :quiet,       aliases: '-q',
-                              desc: 'Don\'t output to the console',
-                              type: :boolean
+  method_option :output,
+                aliases: '-o',
+                desc: 'Output directory of the converted file',
+                lazy_default: './',
+                type: :string
+  method_option :title,
+                aliases: '-t',
+                desc: 'Specify a title for you file. If the input is a directory, '\
+                      'all files will share the same title.',
+                type: :string
+  method_option :font_size,
+                aliases: '-s',
+                desc: 'Specify a font size for the subtitles',
+                default: 52,
+                type: :numeric
+  method_option :font_family,
+                aliases: '-f',
+                desc: 'Specify a font family for the subtitles',
+                default: 'Open Sans Semibold',
+                type: :string
+  method_option :css,
+                aliases: '-c',
+                desc: 'Specify a CSS file path for Hidive subs',
+                type: :string
+  method_option :line_offset,
+                aliases: '-l',
+                desc: 'Specify a line offset for the main dialog (e.g. 50 lowers the '\
+                      'text line by 50px of the total height)',
+                default: 0,
+                type: :numeric
+  method_option :caption_offset,
+                aliases: '-z',
+                desc: 'Specify a line offset for the captions (e.g. 50 lowers the '\
+                      'text line by 50px of the total height)',
+                default: 0,
+                type: :numeric
+  method_option :width,
+                aliases: '-w',
+                desc: 'Specify the video width',
+                default: 1920,
+                type: :numeric
+  method_option :height,
+                aliases: '-h',
+                desc: 'Specify the video height',
+                default: 1080,
+                type: :numeric
+  method_option :quiet,
+                aliases: '-q',
+                desc: 'Don\'t output to the console',
+                type: :boolean
   def convert(input)
     app = Application.new(input, options)
     app.start

data/vtt2ass.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rubocop', '~> 1.38'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtt2ass
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2022-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement