evideo 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e28f124268b83c747ed748296d09491c6955cb1b679952e76d0c78c3926de76
-  data.tar.gz: e92e5ac092e29017ec65a4799de589109f4400723421360a46bbd35af8b6645e
+  metadata.gz: 7f5c77658b5bcd0344f7eff6ab91922381d9d49eccd003b29244b363c9b43502
+  data.tar.gz: b19c5ff8dd141e15cb19c41f2ea0a927a3c3d773b64ffe4a4e99c52f1d8d5556
 SHA512:
-  metadata.gz: 7bb0acee95ef8a2307bdc1b525d82293fca925bc94cd8031dfa860affddeb40b6e52cca607f6315dacc343cf0b89ca79125112fe075d33a1cb7a1a36c1cfeb7b
-  data.tar.gz: a7803cb72e5ff2105c3939deb56960babafba44fce72f26e9001e0191ca27b549110c8e87b1f556e725d10a3461f5792ade603f33646753d34a337c0c16307b0
+  metadata.gz: 62f8ae5efa2db98752f862eec528ef809efd86c76ac71117bfcffeeaaebee104a5af7cf9cf6f26cb9d2660f3ad04d7880bd38ee784ce1a371efd0d2c2307ca4b
+  data.tar.gz: e618be2769fce85c76319c7c72e5b7612164892a5a85e7e9d01a658a188249dfc47abed78af3e4fb355f16b1eabacb17f650af81bcdccd8600fe033de65fefe4

data/.rubocop.yml

@@ -0,0 +1,12 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  EnabledByDefault: true
+
+Style/Copyright:
+    Enabled: false
+
+Lint/ConstantResolution:
+    Enabled: false
+
+Style/ConstantVisibility:
+    Enabled: false

data/.travis.yml

@@ -0,0 +1,6 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.7.0

data/Gemfile.lock

@@ -1,14 +1,67 @@
 PATH
   remote: .
   specs:
-    evideo (0.2.4)
+    evideo (0.2.5)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.1)
+    backport (1.1.2)
+    benchmark (0.1.0)
+    e2mmap (0.1.0)
+    jaro_winkler (1.5.4)
+    kwalify (0.7.2)
+    maruku (0.7.3)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    psych (3.2.0)
+    rainbow (3.0.0)
     rake (13.0.1)
+    reek (6.0.2)
+      kwalify (~> 0.7.0)
+      parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
+      psych (~> 3.1)
+      rainbow (>= 2.0, < 4.0)
+    regexp_parser (1.8.2)
+    reverse_markdown (2.0.0)
+      nokogiri
+    rexml (3.2.4)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.0.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    solargraph (0.39.17)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      maruku (~> 0.7, >= 0.7.3)
+      nokogiri (~> 1.9, >= 1.9.1)
+      parser (~> 2.3)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (~> 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
     thor (1.0.1)
+    tilt (2.0.10)
+    unicode-display_width (1.7.0)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -17,6 +70,9 @@ DEPENDENCIES
   bundler
   evideo!
   rake
+  reek
+  rubocop
+  solargraph
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -8,16 +8,16 @@ Processa ficheiros video. Pode alterar bitrate, framerate, height, aspect ratio
 
 ## Usage
 
-    $ ev conv  # converte videos
-    $ ev test  # testa videos
+    $ ev conv       # converte videos
+    $ ev test       # testa videos
 
-    Options:
-      [-d=DIR] # Onde procurar videos
-               # Default: ["/home/eu/lust", "/media/eu/hrv2"]
-      [-i=IN]  # Pasta origem
-               # Default: ftv
-      [-o=OUT] # Pasta destino
-               # Default: out
+    opcoes:
+    [-d=DIR]        # Onde procurar videos                       defeito: ["/home/eu/lust", "/media/eu/hrv2", "/media/eu/hrv2/lust"]
+    [-i=IN]         # Pasta inicial                              defeito: ftv
+    [-o=OUT]        # Pasta final                                defeito: out
+    [-x], [--no-x]  # executa/mostra comando converte videos
+    [-s=N]          # Segundos cortados no inicio do video final defeito: 0=sem cortes
+    [-t=N]          # Segundos duracao video final               defeito: 0=sem cortes
 
 ## Development
 
@@ -27,7 +27,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/evideo.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hernanilr/evideo.
 
 ## License
 

data/Rakefile

@@ -1,2 +1,5 @@
-require "bundler/gem_tasks"
-task :default => :spec
+# frozen_string_literal: true
+
+require('bundler/gem_tasks')
+
+task default: :build

data/evideo.gemspec

@@ -5,15 +5,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'evideo/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = 'evideo'
-  spec.version     = Evideo::VERSION
-  spec.authors     = ['Hernâni Rodrigues Vaz']
-  spec.email       = ['hernanirvaz@gmail.com']
-  spec.homepage    = 'https://github.com/hernanilr/evideo'
-  spec.license     = 'MIT'
+  spec.name                  = 'evideo'
+  spec.version               = Evideo::VERSION
+  spec.authors               = ['Hernâni Rodrigues Vaz']
+  spec.email                 = ['hernanirvaz@gmail.com']
+  spec.homepage              = 'https://github.com/hernanilr/evideo'
+  spec.license               = 'MIT'
+  spec.required_ruby_version = '~> 2.7'
 
   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'
@@ -21,15 +22,19 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # 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)/}) }
-  end
+  spec.files =
+    Dir.chdir(File.expand_path(__dir__)) do
+      `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) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('reek')
+  spec.add_development_dependency('rubocop')
+  spec.add_development_dependency('solargraph')
 
-  spec.add_dependency 'thor'
+  spec.add_dependency('thor')
 end

data/exe/ev

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'evideo'
+require('evideo')
 
 Evideo::CLI.start(ARGV)

data/exe/evideo

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'evideo'
+require('evideo')
 
 Evideo::CLI.start(ARGV)

data/lib/evideo.rb

@@ -1,45 +1,49 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'evideo/vars1'
+require 'evideo/vars2'
+require 'evideo/processa'
 require 'evideo/version'
-require 'evideo/hrvideo'
-require 'evideo/hrvprocessa'
 
+# (see Evideo)
 module Evideo
-  class Error < StandardError; end
-  ID = `whoami`.chomp
+  who = `whoami`.chomp
+  ADI = ["/home/#{who}/lust", "/media/#{who}/hrv2", "/media/#{who}/hrv2/lust"].freeze
+
   # CLI para analisar/processar videos
   class CLI < Thor
-    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'
+    class_option :d, banner: 'DIR', type: :array, desc: 'Onde procurar videos', default: ADI
+    class_option :i, banner: 'IN',  default: 'ftv', desc: 'Pasta inicial'
+    class_option :o, banner: 'OUT', default: 'out', desc: 'Pasta final'
 
     desc 'conv', 'converte videos'
-    option :t, type: :boolean, default: false, desc: 'Processa somente segundos para teste'
+    option :x, type: :boolean, default: false, desc: 'executa/mostra comando converte videos'
+    option :s, type: :numeric, default: 0, desc: 'Segundos cortados no inicio do video final 0=sem cortes'
+    option :t, type: :numeric, default: 0, desc: 'Segundos duracao video final 0=sem cortes'
+    # converte videos
     def conv
-      Dir.glob("#{fin}/*.???").sort.each do |f|
-        HRVideo.new(f).processa(options, fout)
+      # cria pasta final para videos processados
+      system("mkdir -p #{ipasta}/#{options[:o]}")
+
+      Dir.glob("#{ipasta}/*.???").sort.each do |file|
+        Video.new(file, options).processa
       end
     end
 
     desc 'test', 'testa videos'
+    # testa videos
     def test
-      Dir.glob("#{fin}/*.???").sort.each do |f|
-        HRVideo.new(f).testa(options, fout)
+      Dir.glob("#{ipasta}/*.???").sort.each do |file|
+        puts(Video.new(file, options).inout)
       end
     end
 
     default_task :test
     no_commands do
-      # @return [String] pasta absoluta origem dos videos
-      def fin
-        "#{options[:d].first}/#{options[:i]}"
-      end
-
-      # @return [String] pasta absoluta destino dos videos
-      def fout
-        "#{options[:d].first}/#{options[:o]}"
+      # @return [String] pasta absoluta inicial dos videos
+      def ipasta
+        "#{options[:d][0]}/#{options[:i]}"
       end
     end
   end

data/lib/evideo/processa.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# (see Evideo)
+module Evideo
+  # aspect ratios a converter para 16:9
+  ART = ['0:1', '4:3'].freeze
+
+  # classe permite analizar/processar videos para arquivo uniformizado
+  class Video
+    # processa video - somente se necessario
+    def processa
+      return if ivideo? || opastas?
+
+      work(cmd_mpeg("#{ops[:d][0]}/#{ops[:i]}/#{ops[:o]}/#{bas.downcase}"))
+    end
+
+    # executa/mostra comando mpeg
+    # @param [String] cmd comando mpeg
+    def work(cmd)
+      if ops[:x]
+        puts("processar #{inout}")
+        system(cmd)
+      else
+        puts(cmd)
+      end
+    end
+
+    # @return [String] params video inicial & comando mpeg
+    def inout
+      "#{bas}#{ishow} OUT: #{fparams}"
+    end
+
+    # @return [true, false] video inicial ok
+    def ivideo?
+      return false if ext != '.mp4' || iaudio.positive? || ibitrate >= 3000 || iheight <= 480
+
+      puts("mv #{inome} #{onome} #{ishow}")
+      true
+    end
+
+    # @return [true, false] video final ok
+    def ovideo?
+      oinit
+      return false if Video.to_t(otempo, 5) != Video.to_t(itempo, 5) || obitrate >= 3000 || oheight < 480
+
+      puts("rm #{inome} #{oshow}")
+      true
+    end
+
+    # @return [true, false] pastas com video final ok
+    def opastas?
+      ary = ops[:d]
+      if pos == ary.size then false
+      elsif ovideo?      then true
+      else
+        # proxima pasta
+        @pos += 1
+        opastas?
+      end
+    end
+
+    # @return [String] parametros do comando processar video
+    def fparams
+      # frame rate & bitrate & dimensions & aspect ratio
+      "-r #{[ifps, 25.0].min} -b:v #{[ibitrate, 2000].min}k#{fdimensions}#{fratio}"
+    end
+
+    # @return [String] dimensions do comando processar video
+    def fdimensions
+      if    iheight < 480  then ' -s hd480'
+      elsif iheight <= 720 then ' -s hd720'
+      else                      ' -s hd1080'
+      end
+    end
+
+    # @return [String] aspect ratio do comando processar video
+    def fratio
+      ART.include?(iratio) ? " -aspect 16:9 -filter:v 'pad=ih*16/9:ih:(ow-iw)/2:(oh-ih)/2'" : ''
+    end
+
+    # @return [String] cortes inicio video & duracao do video final processado
+    def fcuts
+      ict = Integer(ops[:s])
+      fct = Integer(ops[:t])
+      "#{ict.positive? ? " -ss #{ict}" : ''}#{fct.positive? ? " -t #{fct}" : ''}"
+    end
+
+    # @param [String] ficheiro video
+    # @return [String] comando probe
+    def cmd_prob(ficheiro)
+      "ffprobe -hide_banner -show_streams #{ficheiro} 2>&1|grep -v title"
+    end
+
+    # @param [String] base ficheiro video final
+    # @return [String] comando mpeg
+    def cmd_mpeg(base)
+      oout = "#{base}.out"
+      "ffmpeg -loglevel quiet -hide_banner -i #{inome} -y -an #{fparams}#{fcuts} "\
+      '-metadata title= -metadata artist= -metadata comment= -metadata major_brand= -metadata compatible_brands= '\
+      "#{base}.mp4 >#{oout} 2>&1;[ -s #{oout} ] || rm #{oout}"
+    end
+  end
+end

data/lib/evideo/vars1.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+# (see Evideo)
+module Evideo
+  # parametros video :tempo, :bitrate - Duration: 01:01:08.50, start: 0.000000, bitrate: 2228 kb/s
+  RE1 = /duration:\s+(\d\d:\d\d:\d\d).*bitrate:\s+(\d+)\s+kb/i.freeze
+  # parametros video :height, :fps -
+  #  Stream #0:0: Video: h264 (Main), yuv420p(tv, bt709, progressive), 1280x720
+  #  [SAR 1:1 DAR 16:9], 23.98 fps, 23.98 tbr, 1k tbn, 180k tbc (default)
+  RE2 = /stream.*video:.*x\s*(\d+).*\s+(\d+\.*\d*)\s+fps/i.freeze
+  # parametros video :ratio - display_aspect_ratio=16:9
+  RE3 = /display_aspect_ratio\s*=\s*(\d+:\d+)$/i.freeze
+  # parametros video :audio - Stream #0:1(eng): Audio: aac (LC), 48000 Hz, stereo, fltp (default)
+  RE4 = /stream.*audio:.*\s+(\d+)\s+hz/i.freeze
+
+  # permite analizar string output do comando sonda video
+  class Video
+    # @return [String] base ficheiro video
+    attr_reader :bas
+    # @return [String] extensao ficheiro video
+    attr_reader :ext
+    # @return [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
+    attr_reader :ops
+
+    # @param [String] ficheiro video a processar
+    # @param [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
+    # @option opcoes [Array<String>] :d (/home/eu/lust,/media/eu/hrv2,/media/eu/hrv2/lust) pastas onde procurar videos
+    # @option opcoes [String] :i (ftv) pasta inicial dos videos
+    # @option opcoes [String] :o (out) pasta final dos videos
+    # @option opcoes [Boolean] :s (false) 10 segundos cortados no inicio do video final
+    # @option opcoes [Integer] :t (0) segundos duracao video final 0=sem cortes
+    # @return [Video] videos processados para arquivo uniformizado
+    def initialize(ficheiro, opcoes)
+      @ext = File.extname(ficheiro)
+      @bas = File.basename(ficheiro, ext)
+      @ops = opcoes
+      @iopcao = {}
+    end
+
+    # @return [String] texto probe do video inicial
+    def iprobe
+      @iprobe ||= `#{cmd_prob(inome)}`
+    end
+
+    # @return [Array<String>] parametros video inicial [:tempo, :bitrate]
+    def i1scan
+      @i1scan ||= iprobe.scan(RE1).flatten
+    end
+
+    # @return [Array<String>] parametros video inicial [:height, :fps]
+    def i2scan
+      @i2scan ||= iprobe.scan(RE2).flatten
+    end
+
+    # @return [String] parametro video inicial :tempo hh:mm:ss
+    def itempo
+      @iopcao[:tempo] ||= (i1scan[0] || '00:00:00')
+    end
+
+    # @return [Integer] parametro video inicial :bitrate kb/s
+    def ibitrate
+      @iopcao[:bitrate] ||= Integer(i1scan[1] || 0)
+    end
+
+    # @return [Integer] parametro video inicial :height
+    def iheight
+      @iopcao[:height] ||= Integer(i2scan[0] || 0)
+    end
+
+    # @return [Float] parametro video inicial :fps frame_rate
+    def ifps
+      @iopcao[:fps] ||= Float(i2scan[1] || 0)
+    end
+
+    # @return [String] parametro video inicial aspect :ratio 16:9
+    def iratio
+      @iopcao[:ratio] ||= (iprobe.scan(RE3).flatten[0] || '0:1')
+    end
+
+    # @return [Integer] parametro video inicial :audio Hz
+    def iaudio
+      @iopcao[:audio] ||= Integer(iprobe.scan(RE4).flatten[0] || 0)
+    end
+
+    # @return [String] ficheiro inicial absoluto
+    def inome
+      "#{ops[:d][0]}/#{ops[:i]}/#{bas}#{ext}"
+    end
+
+    # @return [String] mostra dados do ficheiro video inicial
+    def ishow
+      "# r:#{ibitrate} h:#{iheight} #{iratio}"
+    end
+  end
+end

data/lib/evideo/vars2.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'time'
+
+# (see Evideo)
+module Evideo
+  # permite analizar string output do comando sonda video
+  class Video
+    # @return [Time] tempo no ruby standard library com precisao
+    def self.to_t(tempo, pre = 8)
+      Time.parse(tempo[0, pre])
+    end
+
+    # inicia variaveis do video final
+    def oinit
+      @oopcao = {}
+      @oprobe = nil
+      @o1scan = nil
+      @o2scan = nil
+    end
+
+    # @return [String] texto probe do video final
+    def oprobe
+      return '' unless File.exist?(onome)
+
+      @oprobe ||= `#{cmd_prob(onome)}`
+    end
+
+    # @return [Array<String>] parametros video final [:tempo, :bitrate]
+    def o1scan
+      @o1scan ||= oprobe.scan(RE1).flatten
+    end
+
+    # @return [Array<String>] parametros video final [:height, :fps]
+    def o2scan
+      @o2scan ||= oprobe.scan(RE2).flatten
+    end
+
+    # @return [String] parametro video final :tempo hh:mm:ss
+    def otempo
+      @oopcao[:tempo] ||= (o1scan[0] || '00:00:00')
+    end
+
+    # @return [Integer] parametro video final :bitrate kb/s
+    def obitrate
+      @oopcao[:bitrate] ||= Integer(o1scan[1] || 0)
+    end
+
+    # @return [Integer] parametro video final :height
+    def oheight
+      @oopcao[:height] ||= Integer(o2scan[0] || 0)
+    end
+
+    # @return [Float] parametro video final :fps frame_rate
+    def ofps
+      @oopcao[:fps] ||= Float(o2scan[1] || 0)
+    end
+
+    # @return [String] parametro video final aspect :ratio 16:9
+    def oratio
+      @oopcao[:ratio] ||= (oprobe.scan(RE3).flatten[0] || '0:1')
+    end
+
+    # @return [Integer] posicao array pastas onde procurar videos finais
+    def pos
+      # -1 #{ops[:d][0]}/#{ops[:i]}/#{ops[:o]}"
+      #  0 #{ops[:d][pos]}/#{ops[:o]}"
+      #  1 #{ops[:d][pos]}/#{ops[:o]}"
+      @pos ||= -1
+    end
+
+    # @return [String] video final absoluto
+    def onome
+      dir = ops[:d]
+      (pos == -1 ? "#{dir[0]}/#{ops[:i]}" : dir[pos]) + "/#{ops[:o]}/#{bas.downcase}.mp4"
+    end
+
+    # @return [String] mostra dados do ficheiro video final
+    def oshow
+      "# r:#{obitrate} h:#{oheight} #{oratio} #{ops[:d][pos]}/#{ops[:o]}"
+    end
+  end
+end

data/lib/evideo/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# analizar/processar videos para arquivo uniformizado
 module Evideo
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evideo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +105,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -74,8 +118,9 @@ files:
 - exe/ev
 - exe/evideo
 - lib/evideo.rb
-- lib/evideo/hrvideo.rb
-- lib/evideo/hrvprocessa.rb
+- lib/evideo/processa.rb
+- lib/evideo/vars1.rb
+- lib/evideo/vars2.rb
 - lib/evideo/version.rb
 homepage: https://github.com/hernanilr/evideo
 licenses:
@@ -89,9 +134,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/evideo/hrvideo.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-module Evideo
-  # permite analizar string output do comando sonda video
-  class HRVideo
-    # @return [String] nome do ficheiro 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 :tempo
-    # @return [String] bitrate do ficheiro video
-    attr_reader :bitrate
-
-    # Duration: 01:01:08.50, start: 0.000000, bitrate: 2228 kb/s
-    R1 = /duration:\s+(\d\d:\d\d:\d\d).*bitrate:\s+(\d+)\s+kb/i.freeze
-    # Stream #0:0: Video: h264 (Main), yuv420p(tv, bt709, progressive), 1280x720
-    # [SAR 1:1 DAR 16:9], 23.98 fps, 23.98 tbr, 1k tbn, 180k tbc (default)
-    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(fil)
-      @nome = fil
-      @ext = File.extname(fil)
-      @base = File.basename(fil, @ext).downcase
-      @tempo = '00:00:00'
-      @bitrate = 0
-      @probe = `#{cmd_probe}` if File.exist?(fil)
-      return unless @probe
-
-      tr1 = @probe.scan(R1).flatten
-      @tempo = tr1[0].to_s
-      @bitrate = tr1[1].to_i
-    end
-
-    # Parametrizar height e frame rate
-    def r2
-      return unless @probe
-
-      tr2 = @probe.scan(R2).flatten
-      @height = tr2[0].to_i
-      @fps = tr2[1].to_f
-    end
-
-    # Parametrizar aspect ratio
-    def r3
-      return unless @probe
-
-      @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
-
-      @height
-    end
-
-    # @return [String] frame rate
-    def fps
-      r2 unless @fps
-
-      @fps
-    end
-
-    # @return [String] aspect ratio
-    def ratio
-      r3 unless @ratio
-
-      @ratio
-    end
-  end
-end

data/lib/evideo/hrvprocessa.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-require 'time'
-
-module Evideo
-  # permite analizar/processar videos para arquivo
-  class HRVideo
-    # @return [String] tempo: rate:
-    def show
-      return nome unless @probe
-
-      "tempo: #{tempo} rate: #{bitrate} ratio: #{ratio} height: #{height}"
-    end
-
-    # Testa validade video original
-    #
-    # @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 "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] hrv video processado a testar validade
-    # @return [true, false] sim ou nao video esta ok
-    def vfok?(hrv)
-      return false unless File.exist?(hrv.nome) && hrv.bitrate < 3000 && Time.parse(hrv.tempo) > Time.parse(tempo) - 60
-
-      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] pot pasta destino dos videos
-    # @return [true, false] sim ou nao <local>/<video> esta ok
-    def vdok?(ary, pot)
-      if ary.empty? then false
-      elsif vfok?(HRVideo.new("#{ary.first}/#{pot}/#{base}.mp4")) then true
-      else  vdok?(ary.drop(1), pot)
-      end
-    end
-
-    # @return [String] aspect ratio comando conversao
-    def aspect
-      if ratio == '0:1' then height < 720 ? '' : ' -aspect 16:9'
-      else " -aspect #{ratio}"
-      end
-    end
-
-    # @return [String] video dimensions comando conversao
-    def dimension
-      if    height <  480 then ' -s hd480'
-      elsif height <= 720 then ' -s hd720'
-      else                     ' -s hd1080'
-      end
-    end
-
-    # @return [String] comando analise
-    def cmd_probe
-      "ffprobe -hide_banner -show_streams \"#{nome}\" 2>&1|grep -v title"
-    end
-
-    # Comando para processar videos
-    #
-    # @param [String] tempo do video processado
-    # @return [String] comando conversao
-    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
-    # @option opcoes [Array<String>] :d locais onde procurar videos
-    # @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] aot pasta destino dos videos absoluta
-    def processa(opcoes, aot)
-      return if ofok?(aot) || vdok?(opcoes[:d], opcoes[:o])
-
-      system cmd_mpeg(opcoes[:t] ? ' -t 20' : '') + " #{aot}/#{base}.mp4"
-      vfok?(HRVideo.new("#{aot}/#{base}.mp4"))
-    end
-
-    # Testa videos
-    #
-    # @param [Hash] opcoes parametrizacao
-    # @option opcoes [Array<String>] :d locais onde procurar videos
-    # @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] aot pasta destino dos videos absoluta
-    def testa(opcoes, aot)
-      return if ofok?(aot) || vdok?(opcoes[:d], opcoes[:o])
-
-      puts "ls -lh \"#{nome}\" # #{show}"
-    end
-  end
-end