vtt2ass 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13c0f4e714b058d076bddda1685ba4007429a2c9c0dc065073926bee9dd2dad
-  data.tar.gz: acbfd744b30cd214f174ec4fe991a6983cb206b89a65956115be803cf005b22c
+  metadata.gz: 5b8d61e8c97eae4983b1b8b3011817d8ceaf12381a60c5ba3dfbf51e5c84ffc7
+  data.tar.gz: a2777f056b947249330e7f4b828172eb5e9f90d11939fcfa44c9213a5d2ac86e
 SHA512:
-  metadata.gz: 99c2d00e1d03c7e8ae463266ea500ad0ebf10f0b7eeae972b4d2776887a1a0936f5707633832c26fc6bc66fdd13e0bd53ff73200c2f5ae128517266a29d46a31
-  data.tar.gz: 17d541540f391fe95e5aeea3d0795ee36b5856f1cc6d69de4bcf6ac59b7a647e1cc3509e57b291a80c0a753b058a01d291944e435a9dd917358a99c5f69ed574
+  metadata.gz: e5c15a86a9706ea9a521ee6e719cdeb2d99e7b394df7800bd6862385e20cc8b779e63a0929b6ddf700f742b48cb07a258f01e7eda5256732331be7bc7f879995
+  data.tar.gz: 1b6a6da137d123e0aeca34963d8dcc1aeacc437666f1f277efe12d9747f83edc16add7ab399030017d57901d04bfceed7ac3e0caaecff10c6042577265ef03dc

data/.gitignore

@@ -1,6 +1,9 @@
 # Lock file
 Gemfile.lock
 
+# gems
+/*.gem
+
 # Temporary files for yard documentation
 .yardoc/
 

data/.gitlab-ci.yml

@@ -14,18 +14,16 @@ test:
 build:
   stage: build
   only:
-    - master
+    - develop
   artifacts:
     untracked: true
   script:
-    - mkdir build
-    - gem build vtt2ass.gemspec -o "build/release.gem"
+    - gem build vtt2ass.gemspec
 
 deploy:
   stage: deploy
   only:
     - master
-  dependencies: 
-    - build
   script:
-    - gem push build/release.gem -k rubygems_b54a36e70dba06b9a9c7268807eb2bbb896cdba924c67289
+    - gem install dpl --pre
+    - dpl rubygems --api_key $K8S_SECRET_RUBYGEMS_API_KEY

data/README.md

@@ -38,5 +38,6 @@ Usage: vtt2ass [options]
 Specific options:
     -i, --input DIRECTORY            Specify a custom input directory (default: './input')
     -o, --output DIRECTORY           Specify a custom output directory (default: './output')
-    -s, --font-size SIZE             Specify a font size for the subtitles (default: 72)
+    -s, --font-size SIZE             Specify a font size for the subtitles (default: 52)
+    -v, --version                    Show version
 ```

data/lib/vtt2ass.rb

@@ -23,7 +23,7 @@ module Vtt2ass
             opts.on("-o", "--output DIRECTORY", "Specify a custom output directory (default: './output')") do |dir|
                 options[:output] = dir
             end
-            opts.on("-s", "--font-size SIZE", Integer, "Specify a font size for the subtitles (default: 72)") do |size|
+            opts.on("-s", "--font-size SIZE", Integer, "Specify a font size for the subtitles (default: 52)") do |size|
                 options[:font_size] = size
             end
             opts.on("-v", "--version", "Show version") do

data/lib/vtt2ass/ASSFile.rb

@@ -9,12 +9,12 @@ class ASSFile
     # * Requires +ass_subs+, a list of ASSSubtitles as input.
     # * Requires a video +width+ as input.
     # * Requires a video +height+ as input.
-    def initialize(ass_styles, ass_subs, width, height)
+    def initialize(title, ass_styles, ass_subs, width, height)
         @width = width
         @height = height
         @header = [
             '[Script Info]',
-            'Title: DKB Team',
+            "Title: #{title}",
             'ScriptType: v4.00+',
             'Collisions: Normal',
             'PlayDepth: 0',

data/lib/vtt2ass/ASSStyle.rb

@@ -15,42 +15,68 @@ class ASSStyle
         @height = height
         @font_size = font_size
         @style_name = style_name
-        assignParams(params)
+        @s_params = StyleParams.new(params, width, height)
     end
 
-    ##
-    # This method converts the string of VTT styling in values used for ASS styling.
-    #
-    # * Requires +params+, a string of VTT styling as input.
-    def assignParams(params)
-        @alignment = "2"
-        @left_margin = "10"
-        @right_margin = "10"
-        @vertical_margin = "50"
-
-        if params.include? "align:middle line:7%" then
-            @style_name = "MainTop"
-            @vertical_margin = "30"
-            @alignment = "8"
-        else
-            param_count = 0
+    class StyleParams
+        attr_reader :horizontal_margin, :vertical_margin, :alignment
+        def initialize(params, width, height)
             (params.split(' ').map { |p| p.split(':') }).each do |p|
                 case p[0]
-                when "position"
-                    @left_margin = (@width * ((p[1].gsub(/%/, '').to_f - 7) / 100)).to_i.to_s
-                when "align"
-                    case p[1]
-                    when "left"
-                        @alignment = 1
-                    when "middle"
-                        @alignment = 2
-                    when "right"
-                        @alignment = 3
+                when 'position'
+                    @position = p[1].gsub(/%/, '').to_i
+                when 'line'
+                    @line = p[1].gsub(/%/, '').to_i
+                    @line = @line == -1 ? 100 : @line;
+                when 'alignment'
+                    @align = p[1]
+                end
+            end
+            createAlignment
+            createHorizontalMargin(width)
+            createVerticalMargin(height)
+        end
+        def createAlignment
+            if (defined?(@line) and not defined?(@position)) then
+                if (defined?(@align)) then
+                    case @align
+                    when 'left'
+                    when 'start'
+                        @alignment = @line >= 50 ? 1 : 7
+                    when 'right'
+                    when 'end'
+                        @alignment = @line >= 50 ? 3 : 9
+                    when 'center'
+                    when 'middle'
+                        @alignment = @line >= 50 ? 2 : 8
                     end
-                when "line"
-                    @vertical_margin = (@height - (@height * ((p[1].gsub(/%/, '').to_f + 7) / 100))).to_i.to_s
+                else
+                    @alignment = @line >= 50 ? 2 : 8 # If position is higher than 50% align to bottom center, else align to top center
+                end
+            elsif (defined?(@line) and defined?(@position)) then
+                @alignment = 1
+            else
+                @alignment = 2
+            end
+        end
+        def createHorizontalMargin(width)
+            steps = (width / 100).to_i
+            if defined?(@position) then
+                @horizontal_margin = @position * steps
+            else
+                @horizontal_margin = 0
+            end
+        end
+        def createVerticalMargin(height)
+            steps = (height / 100).to_i
+            if defined?(@line) then
+                if (@alignment == 1) then
+                    @vertical_margin = (100 - @line) * steps
+                else
+                    @vertical_margin = @line >= 50 ? (100 - @line) * steps : @line * steps
                 end
-                param_count += 1
+            else
+                @vertical_margin = 50
             end
         end
     end
@@ -58,6 +84,6 @@ class ASSStyle
     ##
     # This method assigns the object values to an ASS style line and outputs it.
     def to_s
-        return "Style: #{@style_name},Open Sans Semibold,#{@font_size},&H00FFFFFF,&H000000FF,&H00020713,&H00000000,-1,0,0,0,100,100,0,0,1,2.0,2.0,#{@alignment},#{@left_margin},#{@right_margin},#{@vertical_margin},1"
+        return "Style: #{@style_name},Open Sans Semibold,#{@font_size},&H00FFFFFF,&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"
     end
 end

data/lib/vtt2ass/Application.rb

@@ -20,7 +20,7 @@ class Application
         @output_dir = options[:output] ? options[:output]: "./output"
         @width = 1920
         @height = 1080
-        @font_size = options[:font_size] ? options[:font_size] : 72
+        @font_size = options[:font_size] ? options[:font_size] : 52
     end
 
     ##
@@ -77,6 +77,6 @@ class Application
                 ass_styles.push(ASSStyle.new(sub.style, sub.params, @font_size, @width, @height))
             end
         end
-        return ASSFile.new(ass_styles, ass_subs, @width, @height).to_s
+        return ASSFile.new(File.basename(file_path).gsub('.vtt', ''), ass_styles, ass_subs, @width, @height).to_s
     end
 end

data/lib/vtt2ass/version.rb

@@ -1,3 +1,3 @@
 module Vtt2ass
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtt2ass
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: