vrtk 0.0.1.2 → 0.0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 502b51560173766ce17f0ab05a43b42bed55370e
-  data.tar.gz: de086d919511fc34d455b9cb969e36c872faf5cd
+  metadata.gz: bc874ea9f679a40013ec8f04468826bf44a49d48
+  data.tar.gz: b98fa092ab2fadbff5f7cb04d88c0d4adfc6036c
 SHA512:
-  metadata.gz: 3498428abf6345f7a2e59900f9880e0f20f4f78afdd53c71706d478684de576786e36f613ce3540eca092354a3e40c665e65a4ca11dd0311bf5be36fc2c55d90
-  data.tar.gz: e529095b80cc0212a79a43dd6e7d5c5cd30061826f8e148490418812ce0cc9d29722581cda77baa283c0e7d99cb18615cfad31eba062844d0933fbf6414c529f
+  metadata.gz: 457c131c23c06e8dfa51a401920c9cd11e8448898d54cc7da4a421ff91ae26583c8995dcca110c6929d374b4787000f48b27aa070251d79ebc1848e6914b61ff
+  data.tar.gz: ecb880178ba91f4bd62764f9f64bd54491f4e12b610e48f050a40b85c7298998c780bbbc16de6159b77f0b48a432aea0fd1d7c9436edd2a3b39f5360b62099fa

data/Gemfile

@@ -7,29 +7,21 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :video_clipper do
-	require 'ostruct'
-	require 'logger'
+
 end
 
 group :collager do
-	require 'ostruct'
-	require 'logger'
 	gem 'mini_magick'
 end
 
 group :ffmpeg do
-	require 'ostruct'
-	require 'logger'
 end
 
 
 group :applets do
-	require 'ostruct'
-	require 'optparse'
-	require 'logger'
+
 end
 
 group :app do
 	gem 'colorize'
-	require 'optparse'
 end

data/src/vrtk/app.rb

@@ -1,9 +1,8 @@
-require 'bundler'
-
 require_relative 'config'
 require_relative 'version'
 
-Bundler.require :app
+require 'colorize'
+require 'optparse'
 
 module VRTK
 	class App
@@ -16,14 +15,14 @@ module VRTK
 				__exec
 			rescue VRTKError => error
 				STDERR.print 'ERROR: '.colorize :red
-				STDERR.puts error.message.colorize :blue
-				STDERR.puts 'Exited.'.colorize :blue
+				STDERR.puts error.message.colorize :light_blue
+				STDERR.puts 'Exited.'.colorize :light_blue
 			end
 		end
 
 		def __exec
 
-			opt_parse
+			applet_help = opt_parse
 
 			applet = ARGV.shift
 
@@ -37,50 +36,18 @@ module VRTK
 		end
 
 		def opt_parse
-			OptionParser.new do |opts|
-				opts.banner = banner
-
-				opts.on('-?', '--help', 'See this help') do |_|
-					puts opts
-					exit 0
-				end
-
-				opts.on('-v', '--version', 'Print version') do |_|
-					puts "VRTK #{VRTK::VERSION}"
-					exit 0
-				end
-			end.parse!
+
 		end
 
 		private
 
-		def banner
-			<<END
--== Video Releaser's toolkit ==- 
-Usage: #{$PROGRAM_NAME} <applet> 
-Applets:
-#{get_applets}
-Options:
-END
-		end
 
 		def no_applet
 			STDERR.print 'ERROR: '.colorize(:red)
-			STDERR.puts "invalid usage!\nCall #{$0} --help.".colorize :blue
+			STDERR.puts "invalid usage!\nCall #{File.basename($PROGRAM_NAME)} help.".colorize :light_blue
 			exit 0
 		end
 
-		def get_applets
-			text = []
-			VRTK::Config::APPLETS.each do |_, applet|
-				text << <<END
-#{applet.id}
-				#{applet.name}
-				#{applet.desc}
-END
-			end
 
-			text.join $\
-		end
 	end
 end

data/src/vrtk/applets/all.rb

@@ -1,4 +1,6 @@
 require_relative 'base_applet'
 
+require_relative 'help_applet'
+
 require_relative 'clipper_applet'
-require_relative 'collager_applet'
+require_relative 'collager_applet'

data/src/vrtk/applets/base_applet.rb

@@ -2,7 +2,9 @@ require 'bundler'
 
 require_relative '../../vrtk'
 
-Bundler.require :applets
+require 'ostruct'
+require 'optparse'
+require 'logger'
 
 module VRTK::Applets
 	class BaseApplet
@@ -10,9 +12,9 @@ module VRTK::Applets
 			@argv = argv
 
 			@applet = {
-				name: name,
-				id:   id,
-				desc: desc,
+				name: self.class.name,
+				id:   self.class.id,
+				desc: self.class.desc,
 
 			}
 

data/src/vrtk/applets/clipper_applet.rb

@@ -4,10 +4,11 @@ require_relative '../../vrtk'
 require_relative 'base_applet'
 require_relative '../clipper/video_clipper'
 
-Bundler.require :applets
+require 'ostruct'
+require 'optparse'
+require 'logger'
 
 module VRTK::Applets
-
 	class ClipperApplet < BaseApplet
 		def init_options
 
@@ -15,7 +16,7 @@ module VRTK::Applets
 
 			OptionParser.new do |opts|
 
-				opts.banner = "-== #{name} ==-\n#{desc}\nUsage: #{$PROGRAM_NAME} #{id} [options]"
+				opts.banner = "-== #{self.class.name} ==-\n#{self.class.desc}\nUsage: #{File.basename($PROGRAM_NAME)} #{self.class.id} [options]"
 
 				opts.on('-?', '--help', 'This message') do |_|
 					puts opts
@@ -30,6 +31,10 @@ module VRTK::Applets
 					@options.count = v.to_i
 				end
 
+				opts.on('-f', '--font-size <n>', 'Font size for timestamp. If not specified, 200 is used.') do |v|
+					@options.font_size = v.to_i
+				end
+
 				opts.on('-q', '--silent', 'Do not generate additional output') do |v|
 					@options.silent = v
 				end
@@ -49,6 +54,7 @@ module VRTK::Applets
 				input_file:  @options.input,
 				clips_count: @options.count,
 				output_dir:  @options.output_dir,
+				font_size:   @options.font_size,
 				logger:      Logger.new(STDERR, level: (@options.silent ? Logger::Severity::FATAL : Logger::Severity::INFO))
 			)
 				.perform

data/src/vrtk/applets/collager_applet.rb

@@ -4,23 +4,28 @@ require_relative '../../vrtk'
 require_relative 'base_applet'
 require_relative '../collager/collager'
 
-Bundler.require :applets
+require 'ostruct'
+require 'optparse'
+require 'logger'
 
 module VRTK::Applets
 
 	class CollagerApplet < BaseApplet
 
+		include VRTK
 		include VRTK::Collage
 
 		WILDCARDS = "(wildcards allowed, '%' instead of '*', '\#' instead of '?')"
 
 		def init_options
 
-			@options = OpenStruct.new({})
+			@options = OpenStruct.new({
+				                          files: []
+			                          })
 
 			OptionParser.new do |opts|
 
-				opts.banner = "-== #{name} ==-\n#{desc}\nUsage: #{$PROGRAM_NAME} #{id} [options]"
+				opts.banner = "-== #{self.class.name} ==-\n#{self.class.desc}\nUsage: #{File.basename($PROGRAM_NAME)} #{self.class.id} [options]"
 
 				opts.on('-?', '--help', 'This message') do |v|
 					puts opts
@@ -63,10 +68,10 @@ module VRTK::Applets
 
 		def run
 
-			raise CollagerError, 'no input file specified!' unless @options.input
+			raise CollagerError, 'no input file specified!' unless @options.files
 
 			VRTK::Collager.new(
-				input_file:    @options.files,
+				input_files:    @options.files,
 				output_file:   @options.output,
 				tile_ratio:    @options.ratio,
 				collage_width: @options.width
@@ -86,4 +91,5 @@ module VRTK::Applets
 			'collager'
 		end
 	end
+
 end

data/src/vrtk/applets/help_applet.rb

@@ -0,0 +1,60 @@
+require 'bundler'
+
+require_relative '../../vrtk'
+require_relative 'base_applet'
+
+require 'ostruct'
+require 'optparse'
+require 'logger'
+
+module VRTK::Applets
+	class HelpApplet < BaseApplet
+
+		def init_options
+			OptionParser.new do |opts|
+
+			end
+		end
+
+		def run
+			puts banner
+		end
+
+		def self.name
+			'Help applet'
+		end
+
+		def self.id
+			'help'
+		end
+
+		def self.desc
+			'Displays this message'
+		end
+
+		private
+		def banner
+			<<END
+-== Video Releaser's toolkit ==- 
+Usage: #{File.basename($PROGRAM_NAME)} <applet> 
+Applets:
+#{get_applets}
+END
+		end
+
+		def get_applets
+			text = []
+			VRTK::Config::APPLETS.each do |_, applet|
+				text << <<END
+#{applet.id}
+				#{applet.name}
+				#{applet.desc}
+END
+			end
+
+			text.join $\
+		end
+
+	end
+
+end

data/src/vrtk/clipper/ffmpeg.rb

@@ -1,9 +1,8 @@
-require 'bundler'
-
 require_relative '../../vrtk'
 require_relative '../utils/utils'
 
-Bundler.require :ffmpeg
+require 'ostruct'
+require 'logger'
 
 module VRTK::Clipper
 

data/src/vrtk/clipper/font_finder.rb

@@ -1,9 +1,8 @@
-require 'bundler'
-
 require_relative '../../vrtk'
 require_relative '../utils/utils'
 
-Bundler.require :video_clipper
+require 'ostruct'
+require 'logger'
 
 module VRTK::Clipper
 
@@ -12,6 +11,8 @@ module VRTK::Clipper
 
 	class FontFinder
 
+		include VRTK
+
 		DEFAULT_DIRS = ['.', File.dirname(__FILE__)]
 
 		def initialize

data/src/vrtk/clipper/video_clipper.rb

@@ -1,11 +1,10 @@
-require 'bundler'
-
 require_relative 'ffmpeg'
 require_relative 'font_finder'
 require_relative '../utils/utils'
 require_relative 'clipper_error'
 
-Bundler.require :video_clipper
+require 'ostruct'
+require 'logger'
 
 STDNUL = (File.open(File::NULL, 'w'))
 
@@ -17,17 +16,19 @@ module VRTK
 		include VRTK::Utils
 
 		CMD_DURATION = "%{ffprobe} -show_format -i \"%{input_file}\" -v 0 | sed -n \"s/duration=//p\""
-		CMD_CLIPS    = "%{ffmpeg} -v 0 -i \"%{input_file}\" -vframes %{count} -vf \"drawtext=fontfile='%{font_file}': timecode='0\\:0\\:0\\:0': timecode_rate=60: x=100: y=50: fontsize=40: fontcolor=white@1: borderw=3: bordercolor=black@1\" -r %{freq} -f image2 \"%{output_dir}/sc%%06d.jpeg\""
+		CMD_CLIPS    = "%{ffmpeg} -v 0 -i \"%{input_file}\" -vframes %{count} -vf \"drawtext=fontfile='%{font_file}': timecode='0\\:0\\:0\\:0': timecode_rate=60: x=100: y=50: fontsize=%{font_size}: fontcolor=white@1: borderw=3: bordercolor=black@1\" -r %{freq} -f image2 \"%{output_dir}/sc%%06d.jpeg\""
 
 		def initialize(
 			input_file:,
 			clips_count: 16,
 			output_dir: nil,
+			font_size: 200,
 			logger: nil
 		)
 			@options = OpenStruct.new ({
 				input:  mk_input(input_file),
-				count:  clips_count,
+				count:  clips_count || 16,
+				font_size: font_size || 200,
 				output: output_dir || "#{input_file}.dir",
 				logger: logger || Logger.new(STDNUL)
 			})
@@ -55,7 +56,8 @@ module VRTK
 				freq:       get_clip_frequency(get_duration, @options.count),
 				output_dir: @options.output,
 				count:      @options.count,
-				font_file:  FontFinder.find_font('font')
+				font_file:  FontFinder.find_font('consola'),
+				font_size: @options.font_size
 			})
 
 			@options.logger.info "shell.exec #{cmd}"

data/src/vrtk/collager/collager.rb

@@ -1,9 +1,9 @@
-require 'bundler'
-
 require_relative '../../vrtk'
 require_relative '../utils/utils'
 
-Bundler.require :collager
+require 'ostruct'
+require 'logger'
+require 'mini_magick'
 
 module VRTK
 

data/src/vrtk/config.rb

@@ -5,7 +5,8 @@ require_relative 'applets/all'
 module VRTK::Config
 	# noinspection RubyStringKeysInHashInspection
 	APPLETS = {
-		'clipper' => VRTK::Applets::ClipperApplet,
-		'collager' => VRTK::Applets::CollagerApplet
+		'clipper'  => VRTK::Applets::ClipperApplet,
+		'collager' => VRTK::Applets::CollagerApplet,
+		'help'     => VRTK::Applets::HelpApplet
 	}
 end

data/src/vrtk/utils/utils.rb

@@ -1,9 +1,5 @@
-require 'bundler'
-
 require_relative '../../vrtk'
 
-Bundler.require :utils
-
 module VRTK::Utils
 	def self.to_wpath(upath)
 		"\"#{upath.gsub('/', '\\')}\""

data/src/vrtk/version.rb

@@ -1,3 +1,3 @@
 module VRTK
-	VERSION = '0.0.1.2'
+	VERSION = '0.0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vrtk
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
 platform: ruby
 authors:
 - MRAKOBEZE
@@ -59,6 +59,7 @@ files:
 - src/vrtk/applets/base_applet.rb
 - src/vrtk/applets/clipper_applet.rb
 - src/vrtk/applets/collager_applet.rb
+- src/vrtk/applets/help_applet.rb
 - src/vrtk/clipper/clipper_error.rb
 - src/vrtk/clipper/ffmpeg.rb
 - src/vrtk/clipper/font_finder.rb