evideo 0.1.7 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8606bfbd9f0c7ba938bec7202751ad943b1ca67ee35099165d129d49a2897b0c
-  data.tar.gz: e960f31a33ebed6c26d1295ecaa9c595c846242d335a157db0766d40b3b69155
+  metadata.gz: 1e28f124268b83c747ed748296d09491c6955cb1b679952e76d0c78c3926de76
+  data.tar.gz: e92e5ac092e29017ec65a4799de589109f4400723421360a46bbd35af8b6645e
 SHA512:
-  metadata.gz: 37f629b884f5ba6872a4f28e274caa7e4dcc4dc06828b2a43cf7933d7d6b571a2eda2cbd30fb5e68795559932f32606efb5bd5413526cd219a75e21af4e4ccca
-  data.tar.gz: 395e200817a3af2045535861d598bce990f654f2e730e271d6a7aeb52049a13ed87abfcdc98ee1a2aceffed32a79ff4107a5159cb0a78d4376241c3be97aab2a
+  metadata.gz: 7bb0acee95ef8a2307bdc1b525d82293fca925bc94cd8031dfa860affddeb40b6e52cca607f6315dacc343cf0b89ca79125112fe075d33a1cb7a1a36c1cfeb7b
+  data.tar.gz: a7803cb72e5ff2105c3939deb56960babafba44fce72f26e9001e0191ca27b549110c8e87b1f556e725d10a3461f5792ade603f33646753d34a337c0c16307b0

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    evideo (0.1.7)
-      thor (~> 0.1)
+    evideo (0.2.4)
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
     rake (13.0.1)
-    thor (0.20.3)
+    thor (1.0.1)
 
 PLATFORMS
   ruby
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.17.2
+   2.1.2

data/evideo.gemspec

@@ -13,9 +13,7 @@ Gem::Specification.new do |spec|
   spec.license     = 'MIT'
 
   spec.summary     = 'Processa ficheiros video.'
-  spec.description = spec.summary +
-                     ' Pode alterar bitrate, framerate, height,' \
-                     ' aspect ratio e elimina metadata.'
+  spec.description = spec.summary + ' Pode alterar bitrate, framerate, height, aspect ratio e elimina metadata.'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['yard.run'] = 'yard'
@@ -24,8 +22,7 @@ Gem::Specification.new do |spec|
   # The `git ls-files -z` loads the files in the RubyGem that have been
   # added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0")
-                     .reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -34,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'thor', '~> 0.1'
+  spec.add_dependency 'thor'
 end

data/lib/evideo.rb

@@ -10,17 +10,13 @@ module Evideo
   ID = `whoami`.chomp
   # CLI para analisar/processar videos
   class CLI < Thor
-    class_option :d, banner: 'DIR', type: :array,
-                     default: ["/home/#{ID}/lust", "/media/#{ID}/hrv2"],
-                     desc: 'Onde procurar videos'
-    class_option :i, banner: 'IN', default: 'ftv',
-                     desc: 'Pasta origem'
+    class_option :d, banner: 'DIR', type: :array, desc: 'Onde procurar videos',
+                     default: ["/home/#{ID}/lust", "/media/#{ID}/hrv2"]
+    class_option :i, banner: 'IN',  default: 'ftv', desc: 'Pasta origem'
+    class_option :o, banner: 'OUT', default: 'out', desc: 'Pasta destino'
+
     desc 'conv', 'converte videos'
-    option :o, banner: 'OUT', default: 'out',
-               desc: 'Pasta destino'
-    option :t, type: :boolean, default: false,
-               desc: 'Processa somente segundos para teste'
-    # Processa videos
+    option :t, type: :boolean, default: false, desc: 'Processa somente segundos para teste'
     def conv
       Dir.glob("#{fin}/*.???").sort.each do |f|
         HRVideo.new(f).processa(options, fout)
@@ -28,13 +24,13 @@ module Evideo
     end
 
     desc 'test', 'testa videos'
-    # Analisa videos
     def test
       Dir.glob("#{fin}/*.???").sort.each do |f|
-        HRVideo.new(f).testa(options)
+        HRVideo.new(f).testa(options, fout)
       end
     end
-    default_task :conv
+
+    default_task :test
     no_commands do
       # @return [String] pasta absoluta origem dos videos
       def fin

data/lib/evideo/hrvideo.rb

@@ -2,15 +2,15 @@
 
 module Evideo
   # permite analizar string output do comando sonda video
-  class HRVideo < String
+  class HRVideo
     # @return [String] nome do ficheiro video
-    attr_reader :video
+    attr_reader :nome
     # @return [String] extensao do ficheiro video
     attr_reader :ext
     # @return [String] base do ficheiro video
     attr_reader :base
     # @return [String] duracao do ficheiro video
-    attr_reader :duration
+    attr_reader :tempo
     # @return [String] bitrate do ficheiro video
     attr_reader :bitrate
 
@@ -21,18 +21,21 @@ module Evideo
     R2 = /stream.*video:.*x\s*(\d+).*\s+(\d+\.*\d*)\s+fps/i.freeze
     # display_aspect_ratio=16:9
     R3 = /display_aspect_ratio\s*=\s*(\d+:\d+)$/i.freeze
+    # Stream #0:1(eng): Audio: aac (LC), 48000 Hz, stereo, fltp (default)
+    # Stream #0:1(und): Audio: aac (LC) (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 127 kb/s (default)
+    R4 = /stream.*audio:.*\s+(\d+)\s+hz/i.freeze
 
-    def initialize(fvideo)
-      @video = fvideo
-      @ext = File.extname(fvideo)
-      @base = File.basename(fvideo, @ext).downcase
-      @duration = '00:00:00'
+    def initialize(fil)
+      @nome = fil
+      @ext = File.extname(fil)
+      @base = File.basename(fil, @ext).downcase
+      @tempo = '00:00:00'
       @bitrate = 0
-      @probe = `#{probe}` if File.exist?(fvideo)
+      @probe = `#{cmd_probe}` if File.exist?(fil)
       return unless @probe
 
       tr1 = @probe.scan(R1).flatten
-      @duration = tr1[0].to_s
+      @tempo = tr1[0].to_s
       @bitrate = tr1[1].to_i
     end
 
@@ -52,6 +55,20 @@ module Evideo
       @ratio = @probe.scan(R3).flatten[0]
     end
 
+    # Parametrizar audio
+    def r4
+      return unless @probe
+
+      @audio = @probe.scan(R4).flatten[0].to_i
+    end
+
+    # @return [String] audio
+    def audio
+      r4 unless @audio
+
+      @audio
+    end
+
     # @return [String] height
     def height
       r2 unless @height

data/lib/evideo/hrvprocessa.rb

@@ -4,63 +4,60 @@ require 'time'
 
 module Evideo
   # permite analizar/processar videos para arquivo
-  class HRVideo < String
+  class HRVideo
     # @return [String] tempo: rate:
     def show
-      return video unless @probe
+      return nome unless @probe
 
-      "tempo: #{duration} rate: #{bitrate} ratio: #{ratio} height: #{height}"
+      "tempo: #{tempo} rate: #{bitrate} ratio: #{ratio} height: #{height}"
     end
 
     # Testa validade video original
     #
-    # @return [true, false] sim ou nao video esta ok
-    def ofok?
-      return false unless (bitrate < 3000 && ext == '.mp4') ||
-                          Time.parse(duration) < Time.parse('00:01:00')
-      return false unless ratio == '16:9' && height > 480
+    # @param [String] aot pasta destino dos videos absoluta
+    # @return [true, false] sim ou nao video original esta ok
+    def ofok?(aot)
+      return false unless processa_of?
 
-      puts "rm \"#{video}\" # #{show}"
+      puts "mv \"#{nome} #{aot}/#{base}.mp4\" # #{show}"
       true
     end
 
+    # @return [true, false] video original precisa ser processado?
+    def processa_of?
+      # prossecar somente videos grandes (>1 min) ou extensao errada ou bitrate >= 3000
+      ((bitrate < 3000 && ext == '.mp4') || Time.parse(tempo) < Time.parse('00:01:00')) &&
+        # prossecar somente videos com ratio, height, audio errados
+        ratio == '16:9' && height > 480 && audio.zero?
+    end
+
     # Testa validade video processado contra video original
     #
-    # @param [String] file video processado a testar validade
+    # @param [String] hrv video processado a testar validade
     # @return [true, false] sim ou nao video esta ok
-    def vfok?(file)
-      return false unless File.exist?(file.video) &&
-                          file.bitrate < 3000 &&
-                          Time.parse(file.duration) > Time.parse(duration) - 60
+    def vfok?(hrv)
+      return false unless File.exist?(hrv.nome) && hrv.bitrate < 3000 && Time.parse(hrv.tempo) > Time.parse(tempo) - 60
 
-      puts "rm \"#{video}\" # #{file.video} #{file.show}"
+      puts "rm \"#{nome}\" # #{hrv.nome} #{hrv.show}"
       true
     end
 
     # Testa validade videos processados em todos locais contra video original
     #
     # @param [Array<String>] ary array locais onde procurar videos
-    # @param [String] out pasta destino dos videos
+    # @param [String] pot pasta destino dos videos
     # @return [true, false] sim ou nao <local>/<video> esta ok
-    def vdok?(ary, out)
+    def vdok?(ary, pot)
       if ary.empty? then false
-      elsif vfok?(HRVideo.new("#{ary.first}/#{out}/#{base}.mp4")) then true
-      else  vdok?(ary.drop(1), out)
+      elsif vfok?(HRVideo.new("#{ary.first}/#{pot}/#{base}.mp4")) then true
+      else  vdok?(ary.drop(1), pot)
       end
     end
 
-    # @return [String] opcoes gerais comando conversao
-    def geral
-      '-loglevel quiet -hide_banner' +
-        # para ignorar segundos no inicio
-        # ' -ss 15' \
-        ''
-    end
-
     # @return [String] aspect ratio comando conversao
     def aspect
       if ratio == '0:1' then height < 720 ? '' : ' -aspect 16:9'
-      else                   " -aspect #{ratio}"
+      else " -aspect #{ratio}"
       end
     end
 
@@ -73,25 +70,35 @@ module Evideo
     end
 
     # @return [String] comando analise
-    def probe
-      "ffprobe -hide_banner -show_streams \"#{video}\" 2>&1|grep -v title"
+    def cmd_probe
+      "ffprobe -hide_banner -show_streams \"#{nome}\" 2>&1|grep -v title"
     end
 
     # Comando para processar videos
     #
-    # @param [String] tempo do video processato
+    # @param [String] tempo do video processado
     # @return [String] comando conversao
-    def mpeg(tempo)
-      "ffmpeg #{geral} -i \"#{video}\" -y -an " +
-        # framerate & bitrate
-        "-r #{[fps, 25].min} -b:v #{[bitrate, 2000].min}k" +
-        dimension + aspect +
-        ' -metadata title= -metadata artist= -metadata comment=' \
-        ' -metadata major_brand= -metadata compatible_brands=' +
+    def cmd_mpeg(tempo)
+      puts "processar #{base}.mp4 " + join_opcoes
+      "ffmpeg #{geral} -i \"#{nome}\" -y -an " + join_opcoes +
+        ' -metadata title= -metadata artist= -metadata comment= -metadata major_brand= -metadata compatible_brands=' +
         # para teste produz somente segundos
         tempo
     end
 
+    # @return [String] opcoes para trabalho framerate & bitrate & dimenssoes
+    def join_opcoes
+      "-r #{[fps, 25].min} -b:v #{[bitrate, 2000].min}k" + dimension + aspect
+    end
+
+    # @return [String] opcoes gerais comando conversao
+    def geral
+      '-loglevel quiet -hide_banner' +
+        # para ignorar segundos no inicio
+        # ' -ss 15' \
+        ''
+    end
+
     # Processa videos
     #
     # @param [Hash] opcoes parametrizacao
@@ -99,12 +106,12 @@ module Evideo
     # @option opcoes [<String>] :i pasta origem dos videos
     # @option opcoes [<String>] :o pasta destino dos videos
     # @option opcoes [<Boolean>] :t processa somente segundos para teste
-    # @param [String] out pasta destino dos videos absoluta
-    def processa(opcoes, out)
-      return if ofok? || vdok?(opcoes[:d], opcoes[:o])
+    # @param [String] aot pasta destino dos videos absoluta
+    def processa(opcoes, aot)
+      return if ofok?(aot) || vdok?(opcoes[:d], opcoes[:o])
 
-      system mpeg(opcoes[:t] ? ' -t 20' : '') + " #{out}/#{base}.mp4"
-      vfok?(HRVideo.new("#{out}/#{base}.mp4"))
+      system cmd_mpeg(opcoes[:t] ? ' -t 20' : '') + " #{aot}/#{base}.mp4"
+      vfok?(HRVideo.new("#{aot}/#{base}.mp4"))
     end
 
     # Testa videos
@@ -114,10 +121,11 @@ module Evideo
     # @option opcoes [<String>] :i pasta origem dos videos
     # @option opcoes [<String>] :o pasta destino dos videos
     # @option opcoes [<Boolean>] :t processa somente segundos para teste
-    def testa(opcoes)
-      return if ofok? || vdok?(opcoes[:d], opcoes[:o])
+    # @param [String] aot pasta destino dos videos absoluta
+    def testa(opcoes, aot)
+      return if ofok?(aot) || vdok?(opcoes[:d], opcoes[:o])
 
-      puts "ls \"#{video}\" # #{show}"
+      puts "ls -lh \"#{nome}\" # #{show}"
     end
   end
 end

data/lib/evideo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evideo
-  VERSION = '0.1.7'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evideo
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.4
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 description: Processa ficheiros video. Pode alterar bitrate, framerate, height, aspect
   ratio e elimina metadata.
 email:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Processa ficheiros video.