ehbrs-tools 0.39.0 → 0.39.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05eba951b36f326e76fa27e5264caecd9533f10ce8ec1f3775c6b6b10be3678b
-  data.tar.gz: 1c6caca39da80381d76cd9cee1f8f40989b428d19e3a0d749e7cbf9fdb4f99b1
+  metadata.gz: 37d5bc6d09fd99c2b19fac22bbebd6c6817d88f1542d9eea927f7d40189be1b6
+  data.tar.gz: ae180d116b7de37be4e2f9a38aa9b06daa0ac6ef31631ed9c151ee46a140ee5e
 SHA512:
-  metadata.gz: 38e39c046a9c1ba26c2624d3ba7769100ad1b4941c1bdac7eaa58d48d2d75da80d02c75fb99d94051498cd6efb245f650139ef70df978a4111e7327e4a118595
-  data.tar.gz: acbaed41a43a3e7a9c9dea2afdddaf2704eee2033f208e3d400b739a484ba15c832f4c1fffafdd36d4797391d4d78762824c2d4a8481ed77711245515c27c07a
+  metadata.gz: f1294ab961b7a4ef0193cb25a582eea593930bdd9afb51850e2956c775de0094ad768a40b70e9f029285ee6880ee219294207f57a52156458e31c403000102c6
+  data.tar.gz: cdc973943f214f78198c8f8d31052b21a03c1c6b3dd51c9758b43fc55049063f691ac6181249f45688484f90bde0b177fd91c5d1f3b08d623861582b38736560

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.39.0)
+    ehbrs-tools (0.39.1)
       avm-tools (~> 0.159)
       eac_cli (~> 0.40)
       eac_ruby_utils (~> 0.120)
-      ehbrs_ruby_utils (~> 0.38)
+      ehbrs_ruby_utils (~> 0.41)
       filesize (~> 0.2)
       os (~> 1.1, >= 1.1.4)
       telegram-bot-ruby (~> 0.23)
@@ -22,14 +22,14 @@ PATH
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.38.0)
+    ehbrs_ruby_utils (0.41.0)
       aranha (~> 0.19, >= 0.19.2)
       aranha-parsers (~> 0.22)
-      aranha-selenium (~> 0.7)
+      aranha-selenium (~> 0.8)
       avm (~> 0.84, >= 0.84.2)
-      dentaku (~> 3.5, >= 3.5.1)
-      eac_fs (~> 0.16)
-      eac_rest (~> 0.10)
+      dentaku (~> 3.5, >= 3.5.2)
+      eac_fs (~> 0.17)
+      eac_rest (~> 0.12)
       eac_ruby_utils (~> 0.120)
       eac_templates (~> 0.5)
       inifile (~> 3.0)
@@ -46,7 +46,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aranha (0.19.2)
       aranha-parsers (~> 0.18)
@@ -59,8 +59,9 @@ GEM
       eac_ruby_utils (~> 0.119, >= 0.119.2)
       nokogiri (~> 1.15, >= 1.15.4)
       ofx-parser (~> 1.1)
-    aranha-selenium (0.7.0)
-      eac_ruby_utils (~> 0.117, >= 0.117.1)
+    aranha-selenium (0.8.0)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.120)
       selenium-webdriver (~> 3.142, >= 3.142.7)
     ast (2.4.2)
     avm (0.84.2)
@@ -124,11 +125,11 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     content-type (0.0.2)
       parslet (~> 2.0)
     curb (0.9.11)
-    dentaku (3.5.1)
+    dentaku (3.5.2)
       concurrent-ruby
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -140,25 +141,25 @@ GEM
     eac_docker (0.7.0)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
-    eac_envs-http (0.4.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.119, >= 0.119.1)
-      faraday (~> 2.7, >= 2.7.10)
+    eac_envs-http (0.5.1)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.120)
+      faraday (~> 2.7, >= 2.7.12)
       faraday-follow_redirects (~> 0.3)
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
       faraday-retry (~> 2.2)
-    eac_fs (0.16.0)
+    eac_fs (0.17.0)
       content-type (~> 0.0, >= 0.0.2)
-      eac_ruby_utils (~> 0.107, >= 0.107.1)
+      eac_ruby_utils (~> 0.120)
       ruby-filemagic (~> 0.7, >= 0.7.3)
-    eac_git (0.14.1)
-      eac_ruby_utils (~> 0.112)
+    eac_git (0.15.0)
+      eac_ruby_utils (~> 0.120)
       parseconfig (~> 1.1, >= 1.1.2)
-    eac_rest (0.10.0)
-      eac_envs-http (~> 0.4, >= 0.4.1)
+    eac_rest (0.12.0)
+      eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.119, >= 0.119.1)
+      eac_ruby_utils (~> 0.120)
     eac_ruby_base0 (0.19.0)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
       eac_cli (~> 0.35)
@@ -179,7 +180,7 @@ GEM
     eac_templates (0.5.0)
       eac_config (~> 0.12)
       eac_ruby_utils (~> 0.112)
-    faraday (2.7.12)
+    faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -194,7 +195,7 @@ GEM
     faraday-retry (2.2.0)
       faraday (~> 2.0)
     filesize (0.2.0)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
@@ -203,10 +204,10 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.20.0)
+    minitest (5.21.1)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
     nokogiri (1.15.5-x86_64-linux)
@@ -214,9 +215,9 @@ GEM
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.4)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parseconfig (1.1.2)
-    parser (3.2.2.4)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -227,7 +228,7 @@ GEM
     rack (3.0.8)
     rainbow (3.1.1)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -242,29 +243,29 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.57.2)
+    rubocop (1.60.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-rails (2.22.2)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -289,7 +290,7 @@ GEM
       virtus (~> 2.0)
     thread_safe (0.3.6)
     tty-color (0.6.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-table (0.12.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)

data/lib/ehbrs/tools/runner/music/lyrics.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'ehbrs/tools/core_ext'
-require 'ehbrs_ruby_utils/videos/container'
+require 'ehbrs_ruby_utils/videos/file'
 require 'ultimate_lyrics/provider'
 
 module Ehbrs
@@ -39,7 +39,7 @@ module Ehbrs
           end
 
           def container_uncached
-            ::EhbrsRubyUtils::Videos::Container.from_file(file)
+            ::EhbrsRubyUtils::Videos::File.from_file(file)
           end
 
           def file

data/lib/ehbrs/tools/runner/music/lyrics_book.rb

@@ -2,7 +2,7 @@
 
 require 'ehbrs/tools/core_ext'
 require 'ehbrs_ruby_utils/music/lyrics_book'
-require 'ehbrs_ruby_utils/videos/container'
+require 'ehbrs_ruby_utils/videos/file'
 require 'ultimate_lyrics/provider'
 
 module Ehbrs

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs/videos/extract/package'
+require 'ehbrs_ruby_utils/videos2/extract/package'
 
 module Ehbrs
   module Tools
@@ -32,7 +32,7 @@ module Ehbrs
 
           def packages_uncached
             parsed.packages?.map do |p|
-              ::Ehbrs::Videos::Extract::Package.new(p, target_dir, qualities)
+              ::EhbrsRubyUtils::Videos2::Extract::Package.new(p, target_dir, qualities)
             end
           end
 

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

@@ -53,7 +53,7 @@ module Ehbrs
             end
 
             def container_uncached
-              ::EhbrsRubyUtils::Videos::Container.new(file)
+              ::EhbrsRubyUtils::Videos::File.new(file)
             end
 
             def track_label(track)

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

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_base0/core_ext'
 require 'ehbrs/executables'
-require 'ehbrs_ruby_utils/videos/container'
+require 'ehbrs_ruby_utils/videos/file'
 require 'ehbrs_ruby_utils/videos/convert_job'
 
 module Ehbrs

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ehbrs_ruby_utils/videos/container'
+require 'ehbrs_ruby_utils/videos/file'
 require 'eac_ruby_base0/core_ext'
 require 'eac_ruby_utils/yaml'
 
@@ -25,7 +25,7 @@ module Ehbrs
           private
 
           def container_file_uncached
-            ::EhbrsRubyUtils::Videos::Container.new(parsed.file_path)
+            ::EhbrsRubyUtils::Videos::File.new(parsed.file_path)
           end
         end
       end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs/videos/unsupported/check_set'
-require 'ehbrs/videos/unsupported/search'
-require 'ehbrs/videos/unsupported/profiles'
+require 'ehbrs_ruby_utils/videos2/unsupported/check_set'
+require 'ehbrs_ruby_utils/videos2/unsupported/search'
+require 'ehbrs_ruby_utils/videos2/unsupported/profiles'
 
 module Ehbrs
   module Tools
@@ -23,18 +23,18 @@ module Ehbrs
             infov 'Profiles', profiles.join(', ')
             infov 'Paths', paths
             paths.each do |d|
-              ::Ehbrs::Videos::Unsupported::Search.new(d, file_options)
+              ::EhbrsRubyUtils::Videos2::Unsupported::Search.new(d, file_options)
             end
           end
 
           private
 
           def file_check_set_uncached
-            ::Ehbrs::Videos::Unsupported::CheckSet.build(profiles, :file)
+            ::EhbrsRubyUtils::Videos2::Unsupported::CheckSet.build(profiles, :file)
           end
 
           def track_check_set_uncached
-            ::Ehbrs::Videos::Unsupported::CheckSet.build(profiles, :track)
+            ::EhbrsRubyUtils::Videos2::Unsupported::CheckSet.build(profiles, :track)
           end
 
           def paths
@@ -52,7 +52,7 @@ module Ehbrs
           end
 
           def profile_class(profile_name)
-            ::Ehbrs::Videos::Unsupported::Profiles.const_get(profile_name.camelize)
+            ::EhbrsRubyUtils::Videos2::Unsupported::Profiles.const_get(profile_name.camelize)
           end
         end
       end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.39.0'
+    VERSION = '0.39.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.39.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -204,36 +204,6 @@ files:
 - lib/ehbrs/tools/runner_with/filesystem_renamer.rb
 - lib/ehbrs/tools/version.rb
 - lib/ehbrs/user_dirs.rb
-- lib/ehbrs/videos.rb
-- lib/ehbrs/videos/convert_job.rb
-- lib/ehbrs/videos/extract.rb
-- lib/ehbrs/videos/extract/package.rb
-- lib/ehbrs/videos/extract/package_file.rb
-- lib/ehbrs/videos/file.rb
-- lib/ehbrs/videos/profiles/base.rb
-- lib/ehbrs/videos/profiles/same_quality.rb
-- lib/ehbrs/videos/track.rb
-- lib/ehbrs/videos/unsupported/check_result.rb
-- lib/ehbrs/videos/unsupported/check_set.rb
-- lib/ehbrs/videos/unsupported/check_support.rb
-- lib/ehbrs/videos/unsupported/checks.rb
-- lib/ehbrs/videos/unsupported/checks/codec_extra_unlisted.rb
-- lib/ehbrs/videos/unsupported/checks/codec_extra_unsupported.rb
-- lib/ehbrs/videos/unsupported/checks/codec_unlisted.rb
-- lib/ehbrs/videos/unsupported/checks/codec_unsupported.rb
-- lib/ehbrs/videos/unsupported/checks/invalid_extension.rb
-- lib/ehbrs/videos/unsupported/file.rb
-- lib/ehbrs/videos/unsupported/file/fix.rb
-- lib/ehbrs/videos/unsupported/fix_profile.rb
-- lib/ehbrs/videos/unsupported/fixes/supported_codec.rb
-- lib/ehbrs/videos/unsupported/fixes/supported_container.rb
-- lib/ehbrs/videos/unsupported/profiles.rb
-- lib/ehbrs/videos/unsupported/profiles/aoc.rb
-- lib/ehbrs/videos/unsupported/profiles/base.rb
-- lib/ehbrs/videos/unsupported/profiles/philco.rb
-- lib/ehbrs/videos/unsupported/profiles/samsung.rb
-- lib/ehbrs/videos/unsupported/search.rb
-- lib/ehbrs/videos/unsupported/track.rb
 - template/ehbrs/cooking_book/build/base_page/layout.html.erb
 - template/ehbrs/cooking_book/build/index_page/inner.html.erb
 - template/ehbrs/cooking_book/build/recipe_page/inner.html.erb

data/lib/ehbrs/videos/convert_job.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'ehbrs_ruby_utils/executables'
-require 'fileutils'
-
-module Ehbrs
-  module Videos
-    class ConvertJob
-      enable_speaker
-      enable_simple_cache
-
-      FORMATS_TO_EXTENSIONS = {
-        'matroska' => '.mkv'
-      }.freeze
-
-      attr_reader :input, :profile
-
-      def initialize(input, profile)
-        raise "Input file \"#{input}\" does not exist" unless ::File.exist?(input.to_s)
-
-        @input = input
-        @profile = profile
-      end
-
-      def run
-        if ::File.exist?(converted)
-          warn("Converted file already exist: \"#{converted}\"")
-        else
-          profile.run_callbacks(:convert) { convert }
-          profile.run_callbacks(:swap) { swap }
-        end
-      end
-
-      def target
-        ::File.join(::File.dirname(input), "#{::File.basename(input, '.*')}#{target_extension}")
-      end
-
-      private
-
-      def command_args_uncached
-        r = ['-i', input] + profile_ffmpeg_args
-        r += ['-f', format_by_input] if format_by_args.blank?
-        r + [converting]
-      end
-
-      def convert
-        infov 'Convert args', command_args.shelljoin
-        ::EhbrsRubyUtils::Executables.ffmpeg.command.append(command_args).system!
-      end
-
-      def format_by_args_uncached
-        profile_ffmpeg_args.rindex('-f').if_present do |option_index|
-          profile_ffmpeg_args[option_index + 1]
-        end
-      end
-
-      def format_by_input
-        r = FORMATS_TO_EXTENSIONS.invert[target_extension_by_input]
-        return if r.present?
-
-        target_extension_by_input.gsub(/\A\./, '')
-      end
-
-      def format_to_extension(format)
-        FORMATS_TO_EXTENSIONS[format].if_present(".#{format}")
-      end
-
-      def profile_ffmpeg_args_uncached
-        profile.ffmpeg_args
-      end
-
-      def swap
-        ::FileUtils.mv(input, converted)
-        ::FileUtils.mv(converting, target)
-      end
-
-      def converting
-        "#{target}.converting"
-      end
-
-      def converted
-        input.basename_sub { |b| "#{b}.converted" }
-      end
-
-      def target_extension
-        target_extension_by_args || target_extension_by_input
-      end
-
-      def target_extension_by_args
-        format_by_args.if_present { |v| format_to_extension(v) }
-      end
-
-      def target_extension_by_input
-        ::File.extname(input)
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/extract/package.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'ehbrs_ruby_utils/fs/compressed_package'
-require 'ehbrs/videos/extract/package_file'
-
-module Ehbrs
-  module Videos
-    module Extract
-      class Package
-        enable_simple_cache
-
-        common_constructor :path, :target_dir, :qualities do
-          self.path = path.to_pathname
-          self.target_dir = target_dir.to_pathname
-        end
-
-        delegate :to_s, to: :path
-
-        def run(delete)
-          selected_files.each(&:copy_to_selected_dir)
-          files.each(&:move_to_quality_dir)
-          extract_dir.rmdir
-          path.unlink if delete
-        end
-
-        private
-
-        def files_uncached
-          ::Pathname.glob("#{extract_dir}/**/*").map do |file|
-            ::Ehbrs::Videos::Extract::PackageFile.new(self, file)
-          end
-        end
-
-        def extract_dir_uncached
-          r = target_dir / path.basename
-          raise "Extract directory \"#{r}\" is a file" if r.file?
-
-          r.rmtree if r.directory?
-          ::EhbrsRubyUtils::Fs::CompressedPackage.new(path).extract_to(r)
-          r
-        end
-
-        def files_qualities_uncached
-          qualities_with_default.select { |q| grouped_files.keys.include?(q) }
-        end
-
-        def grouped_files_uncached
-          r = {}
-          files.each do |file|
-            r[file.quality] ||= []
-            r[file.quality] << file
-          end
-          r
-        end
-
-        def qualities_with_default
-          qualities + [::Ehbrs::Videos::Extract::PackageFile::DEFAULT_QUALITY]
-        end
-
-        def selected_dir_uncached
-          target_dir / 'selected'
-        end
-
-        def selected_files
-          files.select { |f| f.quality == selected_quality }
-        end
-
-        def selected_quality_uncached
-          files_qualities.first
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/extract/package_file.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Videos
-    module Extract
-      class PackageFile
-        DEFAULT_QUALITY = '__default__'
-
-        enable_simple_cache
-        common_constructor :package, :path do
-          self.path = path.to_pathname
-        end
-
-        def copy_to_selected_dir
-          ::FileUtils.cp(path.to_path, selected_dir.to_path)
-        end
-
-        def match_quality?(quality)
-          path.basename_sub { |b| b.to_s.downcase }.basename
-            .fnmatch?("*#{quality.downcase}*".gsub(/\A\*+/, '*').gsub(/\*+\z/, '*'))
-        end
-
-        def move_to_quality_dir
-          ::FileUtils.mv(path.to_path, quality_dir.to_path)
-        end
-
-        private
-
-        def quality_uncached
-          package.qualities.find { |q| match_quality?(q) } || DEFAULT_QUALITY
-        end
-
-        def quality_dir
-          r = package.target_dir / quality
-          r.mkpath
-          r
-        end
-
-        def selected_dir
-          r = nil
-          r = package.target_dir / 'source' if /\.torrent/ =~ path.to_path
-          r = package.target_dir / 'subtitle' if /\.srt/ =~ path.to_path
-          raise "Destination unknown: #{path}" unless r
-
-          r.mkpath
-          r
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/extract.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Videos
-    module Extract
-      require_sub __FILE__
-    end
-  end
-end