ehbrs-tools 0.33.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0728c0fbad8fab193328dd043e9cf25bfef615b8b2e52d3074c863891b927768'
-  data.tar.gz: 47ae7d7c0043ae8d8acabd50162164f60d6e04382dfb0aabefc18348749ddc33
+  metadata.gz: d78056d7a130e8950f026ebe3cf1665570287c56b1786c90d5d5b534d27ce2e2
+  data.tar.gz: e1ddc5d688b88dccc0e744763972c67558d75e403e8d25b26c9c16b8318ebd59
 SHA512:
-  metadata.gz: ab4f85fcf64f335ad87bbcdcbafaa67ffd5fa28b9f2704cd2a0e1b6cdae0f8fa3d0f75baca2bb5eb1edef2be3f57dd48e9cbfc19a75c40b5e4e5301b226f614f
-  data.tar.gz: d0865c776d105d97e91c24a8a5de73d13bfe4cde450580944644cacb8ec27e8b63ec87031e67578612de2881f91de2a6aa20992f0ad839be271d9aa6044c569e
+  metadata.gz: 86648f427adaa4a9b107f12b650332b281455652597c1ab1fc232ca49842b79524c9d2c27ed4077f3e18e03fc63f56e5e7a56963bce5b5ad3699eaea2aa04f30
+  data.tar.gz: b09cbfad7a04969b3cdd4bb616c9ca0de828b654633e0bc3473b9a893923546b30f058541b57132ae5cb8924506a720aa4427d983564088aa4d84894ee4f053e

data/Gemfile

@@ -10,7 +10,5 @@ gemspec
   gem ::File.basename(dir), path: dir, require: false
 end
 
-gem 'httpclient', git: 'https://github.com/livelink/httpclient.git'
-
 local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
 eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/Gemfile.lock

@@ -1,28 +1,15 @@
-GIT
-  remote: https://github.com/livelink/httpclient.git
-  revision: 3efedc65787366d4c1936ea0c0247202a5a2ad99
-  specs:
-    httpclient (2.8.5)
-
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.33.0)
+    ehbrs-tools (0.35.0)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_ruby_utils (~> 0.112)
-      ehbrs_ruby_utils (~> 0.19)
+      ehbrs_ruby_utils (~> 0.21)
       filesize (~> 0.2)
       inifile (~> 3.0)
       os (~> 1.1, >= 1.1.4)
-      telegram-bot-ruby (~> 0.19, >= 0.19.2)
-
-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)
+      telegram-bot-ruby (~> 0.23)
 
 PATH
   remote: sub/eac_cli
@@ -39,6 +26,15 @@ PATH
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
+PATH
+  remote: sub/eac_rest
+  specs:
+    eac_rest (0.7.0)
+      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:
@@ -68,12 +64,12 @@ PATH
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.19.0)
-      aranha (~> 0.18)
-      aranha-parsers (~> 0.14, >= 0.14.4)
+    ehbrs_ruby_utils (0.21.0)
+      aranha (~> 0.19)
+      aranha-parsers (~> 0.15)
       avm (~> 0.62)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.111)
+      eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
       taglib-ruby (~> 1.1, >= 1.1.3)
       ultimate_lyrics (~> 0.1, >= 0.1.3)
@@ -89,20 +85,21 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha (0.18.0)
-      aranha-parsers (~> 0.14, >= 0.14.3)
+    aranha (0.19.0)
+      aranha-parsers (~> 0.15)
       aranha-selenium (~> 0.5)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
-      httpclient (~> 2.8, >= 2.8.3)
-    aranha-parsers (0.14.4)
+      eac_ruby_utils (~> 0.112)
+    aranha-parsers (0.15.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.1)
-      curb (~> 0.9, >= 0.9.11)
-      eac_ruby_utils (~> 0.106)
+      eac_ruby_utils (~> 0.112)
+      faraday (~> 2.7, >= 2.7.4)
       faraday-gzip (~> 0.1)
-      faraday_middleware (~> 1.2)
-      nokogiri (~> 1.13, >= 1.13.9)
+      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)
@@ -186,34 +183,15 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
     faraday-gzip (0.1.0)
       faraday (>= 1.0)
       zlib (~> 2.1)
-    faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-net_http (3.0.2)
     filesize (0.2.0)
     git (1.13.1)
       addressable (~> 2.8)
@@ -229,7 +207,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)
@@ -279,12 +257,13 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     taglib-ruby (1.1.3)
-    telegram-bot-ruby (0.19.2)
+    telegram-bot-ruby (0.23.0)
       dry-inflector
-      faraday (~> 1.0)
+      faraday (~> 2.0)
+      faraday-multipart (~> 1.0)
       virtus (~> 2.0)
     thread_safe (0.3.6)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     ultimate_lyrics (0.1.3)
       aranha-parsers (~> 0.10)
@@ -301,16 +280,15 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  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!
-  httpclient!
 
 BUNDLED WITH
    2.3.26

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/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.33.0'
+    VERSION = '0.35.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-02-01 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.19'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -132,20 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -226,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
@@ -334,33 +333,33 @@ signing_key:
 specification_version: 4
 summary: Tools for EHB/RS.
 test_files:
-- spec/spec_helper.rb
+- spec/spec_helper/videos_files/stub_source.mp4
+- spec/spec_helper/videos.rb
 - spec/lib/ehbrs/observers/base_spec.rb
+- spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb
+- spec/lib/ehbrs/tools/runner/videos/unsupported_spec.rb
+- spec/lib/ehbrs/tools/runner/videos/probe_spec.rb
+- spec/lib/ehbrs/tools/runner/videos/probe_spec_files/fixed.target.yaml
+- spec/lib/ehbrs/tools/runner/videos/unsupported_spec_files/dts_audio.probe.yaml
+- spec/lib/ehbrs/tools/runner/vg/ips_spec.rb
+- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/expected.rom
+- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/source.rom
+- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/patch_1.ips
+- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/patch_0.ips
+- spec/lib/ehbrs/tools/runner_spec.rb
+- spec/lib/ehbrs/cooking_book/recipe/measure_spec.rb
 - spec/lib/ehbrs/vg/wii/wit/path_spec.rb
 - spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec.rb
-- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/pikmin2_pal_iso.source.witdump
-- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/resident_evil_code_veronica_disc2_iso.target.yaml
 - spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/pikmin2_pal_iso.target.yaml
+- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/resident_evil_code_veronica_disc2_iso.source.witdump
+- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/pikmin2_R92P01_wia.source.witdump
 - spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/super_mario_galaxy_wbfs.target.yaml
+- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/resident_evil_code_veronica_disc2_iso.target.yaml
 - spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/super_mario_galaxy_wbfs.source.witdump
 - spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/pikmin2_R92P01_wia.target.yaml
-- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/resident_evil_code_veronica_disc2_iso.source.witdump
-- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/pikmin2_R92P01_wia.source.witdump
+- spec/lib/ehbrs/vg/wii/wit/parsers/dump_spec_files/pikmin2_pal_iso.source.witdump
 - spec/lib/ehbrs/vg/wii/game_file_spec.rb
-- spec/lib/ehbrs/cooking_book/recipe/measure_spec.rb
-- spec/lib/ehbrs/tools/runner_spec.rb
-- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/source.rom
-- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/patch_1.ips
-- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/patch_0.ips
-- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/expected.rom
-- spec/lib/ehbrs/tools/runner/vg/ips_spec.rb
-- spec/lib/ehbrs/tools/runner/videos/unsupported_spec.rb
-- spec/lib/ehbrs/tools/runner/videos/unsupported_spec_files/dts_audio.probe.yaml
-- spec/lib/ehbrs/tools/runner/videos/probe_spec.rb
-- spec/lib/ehbrs/tools/runner/videos/probe_spec_files/fixed.target.yaml
-- spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb
+- spec/spec_helper.rb
 - spec/code/rubocop_spec.rb
-- spec/spec_helper/videos_files/stub_source.mp4
-- spec/spec_helper/videos.rb
 - ".rubocop.yml"
 - ".rspec"