arquivo 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc6dc05414fb65fee6c28b6a770014ce70e10e8b7e1f1023314b72f80e041c1
-  data.tar.gz: c99b712b8345da2729edb8074789fd894b81084f84f9b35a21315bd89527687c
+  metadata.gz: 76258c87d7c0c3a63f261359001ea4623dd00a2f53f5d4a6469fa121bd361bae
+  data.tar.gz: '02804d07fa8c7db3ba86995568ed76aa5948775e854a5d0a5159a90cf1e72f7d'
 SHA512:
-  metadata.gz: 25389c92dcf6a17335f86aec88b208c7df6f224c68d893fe7d9b7caebc65d8e242f817ff50b0caed94f205b3f94ad34e4384b88ea8e03e20a69d6776bc62dc09
-  data.tar.gz: 5f4c4feb9bf1142069e677aa567833d28cde155ee200c25258b05c5a32ad1b69111caae4be2978c7c26222482a61ec652a79af6f87b9e8b4b1bc4fab589f93cc
+  metadata.gz: 75ab73db2816fe15e4f80a8f8bdbeafa349c87dd50bb6ac53f6981e21e5349734d79461ed7a2e7b3b4dafe3b9f8fdf3bf35e5930b34132ee299ff2fdd7d6b021
+  data.tar.gz: a81b2f6d65e75608db0a22b54718e9c8433fedf6702923680568cd08384db924982f6d27b1c2aa1c3009d07a8a071dc8e6034f074d72a8785b77e34423cac3a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arquivo (0.1.8)
+    arquivo (0.1.9)
       fastimage (~> 2.1)
       google-api-client (~> 0.34)
       pdf-reader (~> 2.3)

data/lib/arquivo.rb

@@ -4,6 +4,7 @@ require 'thor'
 require 'arquivo/version'
 require 'arquivo/extrato'
 require 'arquivo/dir'
+require 'arquivo/noise'
 require 'arquivo/pdf'
 require 'arquivo/jpg'
 require 'arquivo/mp3'
@@ -15,10 +16,10 @@ module Arquivo
   class CLI < Thor
     desc 'mp3 MINUTA', 'processa MINUTA criando pasta ' \
                        'com segmentos para arquivo'
-    option :times, type: :array, default: [],
-                   desc: 'lista (hh:mm:ss) para dividir MINUTA em segmentos'
+    option :tempos, type: :array, default: [],
+                    desc: 'lista tempos para segmentar MINUTA, ex: [[h:]m:]s'
     def mp3(file)
-      return unless File.ftype(file) == 'file'
+      return unless File.exist?(file) && File.ftype(file) == 'file'
 
       f = C118mp3.new(file)
       return unless f.processa_minuta?
@@ -48,10 +49,16 @@ module Arquivo
                   desc: 'fuzz trim jpg N-1, escolhe menor -> scanned pdf'
     option :quality, type: :numeric, default: 15,
                      desc: 'compress jpg N% -> scanned pdf (less=low quality)'
+    option :nred, type: :boolean, default: true,
+                  desc: 'fazer reducao do ruido de fundo'
+    option :som, type: :numeric, default: 1.0,
+                 desc: 'minimo som que determina fim do silencio (segundos)'
+    option :amount, type: :numeric, default: 0.00001,
+                    desc: 'qtd ruido a ser removido'
     def dir(fdir)
       return unless File.ftype(fdir) == 'directory'
 
-      C118dir.new(fdir).processa_pasta(options)
+      C118dir.new(fdir).prepara(fdir, options).processa_pasta(options)
     end
   end
 end

data/lib/arquivo/dir.rb

@@ -5,8 +5,10 @@ require 'googleauth'
 require 'googleauth/stores/file_token_store'
 
 module Arquivo
-  # CO = '1>/dev/null 2>&1'
-  CO = ''
+  # O1 = '2>/dev/null'
+  # O2 = '1>/dev/null 2>&1'
+  O1 = ''
+  O2 = ''
 
   # analisar/processar pasta
   class C118dir < Enumerator
@@ -14,8 +16,13 @@ module Arquivo
     attr_reader :items
     # @return [String] documento c118
     attr_reader :item
+
     # @return [Hash] dados (faturas/recibos) de c118-contas
     attr_reader :dados
+    # @return [Float] maximo segundos de silencio encontrados
+    attr_reader :silence
+    # @return [String] noiseprof do silencio encontrado
+    attr_reader :nprof
 
     # @return [String] base nome ficheiros finais (pdf, tar.gz)
     attr_reader :base
@@ -25,8 +32,6 @@ module Arquivo
       @items = Dir.glob(File.join(pasta, '*')).each
       @base = File.basename(pasta, File.extname(pasta)) +
               Date.today.strftime('%Y%m%d')
-      obtem_dados(pasta)
-      system 'mkdir -p tmp/zip'
     end
 
     def processa_pasta(options)
@@ -55,6 +60,8 @@ module Arquivo
       case ext
       when '.jpg' then C118jpg.new(item).processa_jpg(options, dados)
       when '.pdf' then C118pdf.new(item).processa_pdf(options, dados)
+      when '.mp3', '.m4a', '.wav'
+        C118mp3.new(item).processa_mp3(options, num)
       else
         puts "erro: #{item} so posso processar mp3, jpg, pdf"
       end
@@ -67,10 +74,28 @@ module Arquivo
       @item = nil
     end
 
+    def prepara(pasta, options)
+      obtem_dados(pasta)
+      obtem_noiseprof(pasta, options)
+      system 'mkdir -p tmp/zip'
+    end
+
+    def obtem_noiseprof(dir, options)
+      return unless /minuta/i.match?(dir) || silence&.zero?
+
+      if options[:nred]
+        @silence = 0.0
+        silencio(1, duracao(item), options[:som]) while next_item
+        @nprof = noiseprof
+      end
+    rescue StandardError
+      @silence = 0.0
+    end
+
     def obtem_dados(dir)
       return unless /fac?tura/i.match?(dir) ||
                     /recibo/i.match?(dir) ||
-                    dados.empty?
+                    dados&.empty?
 
       # obtem dados (faturas/recibos) da sheet c118-contas
       id = '1PbiMrtTtqGztZMhe3AiJbDS6NQE9o3hXebnQEFdt954'

data/lib/arquivo/extrato.rb

@@ -76,7 +76,7 @@ module Arquivo
     def faz_extrato
       system "#{c118_gs} " \
         "-sOutputFile=#{base}/#{nome}-extrato.pdf " \
-        "-sPageList=#{paginas.join(',')} \"#{file}\" #{CO}"
+        "-sPageList=#{paginas.join(',')} \"#{file}\" #{O2}"
       puts "#{nome}-extrato"
       proximo_extrato
     end

data/lib/arquivo/jpg.rb

@@ -43,7 +43,7 @@ module Arquivo
 
     def parm_trim(options, fuzz)
       "-fuzz #{fuzz}% -trim +repage #{parm_qualidade(options)} " \
-        "tmp/#{key}-#{fuzz}.jpg #{CO}"
+        "tmp/#{key}-#{fuzz}.jpg #{O2}"
     end
 
     def parm_qualidade(options)
@@ -66,7 +66,7 @@ module Arquivo
     def converte(options)
       # expande jpg on a larger canvas
       system "convert \"#{file}\" #{expande} #{parm_qualidade(options)} " \
-             "-format pdf tmp/#{key}-trimed.pdf #{CO}"
+             "-format pdf tmp/#{key}-trimed.pdf #{O2}"
 
       # devolve pdf processado a partir de jpg
       C118pdf.new("tmp/#{key}-trimed.pdf")

data/lib/arquivo/mp3.rb

@@ -9,43 +9,69 @@ module Arquivo
     attr_reader :ext
     # @return [String] base do ficheiro
     attr_reader :base
-    # @return [String] key do documento ft????/rc????/ex??0??/sc??????
-    attr_reader :key
-    # @return [Integer] tamanho do mp3
+    # @return [String] final do nome do segmento
+    attr_reader :final
+    # @return [Float] segundos do mp3
     attr_reader :size
 
-    # @return [String] nome segmento
-    attr_reader :nome
-
     # @return [C118mp3] mp3 c118
     def initialize(fmp3)
       @file = fmp3
       @ext = File.extname(fmp3).downcase
       @base = File.basename(fmp3, File.extname(fmp3))
-      @key = @base[/\w+/]
-      @size = File.size(fmp3)
+      @final = "-#{@base[/\d{8}/]}#{@base[/-\w+/]}#{@ext}"
+      @size = `soxi -V0 -D #{fmp3} #{O1}`.to_f
     end
 
     def forca_mp3
       o = "tmp/#{base}.mp3"
-      system "ffmpeg -i \"#{file}\" -vn #{o} #{CO}" unless ext == '.mp3'
+      system "sox \"#{file}\" #{o} #{O2}" unless ext == '.mp3'
       File.size?(o) ? C118mp3.new(o) : self
     end
 
+    def processa_mp3
+      system processa_segmentos(Dir.glob("tmp/#{base}*#{ext}"),
+                                0, '', options[:amount])
+    end
+
+    def processa_segmentos(ase, pse, cmd, amt)
+      return cmd[1..-1] unless pse < ase.size
+
+      fls = "#{base}/s#{pse}#{final} " \
+        "tmp/s#{pse}-#{final}#{base[/-\w+/]}.mp3"
+      cmd += nprof ? ";sox #{fls} noisered #{nprof} #{ff(amt)}" : ";cp #{fls}"
+
+      processa_segmentos(ase, pse + 1, cmd, amt)
+    end
+
+    def ff(val)
+      format('%<valor>.5f', valor: val)
+    end
+
+    def segmenta(tps, pse, cmd)
+      return cmd[1..-1] unless pse < tps.size
+
+      cmd += ";sox #{file} #{base}/s#{pse}#{final} trim #{tps[pse]}"
+      pse += 1
+      cmd += " =#{tps[pse]}" if pse < tps.size
+
+      segmenta(tps, pse, cmd + " #{O2}")
+    end
+
     def processa_minuta(options)
-      forca_mp3
-      p options
+      system segmenta(['0'] + options[:tempos], 0, '')
     end
 
     def processa_minuta?
-      return true if !File.exist?(base) && File.exist?(file) &&
-                     ['.mp3', '.m4a', '.wav'].include?(ext)
+      return true if ['.mp3', '.m4a', '.wav'].include?(ext) &&
+                     !File.exist?(base)
 
       if File.exist?(base)
         puts "erro: #{base} pasta ja existe"
       else
-        puts "erro: #{file} nao consigo processar #{ext} audio"
+        puts "erro: #{file} nao consigo processar minuta"
       end
+
       false
     end
   end

data/lib/arquivo/noise.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Arquivo
+  # analisar/processar pasta
+  class C118dir < Enumerator
+    def silencio(thr, tse, som)
+      out = "tmp/silencio-#{File.basename(item)}"
+
+      system "sox #{item} #{out} " \
+             "silence 1 #{format('%<valor>.5f', valor: som)}t #{thr}% #{O2}"
+
+      return if silencio?(out, tse) || thr == 3
+
+      silencio(thr + 1, pse, tse, som)
+    end
+
+    def silencio?(fss, tse)
+      s = duracao(fss)
+      return false unless s.positive? && (tse - s > silence)
+
+      @silence = tse - s
+      @nprof = fss
+    end
+
+    def duracao(seg)
+      `soxi -V0 -D #{seg} #{O1}`.to_f
+    end
+
+    def noiseprof
+      return unless silence&.positive?
+
+      o = "tmp/prof-#{base}"
+      # obter noiseprof do silencio encontrado
+      system "sox #{nprof} #{o}#{ext} trim 0 #{silence} #{O2};" \
+             "sox #{o}#{ext} -n noiseprof #{o} #{O2}"
+
+      # so noiseprof validos sao devolvidos
+      @silence = 0.0 unless File.size?(o)
+      silence.positive? ? o : nil
+    end
+  end
+end

data/lib/arquivo/pdf.rb

@@ -21,7 +21,7 @@ module Arquivo
            "setfont (#{base}) show"
       system "#{c118_gs} -sOutputFile=tmp/stamp-#{key}.pdf -c \"#{s}\";" \
              "pdftk tmp/zip/#{base}.pdf " \
-             "stamp tmp/stamp-#{key}.pdf output #{o} #{CO}"
+             "stamp tmp/stamp-#{key}.pdf output #{o} #{O2}"
       puts key
     end
 
@@ -31,7 +31,7 @@ module Arquivo
 
       recibo = key[0] == 'r'
       # google print has better && smaller pdf then c118_gs
-      system "#{c118_gs} -sOutputFile=#{o} \"#{file}\" #{CO}" unless recibo
+      system "#{c118_gs} -sOutputFile=#{o} \"#{file}\" #{O2}" unless recibo
       # usar copia do original se processado for maior
       system "cp \"#{file}\" #{o}" if recibo || File.size(o) > size
 
@@ -108,7 +108,7 @@ module Arquivo
       # nem sempre as imagens sao jpg
       # somente utilizar a primeira
       g = Dir.glob("tmp/#{key}-???.???")
-      system "convert #{g[0]} #{o} #{CO}"
+      system "convert #{g[0]} #{o} #{O2}"
       return unless File.size(o) > LT
 
       C118jpg.new(o)

data/lib/arquivo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arquivo
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arquivo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ files:
 - lib/arquivo/extrato.rb
 - lib/arquivo/jpg.rb
 - lib/arquivo/mp3.rb
+- lib/arquivo/noise.rb
 - lib/arquivo/pdf.rb
 - lib/arquivo/version.rb
 homepage: https://github.com/ph1341c118/arquivo