vtt2ass 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 725876fe775e13997b8bfea4f1f8d1bd87fe18420c4adfabebc7aa6eced12464
-  data.tar.gz: 13ebdd5f0542f75a9a886e028afb3f93621e68c6b61304d8976320d804d447f8
+  metadata.gz: d3959903aff7b00e3544a9656edf9a17f9508445db041d28518549926cca7a09
+  data.tar.gz: 51359298d3ff0ed985ce10f48b18c5f2b84eec19b267e0781cd2b6ef12320e22
 SHA512:
-  metadata.gz: 1656502fd7ff8f0b180a8826d593d763e855641e780b70f3e9f320a05c385c5ebfca97b5f037f87bacadabbbe86c35f9718fb6e9a5dd828bd3d9c7b2ede3ac37
-  data.tar.gz: a6099e227e52f45783a9462b3041b272bbe01ff76c87f10c44508df3711a61559865dd180f06ea38c02b2db245a6a9ed48732626e8ef4dd95b664d1f3177ac8f
+  metadata.gz: ae929a40df7f483e8bd76cc43920177d299756cfe9774fc850f0e7a66b877d74c40314d2d8647cabf6ba5b2c7e0743533ce9236873d28c86203a76c74c9628d8
+  data.tar.gz: 1a280a2a76c87e2678c6275b65c1226779799e61abd8b2909816897e5e44b18a649d0c0f364ae97249044593656120e823edf80f06836703963840321449d088

data/README.md

@@ -43,6 +43,8 @@ Options:
   -f, [--font-family=FONT_FAMILY]  # Specify a font family for the subtitles
                                    # Default: Open Sans Semibold
   -c, [--css=CSS]                  # Specify a CSS file path for Hidive subs
+  -l, [--line-offset=N]            # Specify a line offset for the main dialog (e.g. 50 lowers the text line by 50px of the total height)
+                                   # Default: 0
   -q, [--quiet], [--no-quiet]      # Don't output to the console
 
 Run the VTT to ASS conversion for the specified file(s)

data/lib/vtt2ass/{Application.rb → application.rb}

@@ -1,6 +1,6 @@
 # Relative imports
-require_relative 'VTTFile'
-require_relative 'ASSFile'
+require_relative 'vtt_file'
+require_relative 'ass_file'
 
 ##
 # Main application class that manages all the operations.
@@ -21,8 +21,9 @@ class Application
         end
         @quiet = options[:quiet]
         if options[:css] then
-            @css = options[:css].gsub('\\', '/')
+            @css = options[:css].gsub('\\', '/').delete_suffix('/')
         end
+        @line_offset = options[:line_offset]
     end
 
     ##
@@ -53,14 +54,23 @@ class Application
     # This method creates a new VTTFile object from the file path provided and convert its content
     # inside a new ASSFile object.
     def vtt_to_ass(file_path)
+        base_file_name = File.basename(file_path).gsub('.vtt', '')
+        css_file = nil
+        if defined?(@css) and File.directory?(@css) then
+            css_file = "#{@css}/#{base_file_name}.css"
+        elsif File.file?("#{file_path.gsub('.vtt', '')}.css") then
+            css_file = "#{file_path.gsub('.vtt', '')}.css"
+        else
+            css_file = @css
+        end
         vtt_file = VTTFile.new(file_path, @width, @height)
         ass_file = ASSFile.new(
-            (defined?(@title) ? @title : File.basename(file_path).gsub('.vtt', '')),
+            (defined?(@title) ? @title : base_file_name),
             @width,
             @height,
-            defined?(@css) ? @css : nil
+            css_file
         )
-        ass_file.convertVTTtoASS(vtt_file, @font_family, @font_size)
+        ass_file.convertVTTtoASS(vtt_file, @font_family, @font_size, @line_offset)
         return ass_file
     end
 

data/lib/vtt2ass/{ASSFile.rb → ass_file.rb}

@@ -1,8 +1,8 @@
 # Relative imports
-require_relative 'ASSLine'
-require_relative 'ASSStyle'
-require_relative 'CSSFile'
-require_relative 'CSSRule'
+require_relative 'ass_line'
+require_relative 'ass_style'
+require_relative 'css_file'
+require_relative 'css_rule'
 
 ##
 # This class defines an ASS subtitle file.
@@ -45,10 +45,12 @@ 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 convertVTTtoASS(vtt_file, font_family, font_size)
+    def convertVTTtoASS(vtt_file, font_family, font_size, line_offset = 0)
         fs = font_size
-        font_color = '&H00FFFFFF'
         vtt_file.lines.each do |line|
+            font_color = '&H00FFFFFF'
+            is_italic = false
+            is_bold = false
             @ass_lines.push(ASSLine.new(line.style, line.time_start, line.time_end, line.text))
             style_exists = false
             @ass_styles.each do |style|
@@ -74,11 +76,19 @@ class ASSFile
                                 font_size = (fs * em_size).to_i
                             when 'color'
                                 font_color = ASSStyle.convert_color(property[:value])
+                            when 'font-weight'
+                                if property[:value].eql? 'bold' then
+                                    is_bold = true
+                                end
+                            when 'font-style'
+                                if property[:value].eql? 'italic' then
+                                    is_italic = true
+                                end
                             end
                         end
                     end
                 end
-                @ass_styles.push(ASSStyle.new(line.style, line.params, font_family, font_size, font_color, @width, @height))
+                @ass_styles.push(ASSStyle.new(line.style, line.params, font_family, font_size, font_color, is_bold, is_italic, line_offset, @width, @height))
             end
         end
     end

data/lib/vtt2ass/{ASSStyle.rb → ass_style.rb}

@@ -1,6 +1,6 @@
 # Relative imports
-require_relative 'ASSStyleParams'
-require_relative 'Validator'
+require_relative 'ass_style_params'
+require_relative 'validator'
 require 'redgreenblue'
 
 ##
@@ -15,7 +15,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, width, height)
+    def initialize(style_name, params, font_family, font_size, font_color, is_bold, is_italic, line_offset, width, height)
         @width = width
         @height = height
         @font_family = font_family
@@ -26,12 +26,18 @@ class ASSStyle
         if style_name.eql? 'MainTop' then
             @s_params.vertical_margin = 50
         end
+        if style_name.include? 'Subtitle' then
+            @s_params.vertical_margin -= line_offset
+        end
+        @is_italic = is_italic
+        @is_bold = is_bold
     end
 
     ##
     # This method assigns the object values to an ASS style line and outputs it.
     def to_s
-        return "Style: #{@style_name},#{@font_family},#{@font_size},#{@font_color},&H000000FF,&H00020713,&H00000000,-1,0,0,0,100,100,0,0,1,2.0,2.0,#{@s_params.alignment},#{@s_params.horizontal_margin},0,#{@s_params.vertical_margin},1"
+        # Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+        return "Style: #{@style_name},#{@font_family},#{@font_size},#{@font_color},&H000000FF,&H00020713,&H00000000,#{@is_bold ? '-1' : '0'},#{@is_italic ? '-1' : '0'},0,0,100,100,0,0,1,2.0,2.0,#{@s_params.alignment},#{@s_params.horizontal_margin},0,#{@s_params.vertical_margin},1"
     end
 
     def self.convert_color(color_value)

data/lib/vtt2ass/{CSSFile.rb → css_file.rb}

@@ -1,5 +1,5 @@
 require 'css_parser'
-require_relative 'CSSRule'
+require_relative 'css_rule'
 
 class CSSFile
     attr_reader :rules

data/lib/vtt2ass/{CSSRule.rb → css_rule.rb}

@@ -3,8 +3,8 @@ class CSSRule
 
     def initialize(selector, declarations)
         @name = reduce_selector(selector)
+        @properties = []
         declarations.split(/;\s?/).each do |dec|
-            @properties = []
             temp = dec.split(/:\s?/)
             @properties.push(
                 { key: temp.first, value: temp.last}

data/lib/vtt2ass/version.rb

@@ -4,5 +4,5 @@ module Vtt2ass
   ##
   # This is the version of the application.
   # This needs to be changed for each gem release.
-  VERSION = "0.3.0"
+  VERSION = "0.3.3"
 end

data/lib/vtt2ass/{VTTFile.rb → vtt_file.rb}

@@ -1,5 +1,5 @@
 # Relative imports
-require_relative 'VTTLine'
+require_relative 'vtt_line'
 
 ##
 # This class defines a VTT subtile file.

data/lib/vtt2ass.rb

@@ -3,7 +3,7 @@ require 'thor'
 
 # Relative imports
 require_relative 'vtt2ass/version'
-require_relative 'vtt2ass/Application'
+require_relative 'vtt2ass/application'
 
 class MainCommand < Thor
     def self.exit_on_failure?
@@ -16,6 +16,7 @@ class MainCommand < Thor
     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 :quiet,       :aliases => '-q', :desc => 'Don\'t output to the console', :type => :boolean
     def convert(input)
         app = Application.new(input, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtt2ass
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -153,17 +153,17 @@ files:
 - doc/top-level-namespace.html
 - exe/vtt2ass
 - lib/vtt2ass.rb
-- lib/vtt2ass/ASSFile.rb
-- lib/vtt2ass/ASSLine.rb
-- lib/vtt2ass/ASSStyle.rb
-- lib/vtt2ass/ASSStyleParams.rb
-- lib/vtt2ass/Application.rb
-- lib/vtt2ass/CSSFile.rb
-- lib/vtt2ass/CSSRule.rb
-- lib/vtt2ass/VTTFile.rb
-- lib/vtt2ass/VTTLine.rb
-- lib/vtt2ass/Validator.rb
+- lib/vtt2ass/application.rb
+- lib/vtt2ass/ass_file.rb
+- lib/vtt2ass/ass_line.rb
+- lib/vtt2ass/ass_style.rb
+- lib/vtt2ass/ass_style_params.rb
+- lib/vtt2ass/css_file.rb
+- lib/vtt2ass/css_rule.rb
+- lib/vtt2ass/validator.rb
 - lib/vtt2ass/version.rb
+- lib/vtt2ass/vtt_file.rb
+- lib/vtt2ass/vtt_line.rb
 - vtt2ass.gemspec
 homepage: https://gitlab.com/dkb-weeblets/vtt2ass
 licenses: