vtt2ass 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41589b113a0b7b9e79ca957027d7ffdcadc4878a3a58c6ac679de1fb381cb020
-  data.tar.gz: 99f4dc6156626c91fce3c9fa2c8a995022eb420593bc0c59fe85a34999cf89c8
+  metadata.gz: 64688a982ce477a836bb7ccb206dc6b8055dc9eb264e2062114787a6cbc9b0e4
+  data.tar.gz: 8bca338d3f218d453c316a2676a68960a72fa3c5bd2ae6794d373cbb57412955
 SHA512:
-  metadata.gz: 2f28df173df92ac71c61565e8f5dcc3c1eda7caf54ef9a8aa1f7a8333bfc8d96e27af5850d5a4356f99c7d5d5c41db373a334c201a085515d2f1d3b71b409b3c
-  data.tar.gz: 2f5390f9f5bf8ae5d74a7ef0564f57ce3b93fe830cd282eaf3f4cc26211a5258b5475854b8e01975e9edf4f9b7cb8b97b3784b928de9ae1ca5d3e761a27e0685
+  metadata.gz: ca013fd08b2e2317b2be56ae94e71bb63e87dd5909c2662d9e880c22c00dab3903b0a56d01b5b8b737599a5368a4f7387bc2165a844fefd244e17e1ac2291749
+  data.tar.gz: 94e3a884c060141fea32a0fdfad566d745b0d7966dfe508992c8f14709ea869a2f6cc7ff11012a7132fdc5c12368bfd092534f4cf9f8383ef5eefba0f9efb595

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'htmlentities', '~> 4.3'
+gem 'tty-option', '~> 0.1'
+
 gem 'yard', '~> 0.9'
 gem 'rake', '~> 12.0'
 gem 'minitest', '~> 5.0'

data/lib/vtt2ass.rb

@@ -1,45 +1,109 @@
 # Imports
-require 'optparse'
+require 'tty-option'
 
 # 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."
+    end
+
+    option :font_size do
+        optional
+        short "-s INTEGER"
+        long "--font-size INTEGER"
+        desc "Specify a font size for the subtitles (default: 52)"
+    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')"
+    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
-    ##
-    # This function creates a new application instance and starts the process.
-    #
-    # It also defines the arguments that can be provided from the CLI.
     def main
-        options = {}
-
-        OptionParser.new do |opts|
-            opts.banner = "Usage: vtt2ass [options]"
-            opts.separator ""
-            opts.separator "Specific options:"
-            opts.on("-i", "--input PATH", "Specify a custom input file or directory (default: './')") do |file_path|
-                options[:input] = file_path
-            end
-            opts.on("-o", "--output PATH", "Specify a custom output directory (default: './')") do |file_path|
-                options[:output] = file_path
-            end
-            opts.on("-f", "--font-family FONT", String, "Specify a font family for the subtitles (default: 'Open Sans Semibold')") do |font_family|
-                options[:font_family] = font_family
-            end
-            opts.on("-s", "--font-size SIZE", Integer, "Specify a font size for the subtitles (default: 52)") do |font_size|
-                options[:font_size] = font_size
-            end
-            opts.on("-t", "--title TITLE", String, "Specify a title for you file. If the input is a directory, all files will share the same title.") do |title|
-                options[:title] = title
-            end
-            opts.on("-v", "--version", "Show version") do
-                puts Vtt2ass::VERSION
-                exit
-            end
-        end.parse!
-
-        app = Application.new(options)
-        app.start
+        app = Command.new
+        app.parse
+        app.run
     end
 
     module_function :main

data/lib/vtt2ass/Application.rb

@@ -19,6 +19,8 @@ class Application
         if options[:title] then
             @title = options[:title]
         end
+        @quiet = options[:quiet]
+        @noout = options[:noout]
     end
 
     ##
@@ -28,15 +30,21 @@ class Application
     def start
         if File.directory?(@input) then
             Dir["#{@input}/*.vtt"].each do |file_path|
-                vtt_to_ass(file_path).writeToFile(@output + '/' + File.basename(file_path).gsub('.vtt', '.ass'))
+                convert(file_path)
             end
         elsif File.file?(@input) then
-            vtt_to_ass(@input).writeToFile(@output + '/' + File.basename(@input).gsub('.vtt', '.ass'))
+            convert(@input)
         else
             puts 'Error: input file or directory does not exist.'
         end
     end
 
+    def convert(input_path)
+        ass_file = vtt_to_ass(input_path)
+        ass_file.writeToFile(@output + '/' + File.basename(input_path).gsub('.vtt', '.ass')) unless @noout
+        puts ass_file.to_s unless @quiet
+    end
+
     ##
     # This method creates a new VTTFile object from the file path provided and convert its content
     # inside a new ASSFile object.

data/lib/vtt2ass/VTTLine.rb

@@ -31,6 +31,8 @@ class VTTLine
             end
             count += 1;
         end
+
+        @text = @text.lstrip
     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.12"
+  VERSION = "0.2.13"
 end

data/vtt2ass.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'htmlentities', '~> 4.3'
+  spec.add_dependency 'tty-option', '~> 0.1'
 
   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.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: tty-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement