evideo 0.1.4 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbacc62b58b0bfda756ed9ab6dd805d7ed2f83f53ad4b9a473380c333a03fa36
-  data.tar.gz: cdac5c566f42e62025b9f1eca06c633d676725e7c47bdaf56efd30eb35ec32fa
+  metadata.gz: ebefc113933dc1cc99fab42d3aecd5b907231b2bcf70d9364572305e303a5554
+  data.tar.gz: e68bd951fd8912ceea23ec54a4a3774f2234ae505e6b065e9c20b3bd9ed18fcd
 SHA512:
-  metadata.gz: 1a70f3e4b577446166522283413fedeaa0c4e080628ffe8ec050ce544be7df72ccd30a90a0c33338e5b7b4e5e256dba7db0eb67c86f3d931b42e0142ba61a10d
-  data.tar.gz: 76bf6aa4ee171e44d58ef4c9a5401361a7a186b550c03f4a58beda77fc7d8cbc163a0eb7d21312ca95fc157376757e993a562698ad407023e3ca402bd99e250b
+  metadata.gz: e8690ca607ae90682154d61498c1236aa4f1433527c07be0dd4b0a73c7b7a3f2c04f3e5804e033ead09b49ccb9aa39469466a284c65a897e2e4bbcff4bddfd10
+  data.tar.gz: f03bea64673a278436199ba8c623a57d84448103e277cfeda18e9532485bb70e44441f9015149d2b8cea5536e8066660efd07715f202a2552caa6ea8df40b50a

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    evideo (0.1.4)
-      thor (~> 0.1)
+    evideo (0.2.1)
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.5.0)
-    thor (0.20.3)
+    rake (13.0.1)
+    thor (1.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler
   evideo!
-  rake (~> 10.0)
+  rake
 
 BUNDLED WITH
-   1.17.2
+   2.1.2

data/evideo.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'thor', '~> 0.1'
+  spec.add_dependency 'thor'
 end

data/exe/evideo

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

data/lib/evideo.rb

@@ -13,27 +13,35 @@ module Evideo
     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 :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
     def conv
-      dar = options[:d]
-      Dir.glob("#{dar.first}/#{options[:i]}/*.???").sort.each do |f|
-        HRVideo.new(f).processa(dar, options[:o], dar.first)
+      Dir.glob("#{fin}/c*.???").sort.each do |f|
+        HRVideo.new(f).processa(options, fout)
       end
     end
 
     desc 'test', 'testa videos'
     # Analisa videos
     def test
-      dar = options[:d]
-      Dir.glob("#{dar.first}/#{options[:i]}/*.???").sort.each do |f|
-        HRVideo.new(f).testa(dar, options[:o])
+      Dir.glob("#{fin}/c*.???").sort.each do |f|
+        HRVideo.new(f).testa(options, fout)
       end
     end
     default_task :conv
+    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]}"
+      end
+    end
   end
 end

data/lib/evideo/hrvideo.rb

@@ -13,6 +13,8 @@ module Evideo
     attr_reader :duration
     # @return [String] bitrate do ficheiro video
     attr_reader :bitrate
+    # @return [String] frequencia audio do ficheiro video
+    attr_reader :audio
 
     # 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
@@ -21,6 +23,9 @@ 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
@@ -28,11 +33,11 @@ module Evideo
       @base = File.basename(fvideo, @ext).downcase
       @duration = '00:00:00'
       @bitrate = 0
-      @probe = `#{probe}` if File.exist?(fvideo)
+      @probe = `#{cmd_probe}` if File.exist?(fvideo)
       return unless @probe
 
       tr1 = @probe.scan(R1).flatten
-      @duration = tr1[0]
+      @duration = tr1[0].to_s
       @bitrate = tr1[1].to_i
     end
 
@@ -52,6 +57,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

@@ -9,17 +9,19 @@ module Evideo
     def show
       return video unless @probe
 
-      "tempo: #{duration} rate: #{bitrate}"
+      "tempo: #{duration} 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 esta ok
-    def ofok?
-      return false unless (bitrate < 3000 && ext == '.mp4') ||
-                          Time.parse(duration) < Time.parse('00:01:00')
+    def ofok?(aot)
+      return false unless (bitrate < 3000 && ext == '.mp4') || Time.parse(duration) < Time.parse('00:01:00')
+      return false unless ratio == '16:9' && height > 480
+      return false unless audio == 0
 
-      puts "rm \"#{video}\" # #{show}"
+      puts "mv \"#{video} #{aot}/#{base}.mp4\" # #{show}"
       true
     end
 
@@ -29,8 +31,7 @@ module Evideo
     # @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
+                          file.bitrate < 3000  && Time.parse(file.duration) > Time.parse(duration) - 60
 
       puts "rm \"#{video}\" # #{file.video} #{file.show}"
       true
@@ -39,45 +40,41 @@ module Evideo
     # 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 bitrate < 720 ? '' : ' -aspect 16:9'
+      if ratio == '0:1' then height < 720 ? '' : ' -aspect 16:9'
       else                   " -aspect #{ratio}"
       end
     end
 
     # @return [String] video dimensions comando conversao
     def dimension
-      if    bitrate <  480 then ' -s hd480'
-      elsif bitrate <= 720 then ' -s hd720'
-      else                      ' -s hd1080'
+      if    height <  480 then ' -s hd480'
+      elsif height <= 720 then ' -s hd720'
+      else                     ' -s hd1080'
       end
     end
 
     # @return [String] comando analise
-    def probe
+    def cmd_probe
       "ffprobe -hide_banner -show_streams \"#{video}\" 2>&1|grep -v title"
     end
 
+    # Comando para processar videos
+    #
+    # @param [String] tempo do video processado
     # @return [String] comando conversao
-    def mpeg
+    def cmd_mpeg(tempo)
+      puts "processar #{base}.mp4 -r #{[fps, 25].min} -b:v #{[bitrate, 2000].min}k" + dimension + aspect + tempo
       "ffmpeg #{geral} -i \"#{video}\" -y -an " +
         # framerate & bitrate
         "-r #{[fps, 25].min} -b:v #{[bitrate, 2000].min}k" +
@@ -85,28 +82,42 @@ module Evideo
         ' -metadata title= -metadata artist= -metadata comment=' \
         ' -metadata major_brand= -metadata compatible_brands=' +
         # para teste produz somente segundos
-        # ' -t 20' \
+        tempo
+    end
+
+    # @return [String] opcoes gerais comando conversao
+    def geral
+      '-loglevel quiet -hide_banner' +
+        # para ignorar segundos no inicio
+        # ' -ss 15' \
         ''
     end
 
     # Processa videos
     #
-    # @param [Array<String>] dar locais onde procurar videos
-    # @param [String] out pasta destino dos videos
-    # @param [String] din pasta origem dos videos
-    def processa(dar, out, din)
-      return if ofok? || vdok?(dar, out)
-
-      system mpeg + " #{din}/#{out}/#{base}.mp4"
-      vfok?(HRVideo.new("#{din}/#{out}/#{base}.mp4"))
+    # @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 [Array<String>] dar locais onde procurar videos
-    # @param [String] out pasta destino dos videos
-    def testa(dar, out)
-      return if ofok? || vdok?(dar, out)
+    # @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 \"#{video}\" # #{show}"
     end

data/lib/evideo/version.rb

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

metadata

@@ -1,63 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: evideo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.1
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   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:
 - hernanirvaz@gmail.com
 executables:
 - ev
+- evideo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -71,6 +72,7 @@ files:
 - bin/setup
 - evideo.gemspec
 - exe/ev
+- exe/evideo
 - lib/evideo.rb
 - lib/evideo/hrvideo.rb
 - lib/evideo/hrvprocessa.rb
@@ -96,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.