ehbrs_ruby_utils 0.41.1 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 586c5869279d721b48b5cf6d6ce585edc26601a00aff87f412fa0cad3142206e
-  data.tar.gz: bf287e776722f8b92f3f7fe7832fdc574251c4ebee744c1f3018ef2957e278d7
+  metadata.gz: d257573a9117902808e20c43bf002671f832d16cc40bf676cfb46282435b22f5
+  data.tar.gz: fa5b446750faae117f1902457683b1b46599f85e64d40b7402451433d007d861
 SHA512:
-  metadata.gz: ba4bc8bce782d16640c2e984ffd02f1a4a8dd390921f136321697efc1d3dd03339baeac2722ff5f1d9f858e44f3d616b3bb1b83dca6358d5993f621c3fd6593a
-  data.tar.gz: f9711900cb11defad1165a869e77bdc5ff160b7a070f79870bd927c624871271476505900b1d45dd88bf7598191809879b84fc9c3f40d5f6a37d5302caf47c83
+  metadata.gz: 2f5dbbbcffc5213abb54303cc9272e3875f40ba4f80c759298c6ba4d6677e806862b5a221a26fd487f45c26c02f7075decbf1251b424dd15a28ab186c35d9d5c
+  data.tar.gz: dd456900169ed432a7c2b3aaef91ab93fff318b098eddcade488b5877df89b9babdeb45ec1336eadeb2ecde18d80a1c1b7011a5fa56952ed6427e60f3aab41ea

data/lib/ehbrs_ruby_utils/fs/selected/build.rb

@@ -25,6 +25,8 @@ module EhbrsRubyUtils
         private
 
         def clear_target_dir
+          return unless target_dir.exist?
+
           target_dir.children.each do |c|
             c.unlink if c.symlink? && c.directory?
           end

data/lib/ehbrs_ruby_utils/fs/selected/build_file.rb

@@ -11,7 +11,7 @@ module EhbrsRubyUtils
         end
 
         def perform
-          target_path.make_symlink(path)
+          target_path.assert_parent.make_symlink(path)
         end
 
         def target_path

data/lib/ehbrs_ruby_utils/music/sort/commands/base.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/scanner'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Commands
+        class Base
+          enable_speaker
+          enable_simple_cache
+          common_constructor :root, :confirm do
+            self.root = root.to_pathname
+            run
+          end
+
+          private
+
+          def config_file
+            scanner.config_file
+          end
+
+          def scanner_uncached
+            ::EhbrsRubyUtils::Music::Sort::Files::Scanner.new(root)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort/commands/dump.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/commands/base'
+require 'ehbrs_ruby_utils/music/sort/files/base'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Commands
+        class Dump < EhbrsRubyUtils::Music::Sort::Commands::Base
+          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) if confirm
+          end
+
+          def confirm_rename(old_basename, new_basename)
+            op = File.expand_path(old_basename, root)
+            np = File.expand_path(new_basename, root)
+            return if np == op
+            raise "\"#{np}\" (From \"#{op}\") already exists" if File.exist?(np)
+
+            File.rename(op, np)
+          end
+
+          def order_padding_uncached
+            scanner.count.to_s.length
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort/commands/load.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/commands/base'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Commands
+        class Load < EhbrsRubyUtils::Music::Sort::Commands::Base
+          private
+
+          def run
+            info "Reading \"#{root}\"..."
+            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
+
+          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

data/lib/ehbrs_ruby_utils/music/sort/commands/shuffle.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/commands/base'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Commands
+        class Shuffle < EhbrsRubyUtils::Music::Sort::Commands::Base
+          private
+
+          def run
+            if confirm
+              load_last_shuffle
+            else
+              dump_last_shuffle
+            end
+          end
+
+          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(root, '.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

data/lib/ehbrs_ruby_utils/music/sort/commands.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Commands
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort/files/base.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Files
+        class Base
+          common_constructor :section, :order, :name, :original_path, :padding, default: [nil, 0] do
+            self.original_path = original_path.if_present { |v| v.to_pathname.expand_path }
+          end
+
+          def reorder(new_section, new_order, padding)
+            self.class.new(new_section, new_order, name, original_path, padding)
+          end
+
+          def target_basename
+            "#{section}#{order.to_s.rjust(padding, '0')} #{name}"
+          end
+
+          def source_basename
+            original_path.if_present(&:basename) || raise('Original path is blank')
+          end
+
+          def to_s
+            target_basename
+          end
+
+          private
+
+          def <=>(other)
+            %i[section order name].each do |a|
+              r = send(a) <=> other.send(a)
+              return r unless r.zero?
+            end
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort/files/factory.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Files
+        class Factory
+          SECTION_CURRENT = 'A'
+          SECTION_NEW = 'Z'
+          SECTIONS = [SECTION_CURRENT, SECTION_NEW].freeze
+          NO_ORDER = Float::INFINITY
+
+          enable_simple_cache
+          common_constructor :path, :config_data
+
+          def basename
+            by_pattern(3).if_present(path.basename.to_path)
+          end
+
+          def build
+            ::EhbrsRubyUtils::Music::Sort::Files::Base.new(section, order, basename, path)
+          end
+
+          def order
+            order_from_config_data || by_pattern(2).if_present(NO_ORDER, &:to_i)
+          end
+
+          def section
+            r = section_from_config_data || by_pattern(1).if_present(SECTION_NEW)
+            return SECTION_CURRENT if r.blank? || r.upcase == SECTION_CURRENT
+
+            SECTION_NEW
+          end
+
+          private
+
+          def by_pattern(index)
+            match_builded_pattern.if_present { |v| v[index] }
+          end
+
+          def match_builded_pattern_uncached
+            /\A([a-z])?([0-9]+)\s+(\S.*)\z/i.match(path.basename.to_path)
+          end
+
+          def order_from_config_data
+            config_data.each_value do |files|
+              files.index(basename).if_present { |v| return v + 1 }
+            end
+            nil
+          end
+
+          def section_from_config_data
+            config_data.each do |section, files|
+              return section if files.include?(basename)
+            end
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort/files/scanner.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Files
+        class Scanner
+          enable_simple_cache
+          common_constructor :root
+
+          def all
+            by_section.flat_map { |_s, fs| fs }
+          end
+
+          def config_file
+            root.join('.sort')
+          end
+
+          # @return [Integer]
+          def count
+            by_section.values.inject(0) { |a, e| a + e.count }
+          end
+
+          def search(name)
+            all.find { |sf| sf.name == name }
+          end
+
+          private
+
+          def by_section_uncached
+            r = {}
+            to_sort.each do |f|
+              sf = ::EhbrsRubyUtils::Music::Sort::Files::Factory.new(f, config_data).build
+              r[sf.section] ||= []
+              r[sf.section] << sf
+            end
+            EhbrsRubyUtils::Music::Sort::Files::Factory::SECTIONS.index_with do |s|
+              r[s] || []
+            end.freeze
+          end
+
+          def config_data_uncached
+            if config_file.exist?
+              ::EacRubyUtils::Yaml.load_file(config_file)
+            else
+              {}
+            end
+          end
+
+          def to_sort
+            root.children.reject { |e| e.basename.to_path.start_with?('.') }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort/files.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      module Files
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/music/sort.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Music
+    module Sort
+      require_sub __FILE__
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/patches/object/template.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_templates/patches/object/template'
-
-EacTemplates::Searcher.default.included_paths <<
-  File.expand_path('../../../../template', __dir__)
+require 'eac_templates/sources/from_all_gems'

data/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.41.1'
+  VERSION = '0.42.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.41.1
+  version: 0.42.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -50,34 +50,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.84'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.84.2
+        version: '0.91'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.84'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.84.2
+        version: '0.91'
 - !ruby/object:Gem::Dependency
   name: dentaku
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,16 @@ files:
 - lib/ehbrs_ruby_utils/music/ous/artist.rb
 - lib/ehbrs_ruby_utils/music/ous/category.rb
 - lib/ehbrs_ruby_utils/music/ous/node.rb
+- lib/ehbrs_ruby_utils/music/sort.rb
+- lib/ehbrs_ruby_utils/music/sort/commands.rb
+- lib/ehbrs_ruby_utils/music/sort/commands/base.rb
+- lib/ehbrs_ruby_utils/music/sort/commands/dump.rb
+- lib/ehbrs_ruby_utils/music/sort/commands/load.rb
+- lib/ehbrs_ruby_utils/music/sort/commands/shuffle.rb
+- lib/ehbrs_ruby_utils/music/sort/files.rb
+- lib/ehbrs_ruby_utils/music/sort/files/base.rb
+- lib/ehbrs_ruby_utils/music/sort/files/factory.rb
+- lib/ehbrs_ruby_utils/music/sort/files/scanner.rb
 - lib/ehbrs_ruby_utils/patches.rb
 - lib/ehbrs_ruby_utils/patches/object.rb
 - lib/ehbrs_ruby_utils/patches/object/template.rb