ehbrs-tools 0.34.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec0a90959fd8dc48f9c799b20af55016cd219efae701640eb2060ff55ceeab9
-  data.tar.gz: 754779dd2ae2cce3b6495793c975027b6f0240997b42688fbd9d8935caba7920
+  metadata.gz: c5318bb59f255a65bf78684c4638ce923fa4f67ceafa4acf33037b86c705fd67
+  data.tar.gz: e0a413e38849986ef0ecd63fffb9cfc3ba38d887f6f80c179379978d6bf0b6a6
 SHA512:
-  metadata.gz: f2d1cf8696c59243b3b3756830ec520d762b9fce5f5ae96a94a32c95d001d7420d1fdfd2d14c771208bb3163d3761b5b312383b61a29f48c652a8d63529a9cd3
-  data.tar.gz: c9225832e1bf272b8c1a8be6bafedce2eaea075c6564d04b0912ce78fc6d63d43571c786bb65202b8651b89f3bf263dff6a42962589f9a0b52d9d40e9f01dbe1
+  metadata.gz: 807ce4c38107b8b74ab4f25af8a9b1e82a882ccb1c12dd325c356073fa09d95f57abc0220f77854001172b687e9bcb6f75083d353e886497f8b5f748c4ae0b3e
+  data.tar.gz: 9a940673ba6ee30b09748da01c8537f07cb7a59978837b3f91f2e06919b2040f834c18109d07c34fd81c0ef736d0e58dece03717ff47fede8346d6dabdcc2051

data/Gemfile.lock

@@ -1,76 +1,25 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.34.0)
+    ehbrs-tools (0.35.1)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_ruby_utils (~> 0.112)
-      ehbrs_ruby_utils (~> 0.20)
+      ehbrs_ruby_utils (~> 0.22)
       filesize (~> 0.2)
       inifile (~> 3.0)
       os (~> 1.1, >= 1.1.4)
       telegram-bot-ruby (~> 0.23)
 
-PATH
-  remote: sub/aranha-parsers
-  specs:
-    aranha-parsers (0.15.0)
-      activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.1)
-      eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-gzip (~> 0.1)
-      nokogiri (~> 1.14)
-      ofx-parser (~> 1.1)
-
-PATH
-  remote: sub/aranha-selenium
-  specs:
-    aranha-selenium (0.5.0)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
-      selenium-webdriver (~> 3.142, >= 3.142.7)
-
-PATH
-  remote: sub/aranha
-  specs:
-    aranha (0.19.0)
-      aranha-parsers (~> 0.15)
-      aranha-selenium (~> 0.5)
-      eac_ruby_utils (~> 0.112)
-
-PATH
-  remote: sub/eac_cli
-  specs:
-    eac_cli (0.30.1)
-      colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.112)
-
-PATH
-  remote: sub/eac_docker
-  specs:
-    eac_docker (0.6.0)
-      eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.3, >= 0.3.2)
-
 PATH
   remote: sub/eac_rest
   specs:
-    eac_rest (0.7.0)
+    eac_rest (0.7.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
       faraday (~> 2.7, >= 2.7.4)
       faraday-multipart (~> 1.0, >= 1.0.4)
 
-PATH
-  remote: sub/eac_ruby_base0
-  specs:
-    eac_ruby_base0 (0.17.3)
-      avm-eac_ruby_base1 (~> 0.29)
-      eac_cli (~> 0.30, >= 0.30.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-
 PATH
   remote: sub/eac_ruby_utils
   specs:
@@ -81,21 +30,15 @@ PATH
       filesize (~> 0.2)
       net-ssh (~> 4.2)
 
-PATH
-  remote: sub/eac_templates
-  specs:
-    eac_templates (0.3.2)
-      eac_config (~> 0.11, >= 0.11.1)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
-
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.20.0)
+    ehbrs_ruby_utils (0.22.0)
       aranha (~> 0.19)
       aranha-parsers (~> 0.15)
       avm (~> 0.62)
       eac_fs (~> 0.16)
+      eac_rest (~> 0.7, >= 0.7.1)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
       taglib-ruby (~> 1.1, >= 1.1.3)
@@ -112,6 +55,21 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    aranha (0.19.0)
+      aranha-parsers (~> 0.15)
+      aranha-selenium (~> 0.5)
+      eac_ruby_utils (~> 0.112)
+    aranha-parsers (0.15.0)
+      activesupport (>= 4.0.0)
+      addressable (~> 2.8, >= 2.8.1)
+      eac_ruby_utils (~> 0.112)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-gzip (~> 0.1)
+      nokogiri (~> 1.14)
+      ofx-parser (~> 1.1)
+    aranha-selenium (0.5.0)
+      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      selenium-webdriver (~> 3.142, >= 3.142.7)
     ast (2.4.2)
     avm (0.62.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
@@ -179,9 +137,16 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
     dry-inflector (1.0.0)
+    eac_cli (0.30.1)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.12)
+      eac_ruby_utils (~> 0.112)
     eac_config (0.12.0)
       addressable (~> 2.8, >= 2.8.1)
       eac_ruby_utils (~> 0.107)
+    eac_docker (0.6.0)
+      eac_ruby_utils (~> 0.112)
+      eac_templates (~> 0.3, >= 0.3.2)
     eac_fs (0.16.0)
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
@@ -189,12 +154,20 @@ GEM
     eac_git (0.14.0)
       eac_ruby_utils (~> 0.107)
       parseconfig (~> 1.1, >= 1.1.2)
+    eac_ruby_base0 (0.17.3)
+      avm-eac_ruby_base1 (~> 0.29)
+      eac_cli (~> 0.30, >= 0.30.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.112)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
+    eac_templates (0.3.2)
+      eac_config (~> 0.11, >= 0.11.1)
+      eac_ruby_utils (~> 0.102, >= 0.102.1)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -205,12 +178,11 @@ GEM
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
     filesize (0.2.0)
-    git (1.13.1)
+    git (1.13.2)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)
-    httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -220,7 +192,7 @@ GEM
     minitest (5.17.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.14.0-x86_64-linux)
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -240,7 +212,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -293,16 +265,9 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aranha!
-  aranha-parsers!
-  aranha-selenium!
-  eac_cli!
-  eac_docker!
   eac_rest!
-  eac_ruby_base0!
   eac_ruby_gem_support (~> 0.3)
   eac_ruby_utils!
-  eac_templates!
   ehbrs-tools!
   ehbrs_ruby_utils!
 

data/lib/ehbrs/tools/runner/videos/languages/file_runner.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Videos
+        class Languages
+          class FileRunner
+            enable_simple_cache
+            enable_speaker
+            common_constructor :runner, :file do
+              run
+            end
+
+            private
+
+            def run
+              start_banner
+              extract_check || delete_check
+            end
+
+            def start_banner
+              infov 'File', file
+              infov "  * Tracks (#{tracks.count})", tracks.map(&:to_label).join(', ')
+              infov "  * Languages (#{languages.count})", languages.map(&:to_label).join(', ')
+            end
+
+            def tracks_uncached
+              audios_if_selected + subtitles_if_selected
+            end
+
+            def audios_if_selected
+              return [] unless runner.include_audios?
+
+              container.audios.map do |s|
+                ::Ehbrs::Tools::Runner::Videos::Languages::Track.new(runner, s, file)
+              end
+            end
+
+            def subtitles_if_selected
+              return [] unless runner.include_subtitles?
+
+              container.subtitles.map do |s|
+                ::Ehbrs::Tools::Runner::Videos::Languages::Track.new(runner, s, file)
+              end
+            end
+
+            def included_tracks_uncached
+              tracks.select(&:included?)
+            end
+
+            def container_uncached
+              ::EhbrsRubyUtils::Videos::Container.new(file)
+            end
+
+            def track_label(track)
+              track.to_s.green
+            end
+
+            def languages_uncached
+              ::Set.new(
+                tracks.map do |s|
+                  ::Ehbrs::Tools::Runner::Videos::Languages::Language.new(runner, s.language)
+                end
+              ).to_a.sort
+            end
+
+            def delete_check
+              return unless runner.delete?
+
+              infov 'Delete args', ::Shellwords.join(delete_tracks_job_args)
+              delete_tracks_job.run
+            end
+
+            def delete_tracks_job_uncached
+              ::EhbrsRubyUtils::Videos::ConvertJob.new(file, delete_tracks_job_args)
+            end
+
+            def delete_tracks_job_args
+              %w[-map 0] + tracks.flat_map(&:delete_ffmpeg_args) + %w[-c copy]
+            end
+
+            def extract_check
+              return false unless runner.extract?
+
+              unless included_tracks.any?
+                infom 'No selected tracks'
+                return true
+              end
+
+              infov 'Extract args', ::Shellwords.join(extract_tracks_job_args)
+              extract_tracks_command.system!
+              true
+            end
+
+            def extract_tracks_job_args
+              ['-txt_format', 'text', '-i', file] + tracks.flat_map(&:extract_ffmpeg_args)
+            end
+
+            def extract_tracks_command_uncached
+              ::Ehbrs::Executables.ffmpeg.command(*extract_tracks_job_args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/videos/languages/labelized.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Videos
+        class Languages
+          class Labelized < ::SimpleDelegator
+            attr_reader :runner
+
+            def initialize(runner, object)
+              @runner = runner
+              super(object)
+            end
+
+            def to_label
+              return to_s unless runner.keep_languages?
+
+              to_s.colorize(runner.keep_languages.include?(language) ? :green : :red)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/videos/languages/language.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ehbrs/tools/runner/videos/languages/labelized'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Videos
+        class Languages
+          class Language < ::Ehbrs::Tools::Runner::Videos::Languages::Labelized
+            def to_s
+              __getobj__
+            end
+
+            def language
+              __getobj__
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/videos/languages/track.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ehbrs/tools/runner/videos/languages/labelized'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Videos
+        class Languages
+          class Track < ::Ehbrs::Tools::Runner::Videos::Languages::Labelized
+            BLANK_LANGUAGE = 'BLANK'
+
+            attr_reader :file
+
+            def initialize(runner, object, file)
+              super(runner, object)
+              @file = file
+            end
+
+            def delete_ffmpeg_args
+              return [] if included?
+
+              ['-map', "-0:#{index}"]
+            end
+
+            def extract_ffmpeg_args
+              return [] unless included?
+
+              ['-map', "0:#{index}", extract_target]
+            end
+
+            def included?
+              runner.keep_languages.include?(language)
+            end
+
+            def language
+              language_with_title.presence || BLANK_LANGUAGE
+            end
+
+            def extract_target
+              file.basename_sub('.*') { |b| "#{b}.#{language}_#{index}.srt" }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/videos/languages.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+require 'ehbrs/executables'
+require 'ehbrs_ruby_utils/videos/container'
+require 'ehbrs_ruby_utils/videos/convert_job'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Videos
+        class Languages
+          runner_with :help, :filesystem_traverser do
+            desc 'Lê e modifica trilhas com idiomas de um vídeo.'
+            bool_opt '-a', '--audios', 'Seleciona áudios.'
+            bool_opt '-d', '--delete', 'Remove trilhas selecionadas.'
+            bool_opt '-e', '--extract', 'Extrai trilhas selecionadas'
+            arg_opt '-k', '--keep', 'Mantém legendas com o idioma especificado.', repeat: true
+            bool_opt '-s', '--subtitles', 'Seleciona legendas.'
+          end
+
+          def keep_languages?
+            keep_languages.any?
+          end
+
+          delegate :delete?, :extract?, to: :parsed
+
+          def run
+            infov 'Keep', keep_languages
+            all_languages_banner
+          end
+
+          def keep_languages
+            parsed.keep.map(&:strip).reject(&:blank?)
+          end
+
+          def include_audios?
+            parsed.audios?
+          end
+
+          def include_subtitles?
+            parsed.subtitles?
+          end
+
+          def traverser_check_file(file)
+            @files << ::Ehbrs::Tools::Runner::Videos::Languages::FileRunner.new(self, file)
+          end
+
+          private
+
+          def all_languages_uncached
+            ::Set.new(files.flat_map(&:languages)).to_a.sort
+          end
+
+          def all_languages_banner
+            infov 'Languages', all_languages.count
+            all_languages.each do |language|
+              infov '  * ', language.to_label
+            end
+          end
+
+          def files_uncached
+            @files = []
+            run_filesystem_traverser
+            @files
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/web_utils/videos/download.rb

@@ -61,10 +61,6 @@ module Ehbrs
             end
 
             def data_uncached
-              ::JSON.parse(raw_content)
-            end
-
-            def raw_content
               runner_context.call(:instance).http_request('/videos/files/export').body
             end
           end

data/lib/ehbrs/tools/runner/web_utils/videos/upload.rb

@@ -24,7 +24,7 @@ module Ehbrs
               infom "Uploading \"#{type}\" files list..."
               files_list_path = send("#{type}_files_list")
               infov 'Path', files_list_path
-              process_response(upload_request(files_list_path))
+              process_response(files_list_path)
             end
 
             def upload_request(files_list_path)
@@ -40,16 +40,11 @@ module Ehbrs
               )
             end
 
-            def process_response(response)
-              infov 'Response status', response.status
-              if response.status == 200
-                pp ::JSON.parse(response.body)
-              else
-                error_file = '/tmp/ehbrsutils.html'
-                ::File.write(error_file, response.body)
-                system('firefox', error_file)
-                fatal_error('Retornou com status de erro: ' + error_file)
-              end
+            def process_response(files_list_path)
+              upload_request(files_list_path).body
+            rescue ::EhbrsRubyUtils::WebUtils::RequestError => e
+              system('firefox', e.body_file_path.to_path)
+              fatal_error('Retornou com erro: ' + e.message)
             end
 
             def series_files_list_uncached

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.34.0'
+    VERSION = '0.35.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,11 @@ files:
 - lib/ehbrs/tools/runner/vg/wii.rb
 - lib/ehbrs/tools/runner/videos.rb
 - lib/ehbrs/tools/runner/videos/extract.rb
+- lib/ehbrs/tools/runner/videos/languages.rb
+- lib/ehbrs/tools/runner/videos/languages/file_runner.rb
+- lib/ehbrs/tools/runner/videos/languages/labelized.rb
+- lib/ehbrs/tools/runner/videos/languages/language.rb
+- lib/ehbrs/tools/runner/videos/languages/track.rb
 - lib/ehbrs/tools/runner/videos/opensubtitles.rb
 - lib/ehbrs/tools/runner/videos/probe.rb
 - lib/ehbrs/tools/runner/videos/series.rb