ehbrs-tools 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802c81117166172af4ea59889f51ca8fa22e9619c3db5c3c6cea3facefd67816
-  data.tar.gz: 524a0c12d36e164f7530653ace84b229d3c90b382bd148fc2dabdf51611881e4
+  metadata.gz: 8563bd63534580d6d7a099be6db131d899c4cd430ca5693f18578116d5c36b79
+  data.tar.gz: f7ec380ad444fc03ba43c906c09154294f0d685dda9a713fe77da78de3b4ded9
 SHA512:
-  metadata.gz: 8704fd788c833ebd36f2c3bab048855993cba2fbe29555040027965195d698eba76d2e36d77ded10672bf50027b441af11d9732ce8bf8dde6fb821623155ea1e
-  data.tar.gz: 45fa1972f370a98e24424a55ff81b964525799512e6d288fbde84996c5d36540cf368491de00423036f327cc5470889fae2ea0fcf52f40eb29fdfc736275a797
+  metadata.gz: dc550a52d559e31d2ce7455543b0c9024c133bcab23af4a78df484141a54c70f6e76b97b339f7257e9a879ae0043e6b97f063bd0d36a28afa501cc96a27f53a6
+  data.tar.gz: 4e24dc4ea1d43c39cba77906c2c61f1bc1a946f0bc550f9a4516269d2d0498b68cf4342d4fb230094920c4f6d8e3c1c604e2c1d47d12087e8f98d27e101cb473

data/lib/ehbrs/runner/videos/probe.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs_ruby_utils/videos/container/file'
+require 'ehbrs_ruby_utils/videos/container'
 require 'eac_ruby_utils/yaml'
 
 module Ehbrs
@@ -18,13 +18,13 @@ module Ehbrs
         end
 
         def output_content
-          ::EacRubyUtils::Yaml.dump(container_file.info.to_h)
+          ::EacRubyUtils::Yaml.dump(container_file.probe_data)
         end
 
         private
 
         def container_file_uncached
-          ::EhbrsRubyUtils::Videos::Container::File.new(parsed.file_path)
+          ::EhbrsRubyUtils::Videos::Container.new(parsed.file_path)
         end
       end
     end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.16.1'
+    VERSION = '0.16.2'
   end
 end

data/lib/ehbrs/videos/file.rb

@@ -3,10 +3,11 @@
 require 'eac_ruby_utils/core_ext'
 require 'ehbrs/videos/track'
 require 'ehbrs_ruby_utils/executables'
+require 'ehbrs_ruby_utils/videos/container'
 
 module Ehbrs
   module Videos
-    class File
+    class File < ::EhbrsRubyUtils::Videos::Container
       enable_simple_cache
 
       TIME_PATTERN = /(\d+):(\d{2}):(\d{2})(?:\.(\d+))/.freeze
@@ -39,17 +40,12 @@ module Ehbrs
         end
       end
 
-      common_constructor :path
-
       private
 
       def tracks_uncached
-        r = []
-        content.each_line do |line|
-          t = ::Ehbrs::Videos::Track.create_from_string(line)
-          r << t if t && t.type != 'Data'
+        streams.map { |stream| ::Ehbrs::Videos::Track.new(stream) }.reject do |t|
+          t.codec_type == ::EhbrsRubyUtils::Videos::Stream::CODEC_TYPE_DATA
         end
-        r
       end
 
       def content_uncached

data/lib/ehbrs/videos/track.rb

@@ -1,22 +1,32 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/videos/stream'
 
 module Ehbrs
   module Videos
-    class Track
-      FFPROBE_PATTERN = /\A\s*Stream\s\#(\d+:\d+)(?:\(([^\)]+)\))?:\s*([^:]+):\s*([a-z0-9]+)(.*)/
-                        .freeze
-      class << self
-        def create_from_string(string)
-          m = FFPROBE_PATTERN.match(string)
-          return nil unless m
+    class Track < ::SimpleDelegator
+      TYPE_MAPPING = {
+        audio: 'Audio',
+        video: 'Video',
+        subtitle: 'Subtitle'
+      }.freeze
 
-          new(m[1].to_i, m[3], m[2], m[4], m[5].strip)
-        end
+      def codec
+        codec_name
       end
 
-      common_constructor :number, :type, :language, :codec, :extra
+      def type
+        TYPE_MAPPING.fetch(codec_type)
+      end
+
+      def number
+        index
+      end
+
+      def extra
+        ffprobe_data.fetch(:codec_tag_string).to_s
+      end
 
       def to_s
         "[#{type}(#{number}): #{codec}/#{language || '-'}" +

data/lib/ehbrs/videos/unsupported/checks/codec_extra_unlisted.rb

@@ -5,6 +5,8 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecExtraUnlisted
+          TYPE = :stream
+
           common_constructor :codec, :listed_extras
 
           def check(track)

data/lib/ehbrs/videos/unsupported/checks/codec_extra_unsupported.rb

@@ -7,6 +7,8 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecExtraUnsupported
+          TYPE = :stream
+
           common_constructor :codec, :extra
 
           def check(track)

data/lib/ehbrs/videos/unsupported/checks/codec_unlisted.rb

@@ -5,6 +5,8 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecUnlisted
+          TYPE = :stream
+
           common_constructor :listed_codecs
 
           def check(track)

data/lib/ehbrs/videos/unsupported/checks/codec_unsupported.rb

@@ -7,6 +7,8 @@ module Ehbrs
     module Unsupported
       module Checks
         class CodecUnsupported
+          TYPE = :stream
+
           common_constructor :codec
 
           def check(track)

data/lib/ehbrs/videos/unsupported/checks/invalid_extension.rb

@@ -7,6 +7,8 @@ module Ehbrs
     module Unsupported
       module Checks
         class InvalidExtension
+          TYPE = :container
+
           common_constructor :extension
 
           def check(video)

data/lib/ehbrs/videos/unsupported/fixes/supported_codec.rb

@@ -12,7 +12,7 @@ module Ehbrs
           }.freeze
 
           TRACK_TYPE_FIX_CODECS = {
-            'Audio' => 'aac',
+            'Audio' => 'libvorbis',
             'Video' => 'libx264',
             'Subtitle' => 'ass'
           }.freeze

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

@@ -19,13 +19,21 @@ module Ehbrs
             added_checks << check_path.camelize.constantize.new(*args)
           end
 
+          def base_checks
+            [unlisted_codec_check] + unsupported_codec_checks +
+              supported_codecs.flat_map { |codec| codec_extra_checks(codec) }
+          end
+
+          def checks
+            base_checks + added_checks
+          end
+
           def file_checks
-            added_checks
+            checks.select { |c| check_type(c) == :container }
           end
 
           def track_checks
-            [unlisted_codec_check] + unsupported_codec_checks +
-              supported_codecs.flat_map { |codec| codec_extra_checks(codec) }
+            checks.select { |c| check_type(c) == :stream }
           end
 
           def codec_extra_checks(codec)
@@ -95,6 +103,12 @@ module Ehbrs
           def codec_supported_extras(codec)
             codec_extras(codec, 'supported')
           end
+
+          private
+
+          def check_type(check)
+            check.class.const_get(:TYPE)
+          end
         end
       end
     end

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

@@ -7,19 +7,20 @@ module Ehbrs
     module Unsupported
       module Profiles
         class Philco < ::Ehbrs::Videos::Unsupported::Profiles::Base
-          AUDIO_SUPPORTED_CODECS = %w[aac ac3 eac3 mp3].freeze
-          AUDIO_UNSUPPORTED_CODECS = %w[dts].freeze
+          AUDIO_SUPPORTED_CODECS = %w[aac ac3 eac3 mp3 vorbis wmav2].freeze
+          AUDIO_UNSUPPORTED_CODECS = %w[dts opus].freeze
 
           VIDEO_SUPPORTED_CODECS = %w[h264 mpeg4].freeze
           VIDEO_UNSUPPORTED_CODECS = %w[hevc msmpeg4v3].freeze
 
-          SUBTITLE_SUPPORTED_CODECS = %w[ass dvd subrip].freeze
+          SUBTITLE_SUPPORTED_CODECS = %w[ass dvd dvd_subtitle hdmv_pgs_subtitle mov_text
+                                         subrip].freeze
           SUBTITLE_UNSUPPORTED_CODECS = %w[mov].freeze
 
           OTHER_SUPPORTED_CODECS = %w[png ttf].freeze
 
           MPEG4_EXTRA_SUPPORTED = %w[xvid].freeze
-          MPEG4_EXTRA_UNSUPPORTED = %w[dx50].freeze
+          MPEG4_EXTRA_UNSUPPORTED = %w[divx dx50].freeze
         end
       end
     end

data/vendor/aranha-parsers/lib/aranha/parsers/spec/source_target_fixtures_example.rb

@@ -20,8 +20,8 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
         source_target_fixtures.source_files.each do |source_file|
           sd = sort_results(source_data(source_file))
           basename = ::Aranha::Parsers::SourceTargetFixtures.source_target_basename(source_file)
-          target_file = File.expand_path("../#{basename}.target.yaml", source_file)
-          File.write(target_file, sd.to_yaml)
+          target_file = File.expand_path("../#{basename}.target#{target_file_extname}", source_file)
+          File.write(target_file, target_content(sd))
         end
       end
     else
@@ -67,4 +67,12 @@ RSpec.shared_examples 'source_target_fixtures' do |spec_file| # rubocop:disable
   def target_data(target_file)
     ::YAML.load_file(target_file)
   end
+
+  def target_content(data)
+    data.to_yaml
+  end
+
+  def target_file_extname
+    '.yaml'
+  end
 end

data/vendor/aranha-parsers/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition.rb

@@ -9,36 +9,30 @@ module EacCli
   class Definition
     require_sub __FILE__
 
+    MAIN_ALTERNATIVE_KEY = :main
     SUBCOMMAND_NAME_ARG = 'subcommand'
     SUBCOMMAND_ARGS_ARG = 'subcommand_args'
 
     attr_accessor :description
-    attr_accessor :options_argument
 
     def initialize
       self.description = '-- NO DESCRIPTION SET --'
-      self.options_argument = true
+      alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
     end
 
     def alt(&block)
-      r = ::EacCli::Definition.new
+      r = ::EacCli::Definition::Alternative.new
       r.instance_eval(&block)
-      alternatives << r
+      alternatives_set[new_alternative_key] = r
       r
     end
 
     def alternatives
-      @alternatives ||= []
+      alternatives_set.values
     end
 
-    def arg_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::ArgumentOption.new(
-        short, long, description, option_options
-      )
-    end
-
-    def bool_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
+    def alternative(key)
+      alternatives_set.fetch(key)
     end
 
     def desc(description)
@@ -49,42 +43,31 @@ module EacCli
       @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
     end
 
-    def options_arg(options_argument)
-      self.options_argument = options_argument
-    end
-
-    def options
-      @options ||= []
+    def main_alternative
+      @main_alternative ||= begin
+        r = ::EacCli::Definition::Alternative.new
+        r.options_argument(true)
+        r
+      end
     end
 
-    def pos_arg(name, arg_options = {})
-      new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
-      raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
-
-      pos_set << new_pos_arg
+    def options_arg(options_argument)
+      self.options_argument = options_argument
     end
 
-    def positional
-      pos_set.to_a
+    def options_argument
+      main_alternative.options_argument?
     end
 
-    def positional_arguments_blocked?(new_pos_arg)
-      last = pos_set.last
-      return false unless last
-      return true if last.repeat?
-      return true if last.optional? && new_pos_arg.required?
-
-      false
+    def options_argument=(enable)
+      main_alternative.options_argument(enable)
     end
 
-    def subcommands
-      pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
-      pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
-                                                              optional: true, repeat: true)
-    end
+    delegate :arg_opt, :bool_opt, :options, :pos_arg,
+             :positional, :subcommands, to: :main_alternative
 
     def subcommands?
-      pos_set.any?(&:subcommand?)
+      alternatives.any?(&:subcommands?)
     end
 
     def options_first(enable = true)
@@ -97,6 +80,18 @@ module EacCli
 
     private
 
+    def alternatives_set
+      @alternatives_set ||= ::ActiveSupport::HashWithIndifferentAccess.new
+    end
+
+    def new_alternative_key
+      @last_key ||= 0
+      loop do
+        @last_key += 1
+        break @last_key unless alternatives_set.key?(@last_key)
+      end
+    end
+
     def pos_set
       @pos_set ||= []
     end

data/vendor/eac_cli/lib/eac_cli/definition/alternative.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/argument_option'
+require 'eac_cli/definition/boolean_option'
+require 'eac_cli/definition/positional_argument'
+
+module EacCli
+  class Definition
+    class Alternative
+      SUBCOMMAND_NAME_ARG = :subcommand
+      SUBCOMMAND_ARGS_ARG = :subcommand_args
+
+      def arg_opt(short, long, description, option_options = {})
+        options_set << ::EacCli::Definition::ArgumentOption.new(
+          short, long, description, option_options
+        )
+      end
+
+      def bool_opt(short, long, description, option_options = {})
+        options_set << ::EacCli::Definition::BooleanOption.new(short, long, description,
+                                                               option_options)
+      end
+
+      def options
+        options_set.to_a
+      end
+
+      def options_argument?
+        @options_argument ? true : false
+      end
+
+      def options_argument(enable)
+        @options_argument = enable
+
+        self
+      end
+
+      def pos_arg(name, arg_options = {})
+        new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+        check_positional_blocked(new_pos_arg)
+        pos_set << new_pos_arg
+      end
+
+      def positional
+        pos_set.to_a
+      end
+
+      def positional_arguments_blocked?(new_pos_arg)
+        last = pos_set.last
+        return false unless last
+        return true if subcommands?
+        return true if last.repeat?
+        return true if last.optional? && new_pos_arg.if_present(&:required?)
+
+        false
+      end
+
+      def subcommands
+        pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
+        pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
+                                                                optional: true, repeat: true)
+      end
+
+      def subcommands?
+        pos_set.any?(&:subcommand?)
+      end
+
+      private
+
+      def check_positional_blocked(new_pos_arg)
+        raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
+      end
+
+      def pos_set
+        @pos_set ||= []
+      end
+
+      def options_set
+        @options_set ||= []
+      end
+    end
+  end
+end