ehbrs-tools 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a57cd0b9c5ca0fae7bbca76c6f6028c2c9e6ce68ab25553fb53a991c36970c2
-  data.tar.gz: 5b8000ce1927a55dbd90f70792bc1790f2e14bf4b67032258186ccd6eeeb8d91
+  metadata.gz: 589c932bbcf85353d65fe4765634dc887e100962c0c7dfed26d76cf48ffbdc81
+  data.tar.gz: f9b16e308f0839eaf966a760d04fc63719e187c941babeb06b33ef8074bc8ecd
 SHA512:
-  metadata.gz: 238fa86906bac564e751df073a24b7e43b740ccbe9bb782b5a93b424f236b2988fc315f9f012f5dd2636a6732bd8ab31366b73d8fb5afdbbe021da8ebfa563f3
-  data.tar.gz: 9eebc156592ae81a254491959f762cdeedb2d5f6d01c9c7d4f90cdeb2c73eb36c30a442d5f1b8564069a6729beed2f8a89c42a19815e1c67c740355992ce5052
+  metadata.gz: 8fa7822a45d5343ea664fcebb4323226733aa48d27a8b35602d16b9496435021e0860b51b08ab0cbac70ccb7de30364c23734176b2fe8599642eccb24b158969
+  data.tar.gz: a10e2b0cca4ea7993255d896014557d388c20039e497d689737f11e90bd7f84f6a04e480300dcda5f4b2706ad0562542a1c51f549a24c5a425f5699baf95ede5

data/Gemfile.lock

@@ -7,11 +7,11 @@ GIT
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.30.0)
+    ehbrs-tools (0.31.0)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
-      ehbrs_ruby_utils (~> 0.8, >= 0.8.1)
+      ehbrs_ruby_utils (~> 0.17)
       filesize
       inifile (~> 3.0)
       os
@@ -40,7 +40,7 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.26.1)
+    eac_cli (0.26.2)
       colorize (~> 0.8.1)
       eac_config (~> 0.8)
       eac_ruby_utils (~> 0.83)
@@ -62,7 +62,7 @@ PATH
 PATH
   remote: sub/eac_fs
   specs:
-    eac_fs (0.9.0)
+    eac_fs (0.11.1)
       content-type
       eac_ruby_utils (~> 0.70)
       ruby-filemagic
@@ -70,9 +70,9 @@ PATH
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.15.0)
+    eac_ruby_base0 (0.16.1)
       eac_cli (~> 0.26)
-      eac_fs (~> 0.3)
+      eac_fs (~> 0.10)
       eac_ruby_gems_utils (~> 0.9.6, ~> 0.9)
       eac_ruby_utils (~> 0.70)
 
@@ -87,7 +87,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.85.0)
+    eac_ruby_utils (0.87.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       filesize
@@ -103,10 +103,10 @@ PATH
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.16.0)
+    ehbrs_ruby_utils (0.17.0)
       aranha-parsers (~> 0.8, >= 0.8.5)
       avm (~> 0.3, >= 0.3.2)
-      eac_fs (~> 0.5)
+      eac_fs (~> 0.10)
       eac_ruby_utils (~> 0.70)
       eac_templates (~> 0.1, >= 0.1.1)
       taglib-ruby (~> 1.1)
@@ -122,7 +122,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.4)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -186,11 +186,11 @@ GEM
       eac_fs (~> 0.5)
       eac_ruby_utils (~> 0.76)
       eac_templates (~> 0.2)
-    avm-git (0.3.1)
+    avm-git (0.3.2)
       avm-files (~> 0.1)
       eac_git (~> 0.11)
       eac_ruby_utils (~> 0.76)
-    avm-tools (0.113.6)
+    avm-tools (0.114.0)
       aranha-parsers (~> 0.4)
       avm (~> 0.13)
       avm-eac_asciidoctor_base0
@@ -223,7 +223,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
     dry-inflector (0.2.1)
-    eac_git (0.11.0)
+    eac_git (0.12.0)
       eac_ruby_utils (~> 0.83)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_ruby_gem_support (0.5.0)
@@ -262,7 +262,7 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.1)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
@@ -287,20 +287,20 @@ GEM
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
-    rouge (3.27.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rouge (3.28.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -334,7 +334,7 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   x86_64-linux

data/lib/ehbrs/tools/runner/videos/series/rename.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs/videos/series/rename/file'
-require 'ehbrs/videos/series/rename/file/options'
-require 'ehbrs/videos/series/rename/results_builder'
+require 'ehbrs_ruby_utils/videos/series/rename/file'
+require 'ehbrs_ruby_utils/videos/series/rename/file/options'
+require 'ehbrs_ruby_utils/videos/series/rename/results_builder'
 
 module Ehbrs
   module Tools
@@ -49,15 +49,16 @@ module Ehbrs
             end
 
             def traverser_check_file(path)
-              @files << ::Ehbrs::Videos::Series::Rename::File.new(path, series_file_options)
+              @files << ::EhbrsRubyUtils::Videos::Series::Rename::File
+                        .new(path, series_file_options)
             end
 
             def series_file_options_uncached
-              ::Ehbrs::Videos::Series::Rename::File::Options.new(parsed)
+              ::EhbrsRubyUtils::Videos::Series::Rename::File::Options.new(parsed)
             end
 
             def show_results
-              ::Ehbrs::Videos::Series::Rename::ResultsBuilder.new(files).show(0)
+              ::EhbrsRubyUtils::Videos::Series::Rename::ResultsBuilder.new(files).show(0)
             end
 
             def rename_files

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.30.0'
+    VERSION = '0.31.0'
   end
 end

data/lib/ehbrs/user_dirs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_fs/cache'
+require 'eac_fs/storage_tree'
 require 'eac_ruby_utils/simple_cache'
 
 module Ehbrs
@@ -15,7 +15,7 @@ module Ehbrs
       private
 
       def user_home_dir_uncached
-        ::EacFs::Cache.new(ENV['HOME'])
+        ::EacFs::StorageTree.new(ENV['HOME'])
       end
 
       def cache_uncached

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

@@ -11,11 +11,11 @@ module Ehbrs
           AUDIO_SUPPORTED_CODECS = %w[aac ac3 eac3 mp3 vorbis].freeze
           AUDIO_UNSUPPORTED_CODECS = %w[dts].freeze
 
-          VIDEO_SUPPORTED_CODECS = %w[h264 mpeg4 hevc].freeze
+          VIDEO_SUPPORTED_CODECS = %w[h264 mpeg4 hevc mjpeg].freeze
           VIDEO_UNSUPPORTED_CODECS = %w[].freeze
 
-          SUBTITLE_SUPPORTED_CODECS = %w[ass dvd subrip].freeze
-          SUBTITLE_UNSUPPORTED_CODECS = %w[mov].freeze
+          SUBTITLE_SUPPORTED_CODECS = %w[ass dvd dvd_subtitle hdmv_pgs_subtitle subrip].freeze
+          SUBTITLE_UNSUPPORTED_CODECS = %w[mov mov_text].freeze
 
           OTHER_SUPPORTED_CODECS = %w[png ttf].freeze
 

data/spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_fs/cache'
+require 'eac_fs/storage_tree'
 require 'eac_ruby_utils/fs/temp'
 require 'ehbrs/tools/runner'
 require 'ehbrs/tools/runner/fs/used_space'
@@ -9,7 +9,7 @@ require 'ehbrs/observers/with_persistence'
 RSpec.describe ::Ehbrs::Tools::Runner::Fs::UsedSpace do
   let(:target) { ::EacRubyUtils::Fs::Temp.directory }
   let(:user_dir) { ::EacRubyUtils::Fs::Temp.directory }
-  let(:cached_user_dir) { ::EacFs::Cache.new(user_dir) }
+  let(:cached_user_dir) { ::EacFs::StorageTree.new(user_dir) }
   let(:observers_user_dir) { cached_user_dir.child('observers') }
   let(:observer_path) do
     observers_user_dir.child(target.to_s.parameterize).content_path.to_pathname

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -70,20 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -252,16 +246,6 @@ files:
 - lib/ehbrs/videos/file.rb
 - lib/ehbrs/videos/profiles/base.rb
 - lib/ehbrs/videos/profiles/same_quality.rb
-- lib/ehbrs/videos/series.rb
-- lib/ehbrs/videos/series/rename.rb
-- lib/ehbrs/videos/series/rename/directory_group.rb
-- lib/ehbrs/videos/series/rename/file.rb
-- lib/ehbrs/videos/series/rename/file/basename_parser.rb
-- lib/ehbrs/videos/series/rename/file/options.rb
-- lib/ehbrs/videos/series/rename/line_result.rb
-- lib/ehbrs/videos/series/rename/line_result_group.rb
-- lib/ehbrs/videos/series/rename/results_builder.rb
-- lib/ehbrs/videos/series/rename/season_group.rb
 - lib/ehbrs/videos/track.rb
 - lib/ehbrs/videos/unsupported/check_result.rb
 - lib/ehbrs/videos/unsupported/check_set.rb

data/lib/ehbrs/videos/series/rename/directory_group.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/videos/series/rename/line_result_group'
-require 'ehbrs/videos/series/rename/season_group'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class DirectoryGroup < LineResultGroup
-          def line_out
-            name.light_yellow
-          end
-
-          protected
-
-          def child_key
-            :season
-          end
-
-          def child_class
-            ::Ehbrs::Videos::Series::Rename::SeasonGroup
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/file/basename_parser.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/videos/series/rename/line_result'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class File < ::Ehbrs::Videos::Series::Rename::LineResult
-          module BasenameParser
-            FORMATS = [{
-              format: /(\d+)(\d{2})(\d{2})/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) + '-' + padding(m[3]) } }
-            }, {
-              format: /s(\d+)e(\d+)-(\d+)/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) + '-' + padding(m[3]) } }
-            }, {
-              format: /(\d{1,2})\s*[^\d]\s*(\d{2})/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) } }
-            }, {
-              format: /(\d+)(\d{2})/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) } }
-            }, {
-              format: /(\d{2})/i,
-              build: ->(m) { { s: padding(1), e: padding(m[1]) } }
-            }].freeze
-
-            def self.padding(string)
-              string.to_s.rjust(2, '0')
-            end
-
-            def parse_uncached
-              FORMATS.each do |format|
-                m = format.fetch(:format).match(current_name)
-                return format.fetch(:build).call(m) if m
-              end
-              nil
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/file/options.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class File
-          class Options
-            common_constructor :options
-            delegate :kernel, :confirm, :recursive, :extension, to: :options
-
-            def episode_increment
-              options.episode_increment.if_present(0, &:to_i)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/file.rb

@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/fs/extname'
-require 'ostruct'
-require_relative 'line_result'
-require_relative 'file/basename_parser'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class File < ::Ehbrs::Videos::Series::Rename::LineResult
-          include ::Ehbrs::Videos::Series::Rename::File::BasenameParser
-
-          attr_reader :file, :options
-
-          def initialize(file, options)
-            @file = file
-            @options = options
-            @options = ::OpenStruct.new(options) if options.is_a?(::Hash)
-          end
-
-          def rename
-            target = ::File.expand_path(new_name, dirname)
-            return if ::File.exist?(target)
-
-            infov 'Renaming', @file
-            FileUtils.mv(@file, target)
-          end
-
-          def season
-            return '??' if parse.blank?
-
-            parse.fetch(:s)
-          end
-
-          def episode
-            return '??' if parse.blank?
-
-            parse.fetch(:e)
-          end
-
-          def dirname
-            d = @file
-            while d != '/'
-              d = ::File.dirname(d)
-              return ::File.expand_path(d) + '/' unless ::File.basename(d).starts_with?('_')
-            end
-            raise "series_dirname not found for #{@file}"
-          end
-
-          def line_out
-            "#{episode.green}: " + if new_name == current_name
-                                     current_name.light_black
-                                   else
-                                     "#{new_name} <= #{current_name}"
-                                   end
-          end
-
-          def new_name
-            return "#{kernel}-s#{parse[:s]}e#{new_name_episodes}#{extension}" if parse.present?
-
-            current_name
-          end
-
-          private
-
-          def current_name
-            ::File.expand_path(@file).gsub(/\A#{::Regexp.quote(dirname)}/, '')
-          end
-
-          def rename?
-            return false unless new_name
-
-            current_name != new_name
-          end
-
-          def kernel
-            options.kernel || kernel_from_directory_name ||
-              raise("Kernel undefined (File: #{@file})")
-          end
-
-          def kernel_from_directory_name
-            dir = ::File.basename(dirname).sub(/\([0-9]+\)/, '')
-            dir.split(/\W+/).select { |w| /\A[a-z0-9]/.match(w) }.map { |p| p[0].downcase }.join('')
-          end
-
-          def extension
-            return options.extension if options.extension
-
-            extension_by_directory || ::EacRubyUtils::Fs.extname2(current_name)
-          end
-
-          def extension_by_directory
-            r = ::File.dirname(current_name)
-            return nil if r == '.'
-
-            r.gsub(/\A_/, '.')
-          end
-
-          def source_episodes
-            parse[:e].split('-').map(&:to_i)
-          end
-
-          def new_name_episodes
-            source_episodes.map do |i|
-              (i + options.episode_increment).to_s.rjust(2, '0')
-            end.join('-')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/line_result.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class LineResult
-          enable_simple_cache
-          enable_speaker
-
-          def show(level)
-            out(padding_level(level) + line_out + "\n")
-          end
-
-          private
-
-          def padding_level(level)
-            ('  ' * level.to_i) + '* '
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/line_result_group.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'line_result'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class LineResultGroup < ::Ehbrs::Videos::Series::Rename::LineResult
-          attr_reader :name, :children
-
-          def initialize(name, files)
-            @name = name
-            @children = build_children(files)
-          end
-
-          def show(level)
-            super(level)
-            children.each do |child|
-              child.show(level + 1)
-            end
-          end
-
-          private
-
-          def build_children(files)
-            r = {}
-            files.each do |file|
-              key = file.send(child_key)
-              r[key] ||= []
-              r[key] << file
-            end
-            r.sort.map { |v| child_class.new(v[0], v[1]) }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/results_builder.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/videos/series/rename/directory_group'
-require 'ehbrs/videos/series/rename/line_result_group'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class ResultsBuilder < LineResultGroup
-          def initialize(files)
-            super '', files
-          end
-
-          def line_out
-            'Groups: '.cyan + children.count.to_s
-          end
-
-          protected
-
-          def child_key
-            :dirname
-          end
-
-          def child_class
-            ::Ehbrs::Videos::Series::Rename::DirectoryGroup
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/season_group.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'line_result'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class SeasonGroup < ::Ehbrs::Videos::Series::Rename::LineResult
-          attr_reader :season, :files
-
-          def initialize(season, files)
-            @season = season
-            @files = files.sort_by { |f| [f.episode] }
-          end
-
-          def line_out
-            'Season: '.cyan + "#{season} (#{first_episode} - #{last_episode})"
-          end
-
-          def show(level)
-            super
-            files.each { |file| file.show(level + 1) }
-          end
-
-          private
-
-          def first_episode
-            files.first.episode
-          end
-
-          def last_episode
-            files.last.episode
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename.rb

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

data/lib/ehbrs/videos/series.rb

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