ehbrs-tools 0.38.0 → 0.39.1

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/runner/web_utils/videos/upload.rb

@@ -44,7 +44,7 @@ module Ehbrs
               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)
+              fatal_error("Retornou com erro: #{e.message}")
             end
 
             def series_files_list_uncached

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/{videos/extract.rb → tools/runner_with.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Ehbrs
-  module Videos
-    module Extract
+  module Tools
+    module RunnerWith
       require_sub __FILE__
     end
   end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.38.0'
+    VERSION = '0.39.1'
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.39.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -16,68 +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.36'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -92,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
@@ -146,20 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.9'
 description: 
 email: 
 executables:
@@ -173,7 +141,6 @@ files:
 - 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
@@ -209,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
@@ -231,38 +200,10 @@ 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
-- 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/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/lib/ehbrs/videos/convert_job.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'ehbrs/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
-        ::Ehbrs::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