evideo 0.1.6 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6684b246f68df6bfd190e7e7457c36d37da992672f27624f60ec5a399d278d8f
-  data.tar.gz: aeede4e70657db0ba2a022456d416daa144ed2da314cffcb72d5b87b564281d1
+  metadata.gz: 0fe87ef3039e980666caeead4fd819fca47f1afd538e604b10b880b7935b6a8d
+  data.tar.gz: 66ca91c021e17d30222c027d0c7a7ae48965b6910cc21cc80bbde4f6de6275cf
 SHA512:
-  metadata.gz: 1b016f415375ee9f3edbb7a2fc4dda036c9e6a61359653a5f7674f027dc66084ed30b9b0c845338bfeca0cce0b89f8d99aefbe99622161844e3515a7e54efa3b
-  data.tar.gz: 527f378ce202a8f28dce56a29c1a84e8094598e99493af5fcedcc861317850f179e2bf784fb0b2366be2d06cef7c4514c4f6bde93513bf064de0625ea8b79303
+  metadata.gz: 47548decc1ff1af5ac40ec347e495def27ac353bd93a2ca05297d26e53aeb6f96fb24178a837f25ad683c2cd2a9eff03c3e21e1040e265a9706b0afcf5185eb2
+  data.tar.gz: 9cc43cd70a17dddf46fcaa56c5cff8ec7d40d41d7ac460a95ac5b7874c5cfb01e2d28994fbb81057c988dfbcc57e9d5bfdee79f0ca176ab9ed1ad56f5cf60c14

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    evideo (0.1.6)
-      thor (~> 0.1)
+    evideo (0.2.3)
+      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/lib/evideo.rb

@@ -13,13 +13,10 @@ 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'
+    option :t, type: :boolean, default: false, desc: 'Processa somente segundos para teste'
     # Processa videos
     def conv
       Dir.glob("#{fin}/*.???").sort.each do |f|
@@ -31,7 +28,7 @@ module Evideo
     # 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

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,7 +33,7 @@ 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
@@ -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

@@ -14,13 +14,14 @@ module Evideo
 
     # 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
 
@@ -30,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
@@ -40,23 +40,15 @@ 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 height < 720 ? '' : ' -aspect 16:9'
@@ -73,15 +65,16 @@ module Evideo
     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 processato
+    # @param [String] tempo do video processado
     # @return [String] comando conversao
-    def mpeg(tempo)
+    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" +
@@ -92,6 +85,14 @@ module Evideo
         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 [Hash] opcoes parametrizacao
@@ -99,12 +100,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,8 +115,9 @@ 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}"
     end

data/lib/evideo/version.rb

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

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: evideo
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.3
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-02 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:
@@ -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.