ehbrs-tools 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63748225b0c7e543d9294367c0cc6dae66a1d7c3c8c1149894e2a966516095c1
-  data.tar.gz: 2145d3e7fed0cae5ebaa838c318b106576021947937a6e7935394e63a0a8fc80
+  metadata.gz: d0db0050f90e36dc79b898e1d7b7aebf2586c85c8fd3df674f03035d802484d3
+  data.tar.gz: 789d052e717913eae662e59fe1f9975d2960d2ba8e31cc087c6fefa42d79dcd8
 SHA512:
-  metadata.gz: 0c275d490fd1df345bb785c4bc2d3a04701ee1105bbd3705538dc287865b5c1cfd6b817be7a53c11028ca70068f8bc0d792c753bf4e594f4691b0980b03f680f
-  data.tar.gz: 6e5e0e9fe837702e4b3839263fcf7922757a8c6ac42818ef66273184a41320ca43c0dd6b6accb83682f836d52b3026913c5840422baa3ed56004c58234a19e0e
+  metadata.gz: 9de584955eacbd3ff6884ef57bf3c14a90b462dfb15b816cd08fa297fa94b9a9b82b77a7c31a8871ae37f2dc0a09d7786f074a576219404dbec6a83485a07a1b
+  data.tar.gz: 3a648b506ac3867457dede4027da13fb85e76b6a367ba296f012b391f968e5bd6ec848d1aab3e70dce80f953c842161f9b9b6f65ce1d8adf8f8cb035938f8c9c

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.36.0)
+    ehbrs-tools (0.37.0)
       avm-tools (~> 0.156)
       eac_cli (~> 0.38)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
-      ehbrs_ruby_utils (~> 0.33)
+      ehbrs_ruby_utils (~> 0.35)
       filesize (~> 0.2)
       inifile (~> 3.0)
       os (~> 1.1, >= 1.1.4)
@@ -14,11 +14,11 @@ PATH
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.33.0)
+    ehbrs_ruby_utils (0.35.0)
       aranha (~> 0.19, >= 0.19.2)
       aranha-parsers (~> 0.21)
       aranha-selenium (~> 0.7)
-      avm (~> 0.79)
+      avm (~> 0.80)
       dentaku (~> 3.5, >= 3.5.1)
       eac_fs (~> 0.16)
       eac_rest (~> 0.10)

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

@@ -2,8 +2,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_base0/core_ext'
-require 'ehbrs_ruby_utils/videos/opensubtitles/processors/episode'
-require 'ehbrs_ruby_utils/videos/opensubtitles/processors/title'
+require 'ehbrs_ruby_utils/videos/opensubtitles/processors/subtitles_provider'
 
 module Ehbrs
   module Tools
@@ -13,7 +12,6 @@ module Ehbrs
           runner_with :help, :output do
             arg_opt '-C', '--target-path', 'Caminho para extração dos arquivos', default: '.'
             bool_opt '-H', '--html', 'Formata URLs como links HTML.'
-            bool_opt '-e', '--episode', 'Processa como episódio em vez de título.'
             bool_opt '-d', '--download', 'Baixa os links em vez mostrá-los.'
             pos_arg :url
           end
@@ -38,23 +36,9 @@ module Ehbrs
           end
 
           def subtitles_uncached
-            if parsed.episode?
-              subtitles_from_episode
-            else
-              subtitles_from_title
-            end
-          end
-
-          def subtitles_from_episode
-            ::EhbrsRubyUtils::Videos::Opensubtitles::Processors::Episode
-              .new(parsed.url, target_path: parsed.target_path)
-              .subtitles
-          end
-
-          def subtitles_from_title
-            ::EhbrsRubyUtils::Videos::Opensubtitles::Processors::Title
-              .new(parsed.url, target_path: parsed.target_path)
-              .episodes.flat_map(&:subtitles)
+            r = subtitles_provider.subtitles
+            infov 'Subtitles found', r.count
+            r
           end
 
           def format_url(url)
@@ -62,6 +46,12 @@ module Ehbrs
 
             "<a href=\"#{url}\">#{url}</a><br/>"
           end
+
+          # @return [EhbrsRubyUtils::Videos::Opensubtitles::Processors::SubtitlesProvider]
+          def subtitles_provider_uncached
+            ::EhbrsRubyUtils::Videos::Opensubtitles::Processors::SubtitlesProvider
+              .new(parsed.url, target_path: parsed.target_path)
+          end
         end
       end
     end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.36.0'
+    VERSION = '0.37.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -294,21 +294,21 @@ 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_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/fs/used_space_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/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/spec_helper.rb
 - spec/code/rubocop_spec.rb
-- spec/spec_helper/videos_files/stub_source.mp4
-- spec/spec_helper/videos.rb
 - ".rubocop.yml"
 - ".rspec"