ehbrs-tools 0.37.0 → 0.39.0

data/lib/ehbrs/tools/runner_with/filesystem_renamer.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Ehbrs
+  module Tools
+    module RunnerWith
+      module FilesystemRenamer
+        common_concern do
+          runner_with :confirmation, :filesystem_traverser
+          prepend PrependMethods
+        end
+
+        class RenameFile
+          enable_speaker
+          common_constructor :runner, :file
+          delegate :path, :target_path, :valid?, to: :file
+
+          CONFIRM_MESSAGE = 'Rename?'
+
+          def show
+            if rename?
+              puts [target_path_to_s, '<='.green, path_to_s].join(' ')
+            else
+              puts path_to_s
+            end
+          end
+
+          def rename
+            return unless rename?
+
+            show
+            do_rename if runner.confirm?(CONFIRM_MESSAGE)
+          end
+
+          # @return [Boolean]
+          def rename?
+            path.to_pathname != target_path.to_pathname
+          end
+
+          private
+
+          def do_rename
+            ::FileUtils.mv(path, target_path)
+          end
+
+          # @return [String]
+          def path_to_s
+            path.basename.to_path.light_black
+          end
+
+          # @return [String]
+          def target_path_to_s
+            target_path.relative_path_from(path.dirname).to_path
+          end
+        end
+
+        module PrependMethods
+          # @param path [Pathname]
+          # @return [void]
+          def traverser_check_file(path)
+            file = RenameFile.new(self, file_class.new(path))
+            files << file if file.valid?
+          end
+        end
+
+        FILE_WRAPPER_CLASS_BASENAME = 'FileWrapper'
+
+        # @return [Class]
+        def file_class
+          self.class.const_get(FILE_WRAPPER_CLASS_BASENAME)
+        end
+
+        # @return [void]
+        def run_filesystem_renamer
+          self.files = []
+          run_filesystem_traverser
+          show_files
+          rename_files
+          success 'Done'
+        end
+
+        # @return [void]
+        def show_files
+          infov 'Files found', files.count
+          files.each(&:show)
+        end
+
+        # @return [void]
+        def rename_files
+          return if parsed.no? || files.none?(&:rename?)
+
+          infom 'Renaming files...'
+          files.each(&:rename)
+        end
+
+        private
+
+        attr_accessor :files
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner_with.rb

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

data/lib/ehbrs/tools/version.rb

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

data/lib/ehbrs/user_dirs.rb

@@ -15,7 +15,7 @@ module Ehbrs
       private
 
       def user_home_dir_uncached
-        ::EacFs::StorageTree.new(ENV['HOME'])
+        ::EacFs::StorageTree.new(Dir.home)
       end
 
       def cache_uncached

data/lib/ehbrs/videos/convert_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'ehbrs/executables'
+require 'ehbrs_ruby_utils/executables'
 require 'fileutils'
 
 module Ehbrs
@@ -46,7 +46,7 @@ module Ehbrs
 
       def convert
         infov 'Convert args', command_args.shelljoin
-        ::Ehbrs::Executables.ffmpeg.command.append(command_args).system!
+        ::EhbrsRubyUtils::Executables.ffmpeg.command.append(command_args).system!
       end
 
       def format_by_args_uncached
@@ -76,7 +76,7 @@ module Ehbrs
       end
 
       def converting
-        target + '.converting'
+        "#{target}.converting"
       end
 
       def converted

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

@@ -19,7 +19,7 @@ module Ehbrs
 
         def match_quality?(quality)
           path.basename_sub { |b| b.to_s.downcase }.basename
-              .fnmatch?("*#{quality.downcase}*".gsub(/\A\*+/, '*').gsub(/\*+\z/, '*'))
+            .fnmatch?("*#{quality.downcase}*".gsub(/\A\*+/, '*').gsub(/\*+\z/, '*'))
         end
 
         def move_to_quality_dir

data/lib/ehbrs/videos/file.rb

@@ -34,7 +34,7 @@ module Ehbrs
         end
 
         def hmsf_to_seconds(hour, minute, second, float_part)
-          r = hour.to_f * 3600 + minute.to_f * 60 + second.to_f
+          r = (hour.to_f * 3600) + (minute.to_f * 60) + second.to_f
           r += float_part.to_f / (10**float_part.length) if float_part
           r
         end
@@ -53,7 +53,7 @@ module Ehbrs
       end
 
       def duration_uncached
-        m = /Duration\:\s*(#{TIME_PATTERN})/.match(content)
+        m = /Duration:\s*(#{TIME_PATTERN})/.match(content)
         raise 'Duration pattern not find in content' unless m
 
         self.class.time_to_seconds(m[1])

data/lib/ehbrs/videos/track.rb

@@ -11,8 +11,9 @@ module Ehbrs
       end
 
       def to_s
-        "[#{codec_type}(#{index}): #{codec_name}/#{language || '-'}" +
-          extra.if_present('') { |v| " | #{v}" } + ']'
+        "[#{codec_type}(#{index}): #{codec_name}/#{language || '-'}#{extra.if_present('') do |v|
+                                                                       " | #{v}"
+                                                                     end}]"
       end
     end
   end

data/lib/ehbrs/videos/unsupported/check_support.rb

@@ -52,19 +52,17 @@ module Ehbrs
         end
 
         def fixes_uncached
-          checks.reject(&:passed?).map { |c| c.check.fix }.reject(&:blank?)
+          checks.reject(&:passed?).map { |c| c.check.fix }.compact_blank
         end
 
-        def pad_speaker
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
-            yield
-          end
+        def pad_speaker(&block)
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  '), &block)
         end
 
         def new_padded_cli_speaker
           ::EacCli::Speaker.new(
-            err_line_prefix(::EacRubyUtils::Speaker.context.optional_current
-            .if_present('') { |v| v.is_a?(::EacCli::Speaker) ? v.err_line_prefix : '' } + '  ')
+            err_line_prefix("#{::EacRubyUtils::Speaker.context.optional_current
+            .if_present('') { |v| v.is_a?(::EacCli::Speaker) ? v.err_line_prefix : '' }}  ")
           )
         end
       end

data/lib/ehbrs/videos/unsupported/profiles/samsung.rb

@@ -23,6 +23,7 @@ module Ehbrs
           MPEG4_EXTRA_UNSUPPORTED = %w[dx50 xvid].freeze
 
           def initialize
+            super()
             add_check('invalid_extension', '.m4v')
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-28 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -16,62 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.156'
+        version: '0.159'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.156'
+        version: '0.159'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.120'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.120'
 - !ruby/object:Gem::Dependency
   name: ehbrs_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: inifile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.9'
 description: 
 email: 
 executables:
@@ -156,14 +136,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".avm.yml"
-- ".rspec"
-- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - exe/ehbrs
 - lib/ehbrs.rb
 - lib/ehbrs/executables.rb
-- lib/ehbrs/gems.rb
 - lib/ehbrs/google.rb
 - lib/ehbrs/google/translate.rb
 - lib/ehbrs/google/translate/session.rb
@@ -199,6 +176,8 @@ files:
 - lib/ehbrs/tools/runner/telegram/send_message.rb
 - lib/ehbrs/tools/runner/vg.rb
 - lib/ehbrs/tools/runner/vg/ips.rb
+- lib/ehbrs/tools/runner/vg/ps2.rb
+- lib/ehbrs/tools/runner/vg/ps2/rename.rb
 - lib/ehbrs/tools/runner/vg/wii.rb
 - lib/ehbrs/tools/runner/videos.rb
 - lib/ehbrs/tools/runner/videos/extract.rb
@@ -211,6 +190,8 @@ files:
 - lib/ehbrs/tools/runner/videos/probe.rb
 - lib/ehbrs/tools/runner/videos/series.rb
 - lib/ehbrs/tools/runner/videos/series/rename.rb
+- lib/ehbrs/tools/runner/videos/subtitles.rb
+- lib/ehbrs/tools/runner/videos/subtitles/sanitize.rb
 - lib/ehbrs/tools/runner/videos/unsupported.rb
 - lib/ehbrs/tools/runner/web_utils.rb
 - lib/ehbrs/tools/runner/web_utils/finances.rb
@@ -219,6 +200,8 @@ files:
 - lib/ehbrs/tools/runner/web_utils/videos.rb
 - lib/ehbrs/tools/runner/web_utils/videos/download.rb
 - lib/ehbrs/tools/runner/web_utils/videos/upload.rb
+- lib/ehbrs/tools/runner_with.rb
+- lib/ehbrs/tools/runner_with/filesystem_renamer.rb
 - lib/ehbrs/tools/version.rb
 - lib/ehbrs/user_dirs.rb
 - lib/ehbrs/videos.rb
@@ -251,22 +234,6 @@ files:
 - lib/ehbrs/videos/unsupported/profiles/samsung.rb
 - lib/ehbrs/videos/unsupported/search.rb
 - lib/ehbrs/videos/unsupported/track.rb
-- spec/code/rubocop_spec.rb
-- spec/lib/ehbrs/observers/base_spec.rb
-- spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb
-- 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/patch_0.ips
-- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/patch_1.ips
-- spec/lib/ehbrs/tools/runner/vg/ips_spec_files/source.rom
-- 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.rb
-- spec/lib/ehbrs/tools/runner/videos/unsupported_spec_files/dts_audio.probe.yaml
-- spec/lib/ehbrs/tools/runner_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper/videos.rb
-- spec/spec_helper/videos_files/stub_source.mp4
 - 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
@@ -282,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -293,22 +260,4 @@ rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Tools for EHB/RS.
-test_files:
-- 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/spec_helper.rb
-- spec/code/rubocop_spec.rb
-- ".rubocop.yml"
-- ".rspec"
+test_files: []

data/.rspec

@@ -1 +0,0 @@
---require spec/spec_helper --color --format doc --default-path . --pattern 'spec/**/*_spec.rb'

data/.rubocop.yml

@@ -1,39 +0,0 @@
-require:
-  - rubocop-rails
-  - rubocop-rspec
-
-AllCops:
-  Exclude:
-    - sub/**/*
-
-Layout/LineLength:
-  Max: 100
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*_spec.rb
-
-Rails/Output:
-  Enabled: false
-
-Rails/TimeZone:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Exclude:
-    - spec/**/*_spec.rb
-
-Style/AsciiComments:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true

data/lib/ehbrs/gems.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_ruby_base1/sources/base'
-
-module Ehbrs
-  module Gems
-    class << self
-      enable_simple_cache
-
-      def app_path
-        ::Pathname.new('../..').expand_path(__dir__)
-      end
-
-      def vendor_gems_root
-        app_path.join('vendor')
-      end
-
-      private
-
-      def app_uncached
-        ::Avm::EacRubyBase1::Sources::Base.new(app_path)
-      end
-
-      def all_uncached
-        vendor_gems + [app]
-      end
-
-      def vendor_gems_uncached
-        r = []
-        vendor_gems_root.each_child.each do |child|
-          r << ::EacRubyGemsUtils::Gem.new(child) if child.directory?
-        end
-        r
-      end
-    end
-  end
-end

data/spec/code/rubocop_spec.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/spec/lib/ehbrs/observers/base_spec.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/observers/base'
-
-RSpec.describe ::Ehbrs::Observers::Base do
-  let(:instance) { described_class.new }
-  let(:first_value) { 'a value' }
-  let(:same_value) { first_value.dup }
-  let(:different_value) { 'another value' }
-  let(:first_time) { ::Time.required_zone.local(2020, 5, 1, 12, 45, 0) }
-  let(:second_time) { ::Time.required_zone.local(2020, 5, 1, 12, 45, 0) }
-
-  it { expect(instance.records.count).to be_zero }
-  it { expect(instance.last_change_time).to be_blank }
-  it { expect(instance.last_check_time).to be_blank }
-
-  it { expect(instance).to be_changing_value(nil) }
-  it { expect(instance).to be_changing_value(first_value) }
-  it { expect(instance).to be_changing_value(same_value) }
-  it { expect(instance).to be_changing_value(different_value) }
-
-  context 'when firstly checked' do
-    before { instance.check(first_value, first_time) }
-
-    it { expect(instance.records.count).to eq(1) }
-    it { expect(instance.last_value).to eq(first_value) }
-    it { expect(instance).not_to be_changing_value(same_value) }
-    it { expect(instance).to be_changing_value(different_value) }
-    it { expect(instance.last_change_time).to eq(first_time) }
-    it { expect(instance.last_check_time).to eq(first_time) }
-
-    context 'when same first_value is checked' do
-      before { instance.check(same_value, second_time) }
-
-      it { expect(instance.records.count).to eq(1) }
-      it { expect(instance.last_value).to eq(same_value) }
-      it { expect(instance.last_change_time).to eq(first_time) }
-      it { expect(instance.last_check_time).to eq(second_time) }
-    end
-
-    context 'when different first_value is checked' do
-      before { instance.check(different_value, second_time) }
-
-      it { expect(instance.records.count).to eq(2) }
-      it { expect(instance.last_value).to eq(different_value) }
-      it { expect(instance.last_change_time).to eq(second_time) }
-      it { expect(instance.last_check_time).to eq(second_time) }
-    end
-
-    context 'when checked first_value is blank' do
-      context 'when blank_value == :add' do
-        let(:instance) { described_class.new(blank_value: :add) }
-
-        before { instance.check(nil, second_time) }
-
-        it { expect(instance.records.count).to eq(2) }
-        it { expect(instance.last_value).to eq(nil) }
-        it { expect(instance.last_change_time).to eq(second_time) }
-        it { expect(instance.last_check_time).to eq(second_time) }
-      end
-
-      context 'when blank_value == :ignore' do
-        let(:instance) { described_class.new(blank_value: :ignore) }
-
-        before { instance.check(nil, second_time) }
-
-        it { expect(instance.records.count).to eq(1) }
-        it { expect(instance.last_value).to eq(first_value) }
-        it { expect(instance.last_change_time).to eq(first_time) }
-        it { expect(instance.last_check_time).to eq(second_time) }
-      end
-
-      context 'when blank_value == :raise' do
-        let(:instance) { described_class.new(blank_value: :raise) }
-
-        before do
-          @exception = nil
-          begin
-            instance.check(nil, second_time)
-          rescue StandardError => e
-            @exception = e
-          end
-        end
-
-        it { expect(@exception).to be_a(::ArgumentError) } # rubocop:disable RSpec/InstanceVariable
-        it { expect(instance.records.count).to eq(1) }
-        it { expect(instance.last_value).to eq(first_value) }
-        it { expect(instance.last_change_time).to eq(first_time) }
-        it { expect(instance.last_check_time).to eq(second_time) }
-      end
-    end
-  end
-end