ehbrs-tools 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afba1515a9a95f71e7f9ef4846ed767259fb791149c440e98dc56611c7d09104
-  data.tar.gz: 41bfc93b95a4d43300207e83b1f4958f27e273ee5a622e9f2a8d8220a8c44dc8
+  metadata.gz: 4d7f1950bd86260645e7a5bb92ec7fcb41c59c8331385f2a277c685be0ca470d
+  data.tar.gz: 9d8ddf77d0b5d447a6d223f30e3c9206ba97a84674219512b76cf844010f6051
 SHA512:
-  metadata.gz: a3098c00fbcc328113d82d76801187dbd1cb85ec3b08a6a786fc6c7c00b49e550db32ff0e0ba6fd58d1301075c3ca9807e95087bce9aa318c33aff4b84408d1a
-  data.tar.gz: 1c5a15956bd810fb96d390872584a0aa3431e3da22ec1d39c0b942fff34c9fe6fe78f6c08267415bdc984a667e2fccb1811ddbe3ff8a9ea857ec571b42445d9d
+  metadata.gz: b962d14dc1c1c7dd202c8c21a9686238679f29c12b160f9e4bfe4c38650f73309e16011909105f7daf7fe4daa0eaa198eea8163b25aae7c3e6009fdfdf156b73
+  data.tar.gz: 64741c4c119942a6f8373de136308c3b6b04b3d150f92b2665f97376b1bc1d21f5aaefce6f7ea01ebe65098a32b7f475e3870b83726fe855aa73f1a9f622f4e3

data/Gemfile.lock

@@ -1,24 +1,33 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.40.0)
+    ehbrs-tools (0.41.0)
       avm-files (~> 0.7)
-      eac_cli (~> 0.40, >= 0.40.1)
+      eac_cli (~> 0.41)
       eac_ruby_base0 (~> 0.19)
       eac_ruby_utils (~> 0.121)
-      ehbrs_ruby_utils (~> 0.41, >= 0.41.2)
+      ehbrs_ruby_utils (~> 0.43)
       filesize (~> 0.2)
       os (~> 1.1, >= 1.1.4)
       telegram-bot-ruby (~> 0.23)
 
+PATH
+  remote: sub/eac_cli
+  specs:
+    eac_cli (0.41.0)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_ruby_utils (~> 0.121)
+      tty-table (~> 0.12)
+
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.41.2)
+    ehbrs_ruby_utils (0.43.0)
       aranha (~> 0.19, >= 0.19.2)
       aranha-parsers (~> 0.22)
       aranha-selenium (~> 0.10, >= 0.10.1)
-      avm (~> 0.90, >= 0.90.1)
+      avm (~> 0.91)
       dentaku (~> 3.5, >= 3.5.2)
       eac_fs (~> 0.17)
       eac_rest (~> 0.12)
@@ -57,7 +66,7 @@ GEM
       eac_templates (~> 0.5, >= 0.5.1)
       selenium-webdriver (~> 3.142, >= 3.142.7)
     ast (2.4.2)
-    avm (0.90.1)
+    avm (0.91.0)
       eac_cli (~> 0.40, >= 0.40.1)
       eac_config (~> 0.14, >= 0.14.2)
       eac_docker (~> 0.7)
@@ -99,11 +108,6 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.1)
     dry-inflector (1.0.0)
-    eac_cli (0.40.1)
-      colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.14, >= 0.14.2)
-      eac_ruby_utils (~> 0.121)
-      tty-table (~> 0.12)
     eac_config (0.14.2)
       addressable (~> 2.8, >= 2.8.6)
       eac_ruby_utils (~> 0.121)
@@ -169,7 +173,7 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.22.3)
+    minitest (5.23.0)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
     nokogiri (1.15.6-x86_64-linux)
@@ -188,8 +192,9 @@ GEM
     racc (1.7.3)
     rack (3.0.11)
     rainbow (3.1.1)
-    regexp_parser (2.9.1)
-    rexml (3.2.6)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -245,6 +250,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    strscan (3.1.0)
     taglib-ruby (1.1.3)
     telegram-bot-ruby (0.23.0)
       dry-inflector
@@ -269,13 +275,14 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
     zlib (2.1.1)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  eac_cli!
   eac_ruby_gem_support (~> 0.9)
   ehbrs-tools!
   ehbrs_ruby_utils!

data/lib/ehbrs/tools/executables.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs'
+require 'eac_ruby_utils/simple_cache'
+
+module Ehbrs
+  module Tools
+    module Executables
+      class << self
+        include ::EacRubyUtils::SimpleCache
+
+        def env
+          ::EacRubyUtils::Envs.local
+        end
+
+        private
+
+        {
+          '--version' => %w[flips]
+        }.each do |validate_arg, commands|
+          commands.each do |command|
+            define_method("#{command}_uncached") do
+              env.executable(command, validate_arg)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/sort/dump.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/base'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          class Dump
+            runner_with :confirmation
+
+            private
+
+            def run
+              if File.exist?(config_file)
+                @config = YAML.load_file(config_file)
+                to_rename.each { |sf| rename(sf) }
+              else
+                fatal_error("File \"#{config_file}\" does not exist")
+              end
+            end
+
+            def to_rename
+              r = []
+              ::EhbrsRubyUtils::Music::Sort::Files::Factory::SECTIONS.each do |section|
+                i = 1
+                (@config[section] || []).each do |name|
+                  r << ::EhbrsRubyUtils::Music::Sort::Files::Base.new(section, i, name, nil)
+                  i += 1
+                end
+              end
+              r
+            end
+
+            def rename(source_file)
+              o = scanner.search(source_file.name)
+              if o
+                rename_on_found(source_file, o)
+              else
+                warn("File not found for \"#{source_file}\"")
+              end
+            end
+
+            def rename_on_found(source_file, sorted_file)
+              o = sorted_file.reorder(source_file.section, source_file.order, order_padding)
+              info("\"#{o.source_basename}\" => \"#{o.target_basename}\"")
+              confirm_rename(o.source_basename, o.target_basename)
+            end
+
+            def confirm_rename(old_basename, new_basename)
+              op = File.expand_path(old_basename, path)
+              np = File.expand_path(new_basename, path)
+              return if np == op
+              raise "\"#{np}\" (From \"#{op}\") already exists" if File.exist?(np)
+
+              File.rename(op, np) if confirm?
+            end
+
+            def order_padding_uncached
+              scanner.count.to_s.length
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/sort/load.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          class Load
+            runner_with :help, :confirmation
+
+            def run
+              info "Reading \"#{path}\"..."
+              config = build_config
+              s = config.to_yaml
+              puts s
+              if confirm?
+                info("Writing to \"#{config_file}\"...")
+                File.write(config_file, s)
+              end
+              puts 'Done!'.green
+            end
+
+            private
+
+            def build_config
+              config = {}
+              scanner.by_section.each do |section, fs|
+                config[section] = fs.sort.map(&:name)
+              end
+              config
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/sort/shuffle.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          class Shuffle
+            runner_with :help do
+              bool_opt '-l', '--load'
+            end
+
+            def run
+              if parsed.load?
+                load_last_shuffle
+              else
+                dump_last_shuffle
+              end
+            end
+
+            private
+
+            def dump_last_shuffle
+              s = build_config.to_yaml
+              puts s
+              info("Writing to \"#{last_shuffle_file}\"...")
+              File.write(last_shuffle_file, s)
+              puts 'Done!'.green
+            end
+
+            def load_last_shuffle
+              if File.exist?(last_shuffle_file)
+                IO.copy_stream(last_shuffle_file, config_file)
+                File.unlink(last_shuffle_file)
+                puts 'Done!'.green
+              else
+                fatal_error "File \"#{last_shuffle_file}\" does not exist"
+              end
+            end
+
+            def last_shuffle_file
+              File.join(path, '.last_shuffle')
+            end
+
+            def build_config
+              config = {}
+              config[::EhbrsRubyUtils::Music::Sort::Files::Factory::SECTION_CURRENT] =
+                scanner.all.to_a.shuffle.map(&:name)
+              config[::EhbrsRubyUtils::Music::Sort::Files::Factory::SECTION_NEW] = []
+              config
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/scanner'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          DEFAULT_PATH = '.'
+
+          runner_with :help, :subcommands do
+            desc 'Ordena arquivos/diretórios prefixando-os.'
+            arg_opt '-C', '--path', 'Path to the directory.', default: DEFAULT_PATH
+            subcommands
+          end
+          for_context :path, :scanner, :config_file
+
+          # @return [Pathname]
+          delegate :config_file, to: :scanner
+
+          # @return [Pathname]
+          def path
+            parsed.path.to_pathname
+          end
+
+          private
+
+          # @return [EhbrsRubyUtils::Music::Sort::Files::Scanner]
+          def scanner_uncached
+            ::EhbrsRubyUtils::Music::Sort::Files::Scanner.new(path)
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/vg/ips.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/fs/temp'
-require 'ehbrs/executables'
+require 'ehbrs/tools/executables'
 
 module Ehbrs
   module Tools
@@ -35,7 +35,7 @@ module Ehbrs
           end
 
           def run_patch(source_path, ips_path, output_path)
-            command = ::Ehbrs::Executables.flips.command
+            command = ::Ehbrs::Tools::Executables.flips.command
                         .append(['--apply', ips_path, source_path, output_path])
 
             command.system!

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_base0/core_ext'
-require 'ehbrs/executables'
+require 'ehbrs/tools/executables'
 require 'ehbrs_ruby_utils/videos/file'
 require 'ehbrs_ruby_utils/videos/convert_job'
 

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.40.0'
+    VERSION = '0.41.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-files
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.40.1
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.40.1
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_base0
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +154,6 @@ files:
 - Gemfile.lock
 - exe/ehbrs
 - lib/ehbrs.rb
-- lib/ehbrs/executables.rb
 - lib/ehbrs/google.rb
 - lib/ehbrs/google/translate.rb
 - lib/ehbrs/google/translate/session.rb
@@ -182,6 +169,7 @@ files:
 - lib/ehbrs/tools.rb
 - lib/ehbrs/tools/application.rb
 - lib/ehbrs/tools/core_ext.rb
+- lib/ehbrs/tools/executables.rb
 - lib/ehbrs/tools/instance.rb
 - lib/ehbrs/tools/runner.rb
 - lib/ehbrs/tools/runner/cooking_book.rb
@@ -197,6 +185,10 @@ files:
 - lib/ehbrs/tools/runner/music/lyrics.rb
 - lib/ehbrs/tools/runner/music/lyrics_book.rb
 - lib/ehbrs/tools/runner/music/selected.rb
+- lib/ehbrs/tools/runner/music/sort.rb
+- lib/ehbrs/tools/runner/music/sort/dump.rb
+- lib/ehbrs/tools/runner/music/sort/load.rb
+- lib/ehbrs/tools/runner/music/sort/shuffle.rb
 - lib/ehbrs/tools/runner/music/spread.rb
 - lib/ehbrs/tools/runner/telegram.rb
 - lib/ehbrs/tools/runner/telegram/send_message.rb

data/lib/ehbrs/executables.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/envs'
-require 'eac_ruby_utils/simple_cache'
-
-module Ehbrs
-  module Executables
-    class << self
-      include ::EacRubyUtils::SimpleCache
-
-      def env
-        ::EacRubyUtils::Envs.local
-      end
-
-      private
-
-      {
-        '--version' => %w[flips]
-      }.each do |validate_arg, commands|
-        commands.each do |command|
-          define_method("#{command}_uncached") do
-            env.executable(command, validate_arg)
-          end
-        end
-      end
-    end
-  end
-end