vtt2ass 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e94988be1922e26d861f105404e3eff863a2df470aa3aa7fc5f35cdf26c3c71
-  data.tar.gz: 055641cfd88eef119e3c623adbae16b9eb70a7091c26b13410d8b94c2c8e55ec
+  metadata.gz: d3959903aff7b00e3544a9656edf9a17f9508445db041d28518549926cca7a09
+  data.tar.gz: 51359298d3ff0ed985ce10f48b18c5f2b84eec19b267e0781cd2b6ef12320e22
 SHA512:
-  metadata.gz: 785df255fc71e0479a8b124222e25033e2aca337765cdd17bf46c6ef0e11adae7fb854b01fa23959946f8d9ebd8bbfefcaf6cafc10b9a7089a52b11806f5e82a
-  data.tar.gz: 9cd4940b1d5667136aa51d9bff670a2d98e4a966ee898110230c15d710c87898aaf596afd6a6c7173f0ef06cf26eb57e7f2b3acd1c670f95209d97be9c5d5480
+  metadata.gz: ae929a40df7f483e8bd76cc43920177d299756cfe9774fc850f0e7a66b877d74c40314d2d8647cabf6ba5b2c7e0743533ce9236873d28c86203a76c74c9628d8
+  data.tar.gz: 1a280a2a76c87e2678c6275b65c1226779799e61abd8b2909816897e5e44b18a649d0c0f364ae97249044593656120e823edf80f06836703963840321449d088

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,7 +21,7 @@ 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
@@ -54,12 +54,21 @@ 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, @line_offset)
         return ass_file

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.

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'
 
 ##

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/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.2"
+  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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtt2ass
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  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: