vtt2ass 0.2.13 → 0.3.1

data/lib/vtt2ass/CSSRule.rb

@@ -0,0 +1,22 @@
+class CSSRule
+    attr_reader :name, :properties
+
+    def initialize(selector, declarations)
+        @name = reduce_selector(selector)
+        @properties = []
+        declarations.split(/;\s?/).each do |dec|
+            temp = dec.split(/:\s?/)
+            @properties.push(
+                { key: temp.first, value: temp.last}
+            )
+        end
+    end
+
+    def to_s
+        return "#{@name} #{@properties}"
+    end
+
+    def reduce_selector(selector)
+        return selector.to_s.gsub(/\.rmp-container>\.rmp-content>\.rmp-cc-area>\.rmp-cc-container>\.rmp-cc-display>\.rmp-cc-cue\s?\.?/, '')
+    end
+end

data/lib/vtt2ass/VTTFile.rb

@@ -13,10 +13,18 @@ class VTTFile
         @lines = []
         separator = determine_line_ending(file_path) ? "\n\n" : "\r\n\r\n"
         count = 0
+        style_count = 1
         File.foreach(file_path, separator) do |paragraph|
             paragraph = paragraph.rstrip.gsub(/[\r\n]/, "\n")
             if not paragraph.eql? "" then
                 vtt_line = VTTLine.new(paragraph, width, height)
+                if vtt_line.style.eql? 'Main' and
+                    not vtt_line.params.to_s.empty? and
+                    (not vtt_line.params.to_s.eql? 'align:middle' and
+                    not vtt_line.params.to_s.eql? 'align:center') then
+                    vtt_line.style = "Style#{style_count}"
+                    style_count += 1
+                end
                 @lines.push(vtt_line)
                 count += 1
             end
@@ -24,6 +32,8 @@ class VTTFile
         @lines.shift
     end
 
+    ##
+    # This method determines the line ending character to use as a separator.
     def determine_line_ending(file_path)
         File.open(file_path, 'r') do |file|
             return file.readline[/\r?\n$/] == "\n"

data/lib/vtt2ass/VTTLine.rb

@@ -1,7 +1,8 @@
 ##
 # This class defines a VTT subtile line.
 class VTTLine
-    attr_reader :style, :time_start, :time_end, :params, :text
+    attr_accessor :style
+    attr_reader :time_start, :time_end, :params, :text
 
     ##
     # This method creates an instance of an VTTLine.
@@ -24,7 +25,7 @@ class VTTLine
                 @params = m[3]
                 ass_style = ASSStyleParams.new(@params, width, height)
                 if @style.eql? 'Main' and ass_style.alignment == 8 then
-                    @style = "MainTop"
+                    @style = 'MainTop'
                 end
             else
                 @text += line + "\n"

data/lib/vtt2ass/Validator.rb

@@ -0,0 +1,10 @@
+class Validator
+    def self.hex?(value)
+        hex = true
+        value.gsub!('#', '')
+        value.chars.each do |digit|
+          hex = false unless digit.match(/\h/)
+        end
+        return hex
+    end
+end

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.2.13"
+  VERSION = "0.3.1"
 end

data/lib/vtt2ass.rb

@@ -1,110 +1,29 @@
 # Imports
-require 'tty-option'
+require 'thor'
 
 # Relative imports
 require_relative 'vtt2ass/version'
 require_relative 'vtt2ass/Application'
 
-class Command
-    include TTY::Option
-
-    usage do
-        header 'VTT2ASS'
-        program 'vtt2ass'
-        command ''
-        desc 'Convert VTT subtitles to ASS subtitles'
-        example "Convert files in a specific directory",
-                "  $ vtt2ass ./path/to/file_input ./path/to/file_output"
-    end
-
-    # ------------------------------
-    # Arguments
-    # ------------------------------
-
-    argument :input do
-        optional
-        desc "Input directory or file (default: current directory)"
-    end
-
-    argument :output do
-        optional
-        desc "Output directory (default: console output)"
-    end
-
-    # ------------------------------
-    # Flags
-    # ------------------------------
-
-    flag :help do
-        short "-h"
-        long "--help"
-        desc "Print usage"
-    end
-
-    flag :version do
-        short "-v"
-        long "--version"
-        desc "Show version"
-    end
-
-    flag :quiet do
-        short "-q"
-        long "--quiet"
-        desc "Prevent the command from outputing to the console"
-    end
-
-    flag :noout do
-        short "-x"
-        long "--noout"
-        desc "Prevents the command from writing the resulting file(s) to the output folder"
-    end
-
-    # ------------------------------
-    # Options
-    # ------------------------------
-
-    option :title do
-        optional
-        short "-t STRING"
-        long "--title STRING"
-        desc "Specify a title for you file. If the input is a directory, all files will share the same title."
+class MainCommand < Thor
+    def self.exit_on_failure?
+        true
     end
 
-    option :font_size do
-        optional
-        short "-s INTEGER"
-        long "--font-size INTEGER"
-        desc "Specify a font size for the subtitles (default: 52)"
+    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 :quiet,       :aliases => '-q', :desc => 'Don\'t output to the console', :type => :boolean
+    def convert(input)
+        app = Application.new(input, options)
+        app.start
     end
 
-    option :font_family do
-        optional
-        short "-f STRING"
-        long "--font-family STRING"
-        desc "Specify a font family for the subtitles (default: 'Open Sans Semibold')"
+    desc 'version', 'Show version'
+    def version
+        puts Vtt2ass::VERSION
     end
-
-    def run
-        if params[:help] then
-            print help
-            exit
-        elsif params[:version] then
-            puts Vtt2ass::VERSION
-            exit
-        else
-            runner = Application.new(params)
-            # pp params.to_h
-            runner.start
-        end
-    end
-end
-
-module Vtt2ass
-    def main
-        app = Command.new
-        app.parse
-        app.run
-    end
-
-    module_function :main
 end

data/vtt2ass.gemspec

@@ -26,7 +26,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'htmlentities', '~> 4.3'
-  spec.add_dependency 'tty-option', '~> 0.1'
+  spec.add_dependency 'thor', '~> 1.1'
+  spec.add_dependency 'css_parser', '~> 1.10'
+  spec.add_dependency 'redgreenblue', '~> 0.15'
 
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtt2ass
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.1
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2022-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -25,19 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: tty-option
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: css_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: redgreenblue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +122,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/run
 - bin/setup
+- bin/vtt2ass
 - doc/ASSFile.html
 - doc/ASSLine.html
 - doc/ASSStyle.html
 - doc/ASSStyleParams.html
 - doc/ASSSubtitle.html
 - doc/Application.html
+- doc/Command.html
+- doc/MainCommand.html
 - doc/VTTFile.html
 - doc/VTTLine.html
 - doc/VTTSubtitle.html
@@ -128,8 +158,11 @@ files:
 - 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/version.rb
 - vtt2ass.gemspec
 homepage: https://gitlab.com/dkb-weeblets/vtt2ass